Fixes #88 - ExistingSecret

Signed-off-by: W. Kavanaugh Latiolais <[email protected]>
vmware-tanzu · Aug 6, 2020 · 8be793d · 8be793d
1 parent 1dba1f5
commit 8be793d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/charts/velero/templates/deployment.yaml b/charts/velero/templates/deployment.yaml
@@ -110,16 +110,16 @@ spec:
           {{- if .Values.credentials.useSecret }}
             {{- if eq $provider "aws" }}
             - name: AWS_SHARED_CREDENTIALS_FILE
-              value: /credentials/cloud
+              value: /credentials/{{ .Values.credentials.existingSecretKey }}
             {{- else if eq $provider "gcp"}}
             - name: GOOGLE_APPLICATION_CREDENTIALS
-              value: /credentials/cloud
+              value: /credentials/{{ .Values.credentials.existingSecretKey }}
             {{- else if eq $provider "azure" }}
             - name: AZURE_CREDENTIALS_FILE
-              value: /credentials/cloud
+              value: /credentials/{{ .Values.credentials.existingSecretKey }}
             {{- else if eq $provider "alibabacloud" }}
             - name: ALIBABA_CLOUD_CREDENTIALS_FILE
-              value: /credentials/cloud
+              value: /credentials/{{ .Values.credentials.existingSecretKey }}
             {{- end }}
           {{- end }}
           {{- with .Values.configuration.extraEnvVars }}

diff --git a/charts/velero/values.yaml b/charts/velero/values.yaml
@@ -200,6 +200,7 @@ credentials:
   # Name of a pre-existing secret (if any) in the Velero namespace
   # that should be used to get IAM account credentials. Optional.
   existingSecret:
+  existingSecretKey: cloud
   # Data to be stored in the Velero secret, if `useSecret` is
   # true and `existingSecret` is empty. This should be the contents
   # of your IAM credentials file.