Skip to content

Commit

Permalink
Revert uneccessary changes
Browse files Browse the repository at this point in the history
Since the configmap applied are in separate repo
  • Loading branch information
bilalebi committed Sep 25, 2024
1 parent 36ab2b2 commit b5cdaa5
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 27 deletions.
9 changes: 4 additions & 5 deletions k8s/web-prod/base/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: <HTTP_PROXY>
HTTPS_PROXY: <HTTP_PROXY>
http_proxy: <HTTP_PROXY>
https_proxy: <HTTP_PROXY>
kind: ConfigMap
metadata:
name: proxy-configmap
1 change: 0 additions & 1 deletion k8s/web-prod/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- deployment.yaml
- configmap.yaml
7 changes: 0 additions & 7 deletions k8s/web-prod/overlays/apps/configmap-patch.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions k8s/web-prod/overlays/apps/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 0 additions & 7 deletions k8s/web-prod/overlays/internal/configmap-patch.yaml

This file was deleted.

3 changes: 1 addition & 2 deletions k8s/web-prod/overlays/internal/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ kind: Kustomization
resources:
- ../../base

patchesStrategicMerge:
- configmap-patch.yaml
# Uncomment when migrating to new-k8s
# patchesStrategicMerge:
# - patch.yaml

0 comments on commit b5cdaa5

Please sign in to comment.