Merge branch 'release-1.11' into issue/808

banzaicloud · Jan 24, 2022 · fb96fba · fb96fba
2 parents fdb042f + 1a623b5
commit fb96fba
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 2 deletions.
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -4,4 +4,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: banzaicloud/istio-operator
+  newName: ghcr.io/banzaicloud/istio-operator
diff --git a/internal/assets/manifests/istio-discovery/templates/clusterrolebinding.yaml b/internal/assets/manifests/istio-discovery/templates/clusterrolebinding.yaml
@@ -13,5 +13,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "name-with-revision" ( dict "name" "istiod" "context" $) }}
-    namespace: {{ .Values.global.istioNamespace }}
+    namespace: {{ .Release.Namespace }}
 {{- end }}
diff --git a/internal/assets/manifests/istio-discovery/values.yaml.tpl b/internal/assets/manifests/istio-discovery/values.yaml.tpl
@@ -122,6 +122,7 @@ telemetry:
 {{- end }}
 
 {{- define "global" }}
+istioNamespace: "{{ .Namespace }}"
 {{ valueIf (dict "key" "distribution" "value" .GetSpec.GetDistribution) }}
 {{- if .GetSpec.GetMode }}
 mode: {{ .GetSpec.GetMode | toString }}

diff --git a/internal/components/discovery/testdata/icp-expected-values.yaml b/internal/components/discovery/testdata/icp-expected-values.yaml
@@ -1,4 +1,5 @@
 global:
+  istioNamespace: istio-system
   proxy:
     image: proxyv2
     privileged: false

diff --git a/internal/components/discovery/testdata/icp-passive-expected-values.yaml b/internal/components/discovery/testdata/icp-passive-expected-values.yaml
@@ -1,4 +1,5 @@
 global:
+  istioNamespace: istio-system
   meshID: mesh1
   mode: PASSIVE
   multiCluster: