fix service account creation for backups

slamdev · Apr 9, 2020 · 5382e40 · 5382e40
1 parent a287299
commit 5382e40
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 11 deletions.
diff --git a/charts/gitlab-omnibus/Chart.yaml b/charts/gitlab-omnibus/Chart.yaml
@@ -3,7 +3,7 @@ name: gitlab-omnibus
 description: |-
   Helm chart to deploy [Omnibus Gitlab](https://docs.gitlab.com/omnibus/).
 type: application
-version: 0.0.8
+version: 0.0.9
 appVersion: "12.9.2-ee.0"
 home: https://github.com/slamdev/helm-charts/tree/master/charts/gitlab-omnibus
 icon: https://docs.gitlab.com/assets/images/gitlab-logo.svg

diff --git a/charts/gitlab-omnibus/README.md b/charts/gitlab-omnibus/README.md
@@ -2,7 +2,7 @@ gitlab-omnibus
 ==============
 Helm chart to deploy [Omnibus Gitlab](https://docs.gitlab.com/omnibus/).
 
-Current chart version is `0.0.8`
+Current chart version is `0.0.9`
 
 Source code can be found [here](https://github.com/slamdev/helm-charts/tree/master/charts/gitlab-omnibus)
 

diff --git a/charts/gitlab-omnibus/templates/_helpers.tpl b/charts/gitlab-omnibus/templates/_helpers.tpl
@@ -55,7 +55,7 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 Create the name of the service account to use
 */}}
 {{- define "gitlab.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
+{{- if or (.Values.serviceAccount.create) (.Values.backupCronJob.enabled) -}}
     {{ default (include "gitlab.fullname" .) .Values.serviceAccount.name }}
 {{- else -}}
     {{ default "default" .Values.serviceAccount.name }}

diff --git a/charts/gitlab-omnibus/templates/rbac-backup.yaml b/charts/gitlab-omnibus/templates/rbac-backup.yaml
@@ -1,10 +1,4 @@
 {{- if .Values.backupCronJob.enabled -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "gitlab.fullname" . }}-backup
-  namespace: {{ .Release.Namespace }}
----
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
@@ -43,6 +37,6 @@ roleRef:
   name: {{ include "gitlab.fullname" . }}-backup
 subjects:
   - kind: ServiceAccount
-    name: {{ include "gitlab.fullname" . }}-backup
+    name: {{ include "gitlab.fullname" . }}
 
 {{- end -}}
diff --git a/charts/gitlab-omnibus/templates/serviceaccount.yaml b/charts/gitlab-omnibus/templates/serviceaccount.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.serviceAccount.create -}}
+{{- if or (.Values.serviceAccount.create) (.Values.backupCronJob.enabled) -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata: