[stable/grafana] Allow to define GF admin user and admin password in … (

helm#11851) * [stable/grafana] Allow to define GF admin user and admin password in value file as env Signed-off-by: Cyrille <[email protected]> * [stable/grafana] Bump version Signed-off-by: Cyrille <[email protected]>
agolo · Mar 1, 2019 · f7211a9 · f7211a9
1 parent 0e99601
commit f7211a9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: grafana
-version: 2.2.0
+version: 2.2.1
 appVersion: 6.0.0
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.

diff --git a/stable/grafana/templates/deployment.yaml b/stable/grafana/templates/deployment.yaml
@@ -206,16 +206,20 @@ spec:
               containerPort: 3000
               protocol: TCP
           env:
+            {{- if not .Values.env.GF_SECURITY_ADMIN_USER }}
             - name: GF_SECURITY_ADMIN_USER
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.admin.existingSecret | default (include "grafana.fullname" .) }}
                   key: {{ .Values.admin.userKey | default "admin-user" }}
+            {{- end }}
+            {{- if not .Values.env.GF_SECURITY_ADMIN_PASSWORD }}
             - name: GF_SECURITY_ADMIN_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.admin.existingSecret | default (include "grafana.fullname" .) }}
                   key: {{ .Values.admin.passwordKey | default "admin-password" }}
+            {{- end }}
             {{- if .Values.plugins }}
             - name: GF_INSTALL_PLUGINS
               valueFrom: