From 2131f0ebf38d90f4868027b4d86441ca7f8aa035 Mon Sep 17 00:00:00 2001 From: kahootali Date: Tue, 12 Feb 2019 12:20:28 +0500 Subject: [PATCH] append reloader- to serviceAccountName --- deployments/kubernetes/chart/reloader/templates/_helpers.tpl | 2 +- .../kubernetes/chart/reloader/templates/clusterrolebinding.yaml | 2 +- deployments/kubernetes/chart/reloader/templates/deployment.yaml | 2 +- .../kubernetes/chart/reloader/templates/rolebinding.yaml | 2 +- .../kubernetes/chart/reloader/templates/serviceaccount.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deployments/kubernetes/chart/reloader/templates/_helpers.tpl b/deployments/kubernetes/chart/reloader/templates/_helpers.tpl index e6fc7bb6..09593e5d 100644 --- a/deployments/kubernetes/chart/reloader/templates/_helpers.tpl +++ b/deployments/kubernetes/chart/reloader/templates/_helpers.tpl @@ -25,7 +25,7 @@ heritage: {{ .Release.Service | quote }} {{/* Create the name of the service account to use */}} -{{- define "serviceAccountName" -}} +{{- define "reloader-serviceAccountName" -}} {{- if .Values.reloader.serviceAccount.create -}} {{ default (include "reloader-fullname" .) .Values.reloader.serviceAccount.name }} {{- else -}} diff --git a/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml b/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml index ab3dfc89..aebd6734 100644 --- a/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml +++ b/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml @@ -18,6 +18,6 @@ roleRef: name: {{ template "reloader-name" . }}-role subjects: - kind: ServiceAccount - name: {{ template "serviceAccountName" . }} + name: {{ template "reloader-serviceAccountName" . }} namespace: {{ .Release.Namespace }} {{- end }} diff --git a/deployments/kubernetes/chart/reloader/templates/deployment.yaml b/deployments/kubernetes/chart/reloader/templates/deployment.yaml index 69383e20..53b999ce 100644 --- a/deployments/kubernetes/chart/reloader/templates/deployment.yaml +++ b/deployments/kubernetes/chart/reloader/templates/deployment.yaml @@ -85,4 +85,4 @@ spec: - "{{ .Values.reloader.custom_annotations.auto }}" {{- end }} {{- end }} - serviceAccountName: {{ template "serviceAccountName" . }} + serviceAccountName: {{ template "reloader-serviceAccountName" . }} diff --git a/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml b/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml index d026bd6b..31b37792 100644 --- a/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml +++ b/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml @@ -18,6 +18,6 @@ roleRef: name: {{ template "reloader-name" . }}-role subjects: - kind: ServiceAccount - name: {{ template "serviceAccountName" . }} + name: {{ template "reloader-serviceAccountName" . }} namespace: {{ .Release.Namespace }} {{- end }} diff --git a/deployments/kubernetes/chart/reloader/templates/serviceaccount.yaml b/deployments/kubernetes/chart/reloader/templates/serviceaccount.yaml index ceb247c3..c3a0b7c4 100644 --- a/deployments/kubernetes/chart/reloader/templates/serviceaccount.yaml +++ b/deployments/kubernetes/chart/reloader/templates/serviceaccount.yaml @@ -10,5 +10,5 @@ metadata: {{- if .Values.reloader.matchLabels }} {{ toYaml .Values.reloader.matchLabels | indent 4 }} {{- end }} - name: {{ template "serviceAccountName" . }} + name: {{ template "reloader-serviceAccountName" . }} {{- end }}