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

Introduced GF_SECURITY_ADMIN_PASSWORD__FILE (#19972)

Browse Source 
- When set in "env", will disable secret creation and pod env block

Signed-off-by: Etienne Journet <etienne.journet@gmail.com>
This commit is contained in:
etiennejournet
2020-01-22 03:32:35 -08:00
committed by Kubernetes Prow Robot
parent e56f4f5ea6
commit 932f037547
4 changed files with 5 additions and 5 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: 4.3.2
version: 4.4.0
appVersion: 6.5.2
kubeVersion: "^1.8.0-0"
description: The leading tool for querying and visualizing time series and metrics.
stable/grafana/templates/_pod.tpl
+1 -1
View File
@@ -224,7 +224,7 @@ containers:
name: {{ .Values.admin.existingSecret | default (include "grafana.fullname" .) }}
key: {{ .Values.admin.userKey | default "admin-user" }}
{{- end }}
{{- if not .Values.env.GF_SECURITY_ADMIN_PASSWORD }}
{{- if and (not .Values.env.GF_SECURITY_ADMIN_PASSWORD) (not .Values.env.GF_SECURITY_ADMIN_PASSWORD__FILE) }}
- name: GF_SECURITY_ADMIN_PASSWORD
valueFrom:
secretKeyRef:
stable/grafana/templates/deployment.yaml
+2 -2
View File
@@ -38,7 +38,7 @@ spec:
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
checksum/dashboards-json-config: {{ include (print $.Template.BasePath "/dashboards-json-configmap.yaml") . | sha256sum }}
checksum/sc-dashboard-provider-config: {{ include (print $.Template.BasePath "/configmap-dashboard-provider.yaml") . | sha256sum }}
{{- if not .Values.admin.existingSecret }}
{{- if and (not .Values.admin.existingSecret) (not .Values.env.GF_SECURITY_ADMIN_PASSWORD__FILE) }}
checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
{{- end }}
{{- with .Values.podAnnotations }}
@@ -46,4 +46,4 @@ spec:
{{- end }}
spec:
{{- include "grafana.pod" . | nindent 6 }}
{{- end }}
{{- end }}
stable/grafana/templates/secret.yaml
+1 -1
View File
@@ -1,4 +1,4 @@
{{- if not .Values.admin.existingSecret }}
{{- if and (not .Values.admin.existingSecret) (not .Values.env.GF_SECURITY_ADMIN_PASSWORD__FILE) }}
apiVersion: v1
kind: Secret
metadata: