Merge pull request #70 from jenting/fix-azure

Fix Azure

Author: Carlisia Campos

charts/velero/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 1.3.0
 description: A Helm chart for velero
 name: velero
-version: 2.9.2
+version: 2.9.3
 home: https://github.com/vmware-tanzu/velero
 icon: https://cdn-images-1.medium.com/max/1600/1*-9mb3AKnKdcL_QD3CMnthQ.png
 sources:

charts/velero/templates/deployment.yaml

@@ -95,17 +95,20 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: metadata.namespace
-          {{- if and .Values.credentials.useSecret (or (eq $provider "aws") (eq $provider "gcp") (eq $provider "azure") (eq $provider "alibabacloud")) }}
+          {{- if .Values.credentials.useSecret }}
             {{- if eq $provider "aws" }}
             - name: AWS_SHARED_CREDENTIALS_FILE
+              value: /credentials/cloud
             {{- else if eq $provider "gcp"}}
             - name: GOOGLE_APPLICATION_CREDENTIALS
+              value: /credentials/cloud
             {{- else if eq $provider "azure" }}
             - name: AZURE_CREDENTIALS_FILE
-            {{- else }}
+              value: /credentials/cloud
+            {{- else if eq $provider "alibabacloud" }}
             - name: ALIBABA_CLOUD_CREDENTIALS_FILE
-            {{- end }}
               value: /credentials/cloud
+            {{- end }}
           {{- end }}
           {{- with .Values.configuration.extraEnvVars }}
           {{- range $key, $value := . }}

charts/velero/templates/restic-daemonset.yaml

@@ -35,7 +35,7 @@ spec:
       priorityClassName: {{ include "velero.restic.priorityClassName" . }}
       {{- end }}
       volumes:
-        {{- if and .Values.credentials.useSecret (or (eq $provider "aws") (eq $provider "gcp") (eq $provider "alibabacloud")) }}
+        {{- if .Values.credentials.useSecret }}
         - name: cloud-credentials
           secret:
             secretName: {{ include "velero.secretName" . }}
@@ -58,7 +58,7 @@ spec:
             - restic
             - server
           volumeMounts:
-            {{- if and .Values.credentials.useSecret (or (eq $provider "aws") (eq $provider "gcp") (eq $provider "alibabacloud")) }}
+            {{- if .Values.credentials.useSecret }}
             - name: cloud-credentials
               mountPath: /credentials
             {{- end }}
@@ -87,17 +87,20 @@ spec:
                   fieldPath: spec.nodeName
             - name: VELERO_SCRATCH_DIR
               value: /scratch
-          {{- if and .Values.credentials.useSecret (or (eq $provider "aws") (eq $provider "gcp") (eq $provider "azure") (eq $provider "alibabacloud")) }}
+          {{- if .Values.credentials.useSecret }}
             {{- if eq $provider "aws" }}
             - name: AWS_SHARED_CREDENTIALS_FILE
+              value: /credentials/cloud
             {{- else if eq $provider "gcp" }}
             - name: GOOGLE_APPLICATION_CREDENTIALS
+              value: /credentials/cloud
             {{- else if eq $provider "azure" }}
             - name: AZURE_CREDENTIALS_FILE
-            {{- else }}
+              value: /credentials/cloud
+            {{- else if eq $provider "alibabacloud" }}
             - name: ALIBABA_CLOUD_CREDENTIALS_FILE
-            {{- end }}
               value: /credentials/cloud
+            {{- end }}
           {{- end }}
           securityContext:
             privileged: {{ .Values.restic.privileged }}