Skip to content

Commit

Permalink
Merge pull request #12 from sgibson91/service-account-naming
Browse files Browse the repository at this point in the history
Handle service account naming conventions
  • Loading branch information
sgibson91 authored Sep 13, 2024
2 parents 7c764c4 + 1b790c6 commit d451221
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion gcpFilestoreBackups/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Create the name of the service account to use
*/}}
{{- define "gcpFilestoreBackups.serviceAccountName" -}}
{{- if .Values.serviceAccount.create }}
{{- default (include "gcpFilestoreBackups.fullname" .) .Values.serviceAccount.name }}
{{- default (include "gcpFilestoreBackups.fullname" . | lower ) .Values.serviceAccount.name }}
{{- else }}
{{- default "default" .Values.serviceAccount.name }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion gcpFilestoreBackups/templates/serviceaccount.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "gcpFilestoreBackups.fullname" . }}
name: {{ include "gcpFilestoreBackups.serviceAccountName" . }}
{{- with .Values.serviceAccount.annotations }}
annotations:
{{- . | toYaml | nindent 4 }}
Expand Down

0 comments on commit d451221

Please sign in to comment.