fix(adder): make ServiceAccount name match release name (#277)

Signed-off-by: Aurora Gaffney <aurora@blinklabs.io>

Author: agaffney

charts/adder/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: adder
 description: "A Helm chart for deploying Adder"
-version: 0.1.0
+version: 0.1.1
 appVersion: 0.33.0
 
 sources:

charts/adder/templates/_helpers.tpl

@@ -17,3 +17,7 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/version: {{ .Chart.AppVersion }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
+
+{{- define "adder.serviceAccountName" -}}
+{{ .Values.serviceAccount.name | default (printf "%s-sa" .Release.Name) }}
+{{- end -}}

charts/adder/templates/deployment.yaml

@@ -24,7 +24,7 @@ spec:
         {{- toYaml .Values.podAnnotations | nindent 8 }}
         {{- end }}
     spec:
-      serviceAccountName: {{ .Values.serviceAccount.name }}
+      serviceAccountName: {{ include "adder.serviceAccountName" . }}
       containers:
         - name: adder
           command: ["adder", "-config", "/adder/config.yaml"]

charts/adder/templates/serviceaccount.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ .Values.serviceAccount.name }}
+  name: {{ include "adder.serviceAccountName" . }}
   {{- if .Values.serviceAccount.annotations }}
   annotations: {{- toYaml .Values.serviceAccount.annotations | nindent 4 }}
   {{- end }}

charts/adder/values.yaml

@@ -26,7 +26,7 @@ service:
   api: 8080
 
 serviceAccount:
-  name: adder-sa
+  # name: adder-sa
   annotations: {}
 
 config: |