Merge pull request #75 from shoplineapp/release/0.9.0

Release/0.9.0
shoplineapp · Apr 18, 2022 · f275343 · f275343
2 parents b49fac7 + 41cbb5c
commit f275343
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/cronjob/Chart.yaml b/cronjob/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 description: Helm chart with simple cronjob template
 name: cronjob
-version: 0.2.0
+version: 0.3.0
 appVersion: 0.0.1
 tillerVersion: ">=2.14.3"
diff --git a/cronjob/templates/cronjob.yaml b/cronjob/templates/cronjob.yaml
@@ -26,7 +26,9 @@ spec:
             {{ $key | quote }} : {{ $value | quote }}
             {{- end }}
         spec:
-          {{- if .Values.serviceAccount }}
+          {{- if .Values.serviceaccount }}
+          serviceAccountName: {{ .Values.serviceaccount.name | default (printf "%s-pod-service-account" .Values.name) }}
+          {{- else if .Values.serviceAccount }}
           serviceAccountName: {{ .Values.name }}-pod-service-account
           {{- end }}
           restartPolicy: Never

diff --git a/cronjob/templates/serviceaccount.yaml b/cronjob/templates/serviceaccount.yaml
@@ -1,4 +1,10 @@
-{{- if .Values.serviceAccount }}
+{{- if .Values.serviceaccount }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  annotations: {{ toYaml .Values.serviceaccount.annotations | nindent 4}}
+  name: {{ .Values.serviceaccount.name | default (printf "%s-pod-service-account" .Values.name) }}
+{{- else if .Values.serviceAccount }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:

diff --git a/cronjob/values.yaml b/cronjob/values.yaml
@@ -30,3 +30,10 @@ envFrom: {}
 #   secretRef:
 #     - test-1-secret
 #     - test-2-secret
+
+serviceaccount: {}
+# example
+# serviceaccount:
+#   annotations:
+#     eks.amazonaws.com/role-arn: <aws-role-arn>
+#     name: <serviceaccount-name>