Use existing variable for tiller service account name (#6829)

* Use existing variable for tiller service account name * keep crb as tiller
2020-10-19 05:04:13 -05:00
parent d25aebdaf5
commit 79b7f0d592
2 changed files with 3 additions and 3 deletions
--- a/roles/kubernetes-apps/helm/templates/tiller-clusterrolebinding.yml.j2
+++ b/roles/kubernetes-apps/helm/templates/tiller-clusterrolebinding.yml.j2
@ -6,7 +6,7 @@ metadata:
  namespace: {{ tiller_namespace }}
 subjects:
  - kind: ServiceAccount
-    name: tiller
+    name: {{ tiller_service_account }}
    namespace: {{ tiller_namespace }}
 roleRef:
  kind: ClusterRole
@ -20,7 +20,7 @@ metadata:
  name: psp:tiller
 subjects:
  - kind: ServiceAccount
-    name: tiller
+    name: {{ tiller_service_account }}
    namespace: {{ tiller_namespace }}
 roleRef:
  apiGroup: rbac.authorization.k8s.io
--- a/roles/kubernetes-apps/helm/templates/tiller-sa.yml.j2
+++ b/roles/kubernetes-apps/helm/templates/tiller-sa.yml.j2
@ -2,5 +2,5 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: tiller
+  name: {{ tiller_service_account }}
  namespace: {{ tiller_namespace }}