add support to specify ServiceAccount. just use the supplied name

ind9 · Apr 30, 2020 · 2c7242d · 2c7242d
1 parent ee52acf
commit 2c7242d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 28 deletions.
diff --git a/charts/dgraph/Chart.yaml b/charts/dgraph/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: dgraph
-version: 0.0.8
+version: 0.0.9
 appVersion: v1.2.2
 description: Dgraph is a horizontally scalable and distributed graph database, providing ACID transactions, consistent replication and linearizable reads.
 keywords:

diff --git a/charts/dgraph/templates/_helpers.tpl b/charts/dgraph/templates/_helpers.tpl
@@ -167,26 +167,3 @@ initContainers:
 {{- end }}
 
 {{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "dgraph.zero.serviceAccountName" -}}
-{{- if .Values.zero.serviceAccount.create -}}
-    {{ default (include "dgraph.zero.fullname" .) .Values.zero.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.zero.serviceAccount.name }}
-{{- end -}}
-{{- end -}}
-
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "dgraph.alpha.serviceAccountName" -}}
-{{- if .Values.alpha.serviceAccount.create -}}
-    {{ default (include "dgraph.alpha.fullname" .) .Values.alpha.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.alpha.serviceAccount.name }}
-{{- end -}}
-{{- end -}}
diff --git a/charts/dgraph/templates/alpha-statefulset.yaml b/charts/dgraph/templates/alpha-statefulset.yaml
@@ -77,8 +77,8 @@ spec:
         fsGroup: {{ .Values.alpha.securityContext.fsGroup }}
         runAsUser: {{ .Values.alpha.securityContext.runAsUser }}
       {{- end }}
-      {{- if .Values.alpha.serviceAccount.create }}
-      serviceAccountName: {{ include "dgraph.alpha.serviceAccountName" . }}       
+      {{- if .Values.alpha.serviceAccount.name }}
+      serviceAccountName: {{ .Values.alpha.serviceAccount.name }}       
       {{- end }}
       {{- if .Values.alpha.nodeSelector }}
       nodeSelector:

diff --git a/charts/dgraph/templates/zero-statefulset.yaml b/charts/dgraph/templates/zero-statefulset.yaml
@@ -78,8 +78,8 @@ spec:
         runAsUser: {{ .Values.zero.securityContext.runAsUser }}
       {{- end }}
 
-      {{- if .Values.zero.serviceAccount.create }}
-      serviceAccountName: {{ include "dgraph.zero.serviceAccountName" . }}       
+      {{- if .Values.zero.serviceAccount.name }}
+      serviceAccountName: {{ .Values.zero.serviceAccount.name }}       
       {{- end }}
 
       {{- if .Values.zero.nodeSelector }}