Remove namespace values

Signed-off-by: Matias Charriere <[email protected]>
giantswarm · Jan 6, 2025 · 8c05b4f · 8c05b4f
1 parent 3371f36
commit 8c05b4f
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 51 deletions.
diff --git a/diffs/helm__envoy-gateway__templates__namespace.yaml.patch b/diffs/helm__envoy-gateway__templates__namespace.yaml.patch
@@ -1,12 +1,12 @@
-diff --git a/helm/envoy-gateway/templates/namespace.yaml b/helm/envoy-gateway/templates/namespace.yaml
-new file mode 100644
-index 0000000..c68c79a
---- /dev/null
+diff --git a/vendor/gateway-helm/templates/namespace.yaml b/helm/envoy-gateway/templates/namespace.yaml
+index 92bc258..0361b22 100644
+--- a/vendor/gateway-helm/templates/namespace.yaml
 +++ b/helm/envoy-gateway/templates/namespace.yaml
-@@ -0,0 +1,6 @@
-+{{ if .Values.createNamespace }}
-+apiVersion: v1
-+kind: Namespace
-+metadata:
-+  name: '{{ .Values.namespace }}'
-+{{ end }}
+@@ -2,5 +2,5 @@
+ apiVersion: v1
+ kind: Namespace
+ metadata:
+-  name: '{{ .Release.Namespace }}'
+-{{ end }}
++  name: '{{ .Release.Namespace }}' 
++{{ end }}    
diff --git a/diffs/helm__envoy-gateway__values.yaml.patch b/diffs/helm__envoy-gateway__values.yaml.patch
@@ -1,14 +1,13 @@
 diff --git a/vendor/gateway-helm/values.yaml b/helm/envoy-gateway/values.yaml
-index 56cf308..b81476e 100644
+index 56cf308..d383f2d 100644
 --- a/vendor/gateway-helm/values.yaml
 +++ b/helm/envoy-gateway/values.yaml
-@@ -18,15 +18,24 @@ global:
+@@ -18,15 +18,23 @@ global:
        pullPolicy: IfNotPresent
        # List of secrets in the same namespace of the component that can be used to pull images from private repositories.
        pullSecrets: []
 +
 +name: envoy-gateway
-+namespace: envoy-gateway-system
 +serviceType: managed
 +
  podDisruptionBudget:
@@ -29,15 +28,15 @@ index 56cf308..b81476e 100644
      imagePullPolicy: ""
      imagePullSecrets: []
      resources:
-@@ -44,6 +53,7 @@ deployment:
+@@ -44,6 +52,7 @@ deployment:
        runAsNonRoot: true
        runAsGroup: 65532
        runAsUser: 65532
 +      readOnlyRootFilesystem: true
        seccompProfile:
          type: RuntimeDefault
    ports:
-@@ -88,11 +98,15 @@ createNamespace: false
+@@ -88,11 +97,15 @@ createNamespace: false
 
  kubernetesClusterDomain: cluster.local
 

diff --git a/helm/envoy-gateway/README.md b/helm/envoy-gateway/README.md
@@ -118,7 +118,6 @@ To uninstall the chart:
 | image.repository | string | `"giantswarm"` |  |
 | kubernetesClusterDomain | string | `"cluster.local"` |  |
 | name | string | `"envoy-gateway"` |  |
-| namespace | string | `"envoy-gateway-system"` |  |
 | podDisruptionBudget.minAvailable | int | `0` |  |
 | service.annotations | object | `{}` |  |
 | serviceType | string | `"managed"` |  |

diff --git a/helm/envoy-gateway/templates/namespace.yaml b/helm/envoy-gateway/templates/namespace.yaml
@@ -2,5 +2,5 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: '{{ .Values.namespace }}'
-{{ end }}
+  name: '{{ .Release.Namespace }}' 
+{{ end }}    
diff --git a/helm/envoy-gateway/values.yaml b/helm/envoy-gateway/values.yaml
@@ -20,7 +20,6 @@ global:
       pullSecrets: []
 
 name: envoy-gateway
-namespace: envoy-gateway-system
 serviceType: managed
 
 podDisruptionBudget:

diff --git a/sync/patches/namespace-values/000-namespace-values.patch b/sync/patches/namespace-values/000-namespace-values.patch
diff --git a/sync/patches/namespace-values/patch.sh b/sync/patches/namespace-values/patch.sh
diff --git a/sync/patches/values/values.yaml b/sync/patches/values/values.yaml
@@ -20,7 +20,6 @@ global:
       pullSecrets: []
 
 name: envoy-gateway
-namespace: envoy-gateway-system
 serviceType: managed
 
 podDisruptionBudget:

diff --git a/sync/sync.sh b/sync/sync.sh
@@ -19,7 +19,6 @@ find vendor/ -type f -exec sed -i 's/[[:space:]]*$//' {} \;
 ./sync/patches/image-registry/patch.sh
 ./sync/patches/pss-comply/patch.sh
 ./sync/patches/team-label/patch.sh
-./sync/patches/namespace-values/patch.sh
 ./sync/patches/values/patch.sh
 ./sync/patches/network-policies/patch.sh