diff --git a/k8s/web-prod/base/configmap.yaml b/k8s/web-prod/base/configmap.yaml index 774c1f16..b62eabe4 100644 --- a/k8s/web-prod/base/configmap.yaml +++ b/k8s/web-prod/base/configmap.yaml @@ -2,11 +2,10 @@ apiVersion: v1 data: DEBUG_MODE: "False" ENABLE_INTROSPECTION: "True" - HTTP_PROXY: "http://pg-wwwcache.ebi.ac.uk:3128" - HTTPS_PROXY: "http://pg-wwwcache.ebi.ac.uk:3128" - http_proxy: "http://pg-wwwcache.ebi.ac.uk:3128" - https_proxy: "http://pg-wwwcache.ebi.ac.uk:3128" - no_proxy: ".ebi.ac.uk,localhost,127.0.0.1,.cluster.local" + HTTP_PROXY: + HTTPS_PROXY: + http_proxy: + https_proxy: kind: ConfigMap metadata: name: proxy-configmap diff --git a/k8s/web-prod/base/kustomization.yaml b/k8s/web-prod/base/kustomization.yaml index 0b0f6df0..42835f53 100644 --- a/k8s/web-prod/base/kustomization.yaml +++ b/k8s/web-prod/base/kustomization.yaml @@ -2,4 +2,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - deployment.yaml -- configmap.yaml \ No newline at end of file diff --git a/k8s/web-prod/overlays/apps/configmap-patch.yaml b/k8s/web-prod/overlays/apps/configmap-patch.yaml deleted file mode 100644 index 2ca80400..00000000 --- a/k8s/web-prod/overlays/apps/configmap-patch.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: proxy-configmap # This matches the name in the base configmap.yaml -data: - # The new values we want to override - DEBUG_MODE: "True" diff --git a/k8s/web-prod/overlays/apps/kustomization.yaml b/k8s/web-prod/overlays/apps/kustomization.yaml index eda28110..3d4897e5 100644 --- a/k8s/web-prod/overlays/apps/kustomization.yaml +++ b/k8s/web-prod/overlays/apps/kustomization.yaml @@ -11,8 +11,3 @@ patches: kind: Deployment name: graphql-core-deployment path: patch.yaml - - target: - version: v1 - kind: ConfigMap - name: proxy-configmap # This must match the name in our base - path: configmap-patch.yaml # Add our new patch for the ConfigMap diff --git a/k8s/web-prod/overlays/internal/configmap-patch.yaml b/k8s/web-prod/overlays/internal/configmap-patch.yaml deleted file mode 100644 index c11d03be..00000000 --- a/k8s/web-prod/overlays/internal/configmap-patch.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: proxy-configmap # This matches the name in the base configmap.yaml -data: - # The new values we want to override - ENABLE_INTROSPECTION: "False" diff --git a/k8s/web-prod/overlays/internal/kustomization.yaml b/k8s/web-prod/overlays/internal/kustomization.yaml index a20ad68c..45e6f4ca 100644 --- a/k8s/web-prod/overlays/internal/kustomization.yaml +++ b/k8s/web-prod/overlays/internal/kustomization.yaml @@ -3,7 +3,6 @@ kind: Kustomization resources: - ../../base -patchesStrategicMerge: - - configmap-patch.yaml # Uncomment when migrating to new-k8s +# patchesStrategicMerge: # - patch.yaml