fix: helm-template should explicitly set ns (envoyproxy#3070)

Signed-off-by: bitliu <bitliu@tencent.com>
ShyunnY · Apr 1, 2024 · d502e22 · d502e22
1 parent 4565e33
commit d502e22
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/test/helm/default.yaml b/test/helm/default.yaml
@@ -4,7 +4,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: envoy-gateway
-  namespace: 'default'
+  namespace: 'envoy-gateway-system'
   labels:
     helm.sh/chart: gateway-helm-v0.0.0-latest
     app.kubernetes.io/name: gateway-helm
@@ -17,7 +17,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: envoy-gateway-config
-  namespace: 'default'
+  namespace: 'envoy-gateway-system'
   labels:
     helm.sh/chart: gateway-helm-v0.0.0-latest
     app.kubernetes.io/name: gateway-helm
@@ -163,14 +163,14 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: 'envoy-gateway'
-  namespace: 'default'
+  namespace: 'envoy-gateway-system'
 ---
 # Source: gateway-helm/templates/infra-manager-rbac.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: eg-gateway-helm-infra-manager
-  namespace: 'default'
+  namespace: 'envoy-gateway-system'
   labels:
     helm.sh/chart: gateway-helm-v0.0.0-latest
     app.kubernetes.io/name: gateway-helm
@@ -212,7 +212,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: eg-gateway-helm-leader-election-role
-  namespace: 'default'
+  namespace: 'envoy-gateway-system'
   labels:
     helm.sh/chart: gateway-helm-v0.0.0-latest
     app.kubernetes.io/name: gateway-helm
@@ -257,7 +257,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: eg-gateway-helm-infra-manager
-  namespace: 'default'
+  namespace: 'envoy-gateway-system'
   labels:
     helm.sh/chart: gateway-helm-v0.0.0-latest
     app.kubernetes.io/name: gateway-helm
@@ -271,14 +271,14 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: 'envoy-gateway'
-  namespace: 'default'
+  namespace: 'envoy-gateway-system'
 ---
 # Source: gateway-helm/templates/leader-election-rbac.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: eg-gateway-helm-leader-election-rolebinding
-  namespace: 'default'
+  namespace: 'envoy-gateway-system'
   labels:
     helm.sh/chart: gateway-helm-v0.0.0-latest
     app.kubernetes.io/name: gateway-helm
@@ -292,14 +292,14 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: 'envoy-gateway'
-  namespace: 'default'
+  namespace: 'envoy-gateway-system'
 ---
 # Source: gateway-helm/templates/envoy-gateway-service.yaml
 apiVersion: v1
 kind: Service
 metadata:
   name: envoy-gateway
-  namespace: 'default'
+  namespace: 'envoy-gateway-system'
   labels:
     control-plane: envoy-gateway
     helm.sh/chart: gateway-helm-v0.0.0-latest
@@ -328,7 +328,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: envoy-gateway
-  namespace: 'default'
+  namespace: 'envoy-gateway-system'
   labels:
     control-plane: envoy-gateway
     helm.sh/chart: gateway-helm-v0.0.0-latest
@@ -421,7 +421,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: eg-gateway-helm-certgen
-  namespace: 'default'
+  namespace: 'envoy-gateway-system'
   labels:
     helm.sh/chart: gateway-helm-v0.0.0-latest
     app.kubernetes.io/name: gateway-helm
@@ -436,7 +436,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: eg-gateway-helm-certgen
-  namespace: 'default'
+  namespace: 'envoy-gateway-system'
   labels:
     helm.sh/chart: gateway-helm-v0.0.0-latest
     app.kubernetes.io/name: gateway-helm
@@ -460,7 +460,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: eg-gateway-helm-certgen
-  namespace: 'default'
+  namespace: 'envoy-gateway-system'
   labels:
     helm.sh/chart: gateway-helm-v0.0.0-latest
     app.kubernetes.io/name: gateway-helm
@@ -476,14 +476,14 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: 'eg-gateway-helm-certgen'
-  namespace: 'default'
+  namespace: 'envoy-gateway-system'
 ---
 # Source: gateway-helm/templates/certgen.yaml
 apiVersion: batch/v1
 kind: Job
 metadata:
   name: eg-gateway-helm-certgen
-  namespace: 'default'
+  namespace: 'envoy-gateway-system'
   labels:
     helm.sh/chart: gateway-helm-v0.0.0-latest
     app.kubernetes.io/name: gateway-helm

diff --git a/tools/make/helm.mk b/tools/make/helm.mk
@@ -31,4 +31,4 @@ helm-generate:
 
 helm-template: ## Template envoy gateway helm chart.
 	@$(LOG_TARGET)
-	helm template eg charts/gateway-helm --set deployment.envoyGateway.image.tag=latest > ./test/helm/default.yaml
+	helm template eg charts/gateway-helm --set deployment.envoyGateway.image.tag=latest > ./test/helm/default.yaml --namespace=envoy-gateway-system