Merge pull request #119 from rosmo/helm-sa-annotations

Add service account specific annotations for Helm chart

Author: rosmo

deploy/chart/Chart.yaml

@@ -9,7 +9,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
+version: 0.1.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

deploy/chart/templates/service-account.yaml

@@ -6,7 +6,8 @@ metadata:
   namespace: {{ include "autoneg.namespace" . | quote }}
   labels: {{- include "autoneg.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
-  {{- with .Values.annotations }}
+  {{- $annotations := merge .Values.annotations .Values.serviceAccount.annotations -}}
+  {{- with $annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}

deploy/chart/values.yaml

@@ -24,6 +24,7 @@ replicas: 1
 serviceAccount:
   create: true
   name: autoneg-controller-manager
+  annotations: {}
 
 nodeSelector:
   iam.gke.io/gke-metadata-server-enabled: "true"