Merge pull request #29 from myheritage/add_support_for_serviceaccount…

…_annotations Adding support for defining annotations on the serviceaccount, which …
vmware-tanzu · Jan 13, 2020 · 7a1ffd0 · 7a1ffd0
2 parents 0530e63 + e7e01e8
commit 7a1ffd0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/charts/velero/Chart.yaml b/charts/velero/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 1.2.0
 description: A Helm chart for velero
 name: velero
-version: 2.8.0
+version: 2.8.1
 home: https://github.com/vmware-tanzu/velero
 icon: https://cdn-images-1.medium.com/max/1600/1*-9mb3AKnKdcL_QD3CMnthQ.png
 sources:

diff --git a/charts/velero/templates/serviceaccount-server.yaml b/charts/velero/templates/serviceaccount-server.yaml
@@ -3,6 +3,9 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "velero.serverServiceAccount" . }}
+{{- if .Values.serviceAccount.server.annotations }}
+  annotations: {{ toYaml .Values.serviceAccount.server.annotations | nindent 4 }}
+{{- end }}
   labels:
     app.kubernetes.io/name: {{ include "velero.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}

diff --git a/charts/velero/values.yaml b/charts/velero/values.yaml
@@ -151,6 +151,7 @@ serviceAccount:
   server:
     create: true
     name:
+    annotations:
 
 # Info about the secret to be used by the Velero deployment, which
 # should contain credentials for the cloud provider IAM account you've