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/grafana] Allow to define GF admin user and admin password in … (#11851)

Browse Source 
* [stable/grafana] Allow to define GF admin user and admin password in value file as env

Signed-off-by: Cyrille <cyrille@omise.co>

* [stable/grafana] Bump version

Signed-off-by: Cyrille <cyrille@omise.co>
This commit is contained in:
cyrilleomise
2019-02-28 21:04:33 -08:00
committed by Kubernetes Prow Robot
parent 0e99601419
commit f7211a9c35
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/grafana/Chart.yaml
+1 -1
View File
@@ -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.
stable/grafana/templates/deployment.yaml
+4
View File
@@ -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: