diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml index bcbb84e573..d5980a7fc0 100644 --- a/stable/grafana/Chart.yaml +++ b/stable/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: grafana -version: 4.3.1 +version: 4.3.2 appVersion: 6.5.2 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/stable/grafana/templates/_pod.tpl b/stable/grafana/templates/_pod.tpl index 0868fc1702..059051a85e 100644 --- a/stable/grafana/templates/_pod.tpl +++ b/stable/grafana/templates/_pod.tpl @@ -250,15 +250,15 @@ containers: name: {{ .Values.smtp.existingSecret }} key: {{ .Values.smtp.passwordKey | default "password" }} {{- end }} -{{- range $key, $value := .Values.env }} - - name: "{{ $key }}" - value: "{{ $value }}" -{{- end }} {{- range $key, $value := .Values.envValueFrom }} - name: {{ $key | quote }} valueFrom: {{ toYaml $value | indent 10 }} {{- end }} +{{- range $key, $value := .Values.env }} + - name: "{{ $key }}" + value: "{{ $value }}" +{{- end }} {{- if .Values.envFromSecret }} envFrom: - secretRef: