Merge pull request #583 from tuusberg/issue-582

[velero] feat(issue-582): Allow annotating VolumeSnapshotLocation/BackupStorageLocation resources

Author: qiuming-best

charts/velero/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: 1.13.2
 kubeVersion: ">=1.16.0-0"
 description: A Helm chart for velero
 name: velero
-version: 6.4.0
+version: 6.5.0
 home: https://github.com/vmware-tanzu/velero
 icon: https://cdn-images-1.medium.com/max/1600/1*-9mb3AKnKdcL_QD3CMnthQ.png
 sources:

charts/velero/templates/backupstoragelocation.yaml

@@ -8,6 +8,12 @@ kind: BackupStorageLocation
 metadata:
   name: {{ .name | default "default" }}
   namespace: {{ $.Release.Namespace }}
+  {{- with .annotations }}
+  annotations:
+      {{- range $key, $value := . }}
+    {{- $key | nindent 4 }}: {{ $value | quote }}
+    {{- end }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ include "velero.name" $ }}
     app.kubernetes.io/instance: {{ $.Release.Name }}

charts/velero/templates/volumesnapshotlocation.yaml

@@ -8,6 +8,12 @@ kind: VolumeSnapshotLocation
 metadata:
   name: {{ .name | default "default" }}
   namespace: {{ $.Release.Namespace }}
+  {{- with .annotations }}
+  annotations:
+    {{- range $key, $value := . }}
+    {{- $key | nindent 4 }}: {{ $value | quote }}
+    {{- end }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ include "velero.name" $ }}
     app.kubernetes.io/instance: {{ $.Release.Name }}

charts/velero/values.yaml

@@ -362,6 +362,9 @@ configuration:
     #  flag. For Velero client Command like velero backup describe, velero backup logs needs to add the flag --insecure-skip-tls-verify
     #  insecureSkipTLSVerify:
 
+    # annotations allows adding arbitrary annotations to this BackupStorageLocation resource. Optional.
+    annotations: {}
+
   # Parameters for the VolumeSnapshotLocation(s). Configure multiple by adding other element(s) to the volumeSnapshotLocation slice.
   # See https://velero.io/docs/v1.6/api-types/volumesnapshotlocation/
   volumeSnapshotLocation:
@@ -386,6 +389,9 @@ configuration:
   #    snapshotLocation:
   #    project:
 
+    # annotations allows adding arbitrary annotations to this VolumeSnapshotLocation resource. Optional.
+    annotations: {}
+
   # These are server-level settings passed as CLI flags to the `velero server` command. Velero
   # uses default values if they're not passed in, so they only need to be explicitly specified
   # here if using a non-default value. The `velero server` default values are shown in the