Merge pull request #53 from stakater/fix-helper-func

append reloader- to serviceAccountName
This commit is contained in:
Muhammad Ahsan
2019-02-12 13:03:43 +05:00
committed by GitHub
5 changed files with 5 additions and 5 deletions
@@ -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 -}}
@@ -18,6 +18,6 @@ roleRef:
name: {{ template "reloader-name" . }}-role
subjects:
- kind: ServiceAccount
name: {{ template "serviceAccountName" . }}
name: {{ template "reloader-serviceAccountName" . }}
namespace: {{ .Release.Namespace }}
{{- end }}
@@ -85,4 +85,4 @@ spec:
- "{{ .Values.reloader.custom_annotations.auto }}"
{{- end }}
{{- end }}
serviceAccountName: {{ template "serviceAccountName" . }}
serviceAccountName: {{ template "reloader-serviceAccountName" . }}
@@ -18,6 +18,6 @@ roleRef:
name: {{ template "reloader-name" . }}-role
subjects:
- kind: ServiceAccount
name: {{ template "serviceAccountName" . }}
name: {{ template "reloader-serviceAccountName" . }}
namespace: {{ .Release.Namespace }}
{{- end }}
@@ -10,5 +10,5 @@ metadata:
{{- if .Values.reloader.matchLabels }}
{{ toYaml .Values.reloader.matchLabels | indent 4 }}
{{- end }}
name: {{ template "serviceAccountName" . }}
name: {{ template "reloader-serviceAccountName" . }}
{{- end }}