Skip to content

Commit 7a1ffd0

Browse files
author
Carlisia Campos
authored
Merge pull request #29 from myheritage/add_support_for_serviceaccount_annotations
Adding support for defining annotations on the serviceaccount, which …
2 parents 0530e63 + e7e01e8 commit 7a1ffd0

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

charts/velero/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v1
22
appVersion: 1.2.0
33
description: A Helm chart for velero
44
name: velero
5-
version: 2.8.0
5+
version: 2.8.1
66
home: https://github.com/vmware-tanzu/velero
77
icon: https://cdn-images-1.medium.com/max/1600/1*-9mb3AKnKdcL_QD3CMnthQ.png
88
sources:

charts/velero/templates/serviceaccount-server.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ apiVersion: v1
33
kind: ServiceAccount
44
metadata:
55
name: {{ include "velero.serverServiceAccount" . }}
6+
{{- if .Values.serviceAccount.server.annotations }}
7+
annotations: {{ toYaml .Values.serviceAccount.server.annotations | nindent 4 }}
8+
{{- end }}
69
labels:
710
app.kubernetes.io/name: {{ include "velero.name" . }}
811
app.kubernetes.io/instance: {{ .Release.Name }}

charts/velero/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ serviceAccount:
151151
server:
152152
create: true
153153
name:
154+
annotations:
154155

155156
# Info about the secret to be used by the Velero deployment, which
156157
# should contain credentials for the cloud provider IAM account you've

0 commit comments

Comments
 (0)