github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[stable/velero] Render extraEnvVars even when not using credentials (#14184)

Browse Source 
* [stable/velero] Render `extraEnvVars` even when not using credentials

Fixes #14130

Signed-off-by: Elisiano Petrini <elisiano@gmail.com>

* [stable/velero] Chart version bump

Signed-off-by: Elisiano Petrini <elisiano@gmail.com>

* [stable/velero] fixed logic

Signed-off-by: Elisiano Petrini <elisiano@gmail.com>
This commit is contained in:
Elisiano Petrini
2019-05-29 02:30:25 -07:00
committed by Kubernetes Prow Robot
parent 5969294f99
commit 970170c2a1
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/velero/Chart.yaml
+1 -1
View File
@@ -2,7 +2,7 @@ apiVersion: v1
appVersion: 1.0.0
description: A Helm chart for velero
name: velero
version: 2.0.2
version: 2.0.3
home: https://github.com/heptio/velero
icon: https://cdn-images-1.medium.com/max/1600/1*-9mb3AKnKdcL_QD3CMnthQ.png
sources:
stable/velero/templates/deployment.yaml
+10 -6
View File
@@ -78,22 +78,26 @@ spec:
mountPath: /credentials
- name: scratch
mountPath: /scratch
{{- end }}
{{- if (or (and .Values.credentials.useSecret (or (eq $provider "aws") (eq $provider "gcp"))) .Values.configuration.extraEnvVars) }}
env:
{{- if eq $provider "aws" }}
- name: AWS_SHARED_CREDENTIALS_FILE
{{- else }}
- name: GOOGLE_APPLICATION_CREDENTIALS
{{- end }}
{{- if and .Values.credentials.useSecret (or (eq $provider "aws") (eq $provider "gcp")) }}
{{- if eq $provider "aws" }}
- name: AWS_SHARED_CREDENTIALS_FILE
{{- else }}
- name: GOOGLE_APPLICATION_CREDENTIALS
{{- end }}
value: /credentials/cloud
- name: VELERO_SCRATCH_DIR
value: /scratch
{{ with .Values.configuration.extraEnvVars }}
{{- end }}
{{- with .Values.configuration.extraEnvVars }}
{{- range $key, $value := . }}
- name: {{ default "none" $key }}
value: {{ default "none" $value }}
{{- end }}
{{- end }}
{{- end }}
{{- if .Values.initContainers }}
initContainers:
{{- toYaml .Values.initContainers | nindent 8 }}