External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-08 01:47:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* Use existing variable for tiller service account name

* keep crb as tiller
This commit is contained in:
David Louks
2020-10-19 05:04:13 -05:00
committed by GitHub
parent d25aebdaf5
commit 79b7f0d592
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/kubernetes-apps/helm/templates/tiller-clusterrolebinding.yml.j2
View File

@@ -6,7 +6,7 @@ metadata:
namespace: {{ tiller_namespace }} namespace: {{ tiller_namespace }}
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: tiller name: {{ tiller_service_account }}
namespace: {{ tiller_namespace }} namespace: {{ tiller_namespace }}
roleRef: roleRef:
kind: ClusterRole kind: ClusterRole
@@ -20,7 +20,7 @@ metadata:
name: psp:tiller name: psp:tiller
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: tiller name: {{ tiller_service_account }}
namespace: {{ tiller_namespace }} namespace: {{ tiller_namespace }}
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io

2
roles/kubernetes-apps/helm/templates/tiller-sa.yml.j2
View File

@@ -2,5 +2,5 @@
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
name: tiller name: {{ tiller_service_account }}
namespace: {{ tiller_namespace }} namespace: {{ tiller_namespace }}