fix: examples

Signed-off-by: David Sabatie <[email protected]>

Author: golgoth31

examples/app/templates/batch-job.yaml

@@ -23,8 +23,7 @@ spec:
         resources: {}
       nodeSelector: {{- toYaml .Values.batchJob.nodeSelector | nindent 8 }}
       restartPolicy: Never
-      serviceAccountName: {{ default "default" (include "app.serviceAccountName"
-        .) }}
+      serviceAccountName: {{ include "app.serviceAccountName" . }}
       tolerations: {{- toYaml .Values.batchJob.tolerations | nindent 8 }}
       topologySpreadConstraints: {{- toYaml .Values.batchJob.topologySpreadConstraints
         | nindent 8 }}

examples/app/templates/cron-job.yaml

@@ -24,8 +24,7 @@ spec:
             resources: {}
           nodeSelector: {{- toYaml .Values.cronJob.nodeSelector | nindent 12 }}
           restartPolicy: OnFailure
-          serviceAccountName: {{ default "default" (include "app.serviceAccountName"
-            .) }}
+          serviceAccountName: {{ include "app.serviceAccountName" . }}
           tolerations: {{- toYaml .Values.cronJob.tolerations | nindent 12 }}
           topologySpreadConstraints: {{- toYaml .Values.cronJob.topologySpreadConstraints
             | nindent 12 }}

examples/app/templates/daemonset.yaml

@@ -33,7 +33,7 @@ spec:
           name: varlibdockercontainers
           readOnly: true
       nodeSelector: {{- toYaml .Values.fluentdElasticsearch.nodeSelector | nindent 8 }}
-      serviceAccountName: {{ default "default" (include "app.serviceAccountName" .) }}
+      serviceAccountName: {{ include "app.serviceAccountName" . }}
       terminationGracePeriodSeconds: 30
       tolerations: {{- toYaml .Values.fluentdElasticsearch.tolerations | nindent 8 }}
       topologySpreadConstraints: {{- toYaml .Values.fluentdElasticsearch.topologySpreadConstraints

examples/app/templates/deployment.yaml

@@ -96,7 +96,7 @@ spec:
         resources: {}
       nodeSelector: {{- toYaml .Values.myapp.nodeSelector | nindent 8 }}
       securityContext: {{- toYaml .Values.myapp.podSecurityContext | nindent 8 }}
-      serviceAccountName: {{ default "default" (include "app.serviceAccountName" .) }}
+      serviceAccountName: {{ include "app.serviceAccountName" . }}
       terminationGracePeriodSeconds: 10
       tolerations: {{- toYaml .Values.myapp.tolerations | nindent 8 }}
       topologySpreadConstraints: {{- toYaml .Values.myapp.topologySpreadConstraints | nindent

examples/app/templates/statefulset.yaml

@@ -30,8 +30,7 @@ spec:
         - mountPath: /usr/share/nginx/html
           name: www
       nodeSelector: {{- toYaml .Values.web.nodeSelector | nindent 8 }}
-      serviceAccountName: {{ default "default" (include "app.serviceAccountName" .)
-        }}
+      serviceAccountName: {{ include "app.serviceAccountName" . }}
       tolerations: {{- toYaml .Values.web.tolerations | nindent 8 }}
       topologySpreadConstraints: {{- toYaml .Values.web.topologySpreadConstraints |
         nindent 8 }}

examples/operator/templates/deployment.yaml

@@ -96,8 +96,7 @@ spec:
       nodeSelector: {{- toYaml .Values.controllerManager.nodeSelector | nindent 8 }}
       securityContext: {{- toYaml .Values.controllerManager.podSecurityContext | nindent
         8 }}
-      serviceAccountName: {{ default "default" (include "operator.serviceAccountName" .)
-        }}
+      serviceAccountName: {{ include "operator.serviceAccountName" . }}
       terminationGracePeriodSeconds: 10
       tolerations: {{- toYaml .Values.controllerManager.tolerations | nindent 8 }}
       topologySpreadConstraints: {{- toYaml .Values.controllerManager.topologySpreadConstraints

examples/operator/templates/serviceaccount.yaml

@@ -5,6 +5,9 @@ metadata:
   name: {{ include "operator.serviceAccountName" . }}
   labels:
   {{- include "operator.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
   annotations:
-  {{- toYaml .Values.serviceAccount.annotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+automountServiceAccountToken: {{ .Values.serviceAccount.automount }}
 {{- end }}

examples/operator/values.yaml

@@ -97,6 +97,7 @@ secretVars:
 serviceAccount:
   annotations:
     k8s.acme.org/some-meta-data: ACME Inc.
+  automount: true
   create: true
   name: ""
 webhookService: