From 5bd10b008ae3d98264a70c47501fbf1d76cc1cc5 Mon Sep 17 00:00:00 2001
From: Kyle Schouviller <kyschouv@microsoft.com>
Date: Wed, 15 Jan 2020 18:10:36 -0800
Subject: [PATCH] [stable/grafana] Enabling environment variables to be
 composed from secrets. (#20182)

* [stable/grafana] Moving env declarations after envValueFrom so env variables can be composed from secret values.

Signed-off-by: Kyle Schouviller <kyle0654@hotmail.com>

* [stable/grafana] Bumping chart version

Signed-off-by: Kyle Schouviller <kyle0654@hotmail.com>

Co-authored-by: Kyle Schouviller <kyle0654@hotmail.com>
---
 stable/grafana/Chart.yaml         | 2 +-
 stable/grafana/templates/_pod.tpl | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

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: