Merge pull request #67 from jenting/fix-azure

Fix azure

Author: nrb

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.0
+version: 2.9.1
 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

@@ -71,11 +71,6 @@ spec:
             - --log-format={{ . }}
             {{- end }}
           {{- end }}
-          {{- if eq $provider "azure" }}
-          envFrom:
-            - secretRef:
-                name: {{ include "velero.secretName" . }}
-          {{- end }}
           {{- with .Values.resources }}
           resources:
             {{- toYaml . | nindent 12 }}

charts/velero/templates/restic-daemonset.yaml

@@ -70,11 +70,6 @@ spec:
             {{- if .Values.restic.extraVolumeMounts }}
             {{- toYaml .Values.restic.extraVolumeMounts | nindent 12 }}
             {{- end }}
-          {{- if and .Values.credentials.useSecret (eq $provider "azure") }}
-          envFrom:
-            - secretRef:
-                name: {{ include "velero.secretName" . }}
-          {{- end }}
           env:
             {{- with .Values.configuration.extraEnvVars }}
             {{- range $key, $value := . }}
@@ -92,11 +87,13 @@ spec:
                   fieldPath: spec.nodeName
             - name: VELERO_SCRATCH_DIR
               value: /scratch
-          {{- if and .Values.credentials.useSecret (or (eq $provider "aws") (eq $provider "gcp") (eq $provider "alibabacloud")) }}
+          {{- if and .Values.credentials.useSecret (or (eq $provider "aws") (eq $provider "gcp") (eq $provider "azure") (eq $provider "alibabacloud")) }}
             {{- if eq $provider "aws" }}
             - name: AWS_SHARED_CREDENTIALS_FILE
             {{- else if eq $provider "gcp" }}
             - name: GOOGLE_APPLICATION_CREDENTIALS
+            {{- else if eq $provider "azure" }}
+            - name: AZURE_CREDENTIALS_FILE
             {{- else }}
             - name: ALIBABA_CLOUD_CREDENTIALS_FILE
             {{- end }}