Add support for secret env vars

vmware-tanzu · Apr 13, 2020 · eee7b23 · eee7b23
1 parent 36b3d98
commit eee7b23
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/charts/velero/templates/backupstoragelocation.yaml b/charts/velero/templates/backupstoragelocation.yaml
@@ -16,9 +16,9 @@ spec:
     {{- with .prefix }}
     prefix: {{ . }}
     {{- end }}
-{{ with .config }}
+{{- with .config }}
   config:
-    {{ toYaml . }}
+{{ toYaml . | indent 4 }}
 {{- end }}
 {{- end }}
 {{- end }}
diff --git a/charts/velero/templates/deployment.yaml b/charts/velero/templates/deployment.yaml
@@ -122,6 +122,15 @@ spec:
               value: {{ default "none" $value }}
           {{- end }}
           {{- end }}
+          {{- with .Values.credentials.extraEnvVars }}
+          {{- range $key, $value := . }}
+            - name: {{ default "none" $key }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "velero.fullname" $ }}
+                  key: {{ default "none" $key }}
+          {{- end }}
+          {{- end }}
 {{- if .Values.initContainers }}
       initContainers:
         {{- toYaml .Values.initContainers | nindent 8 }}

diff --git a/charts/velero/templates/secret.yaml b/charts/velero/templates/secret.yaml
@@ -13,4 +13,7 @@ data:
 {{- range $key, $value := .Values.credentials.secretContents }}
   {{ $key }}: {{ $value | b64enc | quote }}
 {{- end }}
+{{- range $key, $value := .Values.credentials.extraEnvVars }}
+  {{ $key }}: {{ $value | b64enc | quote }}
+{{- end }}
 {{- end -}}
diff --git a/charts/velero/templates/volumesnapshotlocation.yaml b/charts/velero/templates/volumesnapshotlocation.yaml
@@ -12,6 +12,6 @@ spec:
   provider: {{ include "velero.volumeSnapshotLocation.provider" . }}
 {{- with .Values.configuration.volumeSnapshotLocation.config }}
   config:
-  {{ toYaml .config }}
+{{ toYaml . | indent 4 }}
 {{- end -}}
 {{- end }}
diff --git a/charts/velero/values.yaml b/charts/velero/values.yaml
@@ -181,6 +181,8 @@ credentials:
   # true and `existingSecret` is empty. This should be the contents
   # of your IAM credentials file.
   secretContents: {}
+  # additional key/value pairs to be used as environment variables such as "DIGITALOCEAN_TOKEN: <your-key>". Values will be stored in the secret.
+  extraEnvVars: {}
 
 # Whether to create backupstoragelocation crd, if false => do not create a default backup location
 backupsEnabled: true