From 79b7f0d5929d0d834a5b4172869ef524cc0cbe56 Mon Sep 17 00:00:00 2001
From: David Louks <2402775+dlouks@users.noreply.github.com>
Date: Mon, 19 Oct 2020 05:04:13 -0500
Subject: [PATCH] Use existing variable for tiller service account name (#6829)
* Use existing variable for tiller service account name
* keep crb as tiller
---
.../helm/templates/tiller-clusterrolebinding.yml.j2 | 4 ++--
roles/kubernetes-apps/helm/templates/tiller-sa.yml.j2 | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/roles/kubernetes-apps/helm/templates/tiller-clusterrolebinding.yml.j2 b/roles/kubernetes-apps/helm/templates/tiller-clusterrolebinding.yml.j2
index 7d54bb953..56af87be7 100644
--- 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
diff --git a/roles/kubernetes-apps/helm/templates/tiller-sa.yml.j2 b/roles/kubernetes-apps/helm/templates/tiller-sa.yml.j2
index d7eb974a3..8a17b1972 100644
--- 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 }}
--
GitLab