fix serviceaccount mismatch issue for operator. (istio#26756)

* fix serviceaccount mismatch issue for operator. * fix operator tests.
sel · Aug 24, 2020 · 7d99a56 · 7d99a56
1 parent 4323b37
commit 7d99a56
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/manifests/charts/istio-operator/templates/clusterrole.yaml b/manifests/charts/istio-operator/templates/clusterrole.yaml
@@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   creationTimestamp: null
-  name: istio-operator
+  name: istio-operator{{- if not (eq .Values.revision "") }}-{{ .Values.revision }}{{- end }}
 rules:
 # istio groups
 - apiGroups:

diff --git a/manifests/charts/istio-operator/templates/clusterrole_binding.yaml b/manifests/charts/istio-operator/templates/clusterrole_binding.yaml
@@ -1,13 +1,13 @@
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: istio-operator
+  name: istio-operator{{- if not (eq .Values.revision "") }}-{{ .Values.revision }}{{- end }}
 subjects:
 - kind: ServiceAccount
-  name: istio-operator
+  name: istio-operator{{- if not (eq .Values.revision "") }}-{{ .Values.revision }}{{- end }}
   namespace: {{.Values.operatorNamespace}}
 roleRef:
   kind: ClusterRole
-  name: istio-operator
+  name: istio-operator{{- if not (eq .Values.revision "") }}-{{ .Values.revision }}{{- end }}
   apiGroup: rbac.authorization.k8s.io
 ---
diff --git a/manifests/charts/istio-operator/templates/deployment.yaml b/manifests/charts/istio-operator/templates/deployment.yaml
@@ -13,7 +13,7 @@ spec:
       labels:
         name: istio-operator
     spec:
-      serviceAccountName: istio-operator
+      serviceAccountName: istio-operator{{- if not (eq .Values.revision "") }}-{{ .Values.revision }}{{- end }}
       containers:
         - name: istio-operator
           image: {{.Values.hub}}/operator:{{.Values.tag}}