mirror of
https://github.com/bitnami/charts.git
synced 2026-02-19 19:47:22 +08:00
[bitnami/grafana] Set usePasswordFiles=true by default (#32348)
* [bitnami/grafana] Set `usePasswordFiles=true` by default Signed-off-by: Miguel Ruiz <miguel.ruiz@broadcom.com> * Update CHANGELOG.md Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com> * Update README.md with readme-generator-for-helm Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com> * Bump chart version Signed-off-by: Miguel Ruiz <miguel.ruiz@broadcom.com> * Update CHANGELOG.md Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com> * Update CHANGELOG.md Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com> --------- Signed-off-by: Miguel Ruiz <miguel.ruiz@broadcom.com> Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com> Co-authored-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
@@ -1,8 +1,13 @@
|
||||
# Changelog
|
||||
|
||||
## 11.5.1 (2025-03-13)
|
||||
## 11.6.0 (2025-03-13)
|
||||
|
||||
* [bitnami/grafana] Release 11.5.1 ([#32437](https://github.com/bitnami/charts/pull/32437))
|
||||
* [bitnami/grafana] Set `usePasswordFiles=true` by default ([#32348](https://github.com/bitnami/charts/pull/32348))
|
||||
|
||||
## <small>11.5.1 (2025-03-13)</small>
|
||||
|
||||
* [bitnami/*] Add tanzuCategory annotation (#32409) ([a8fba5c](https://github.com/bitnami/charts/commit/a8fba5cb01f6f4464ca7f69c50b0fbe97d837a95)), closes [#32409](https://github.com/bitnami/charts/issues/32409)
|
||||
* [bitnami/grafana] Release 11.5.1 (#32437) ([602e678](https://github.com/bitnami/charts/commit/602e678b446cac381a72500fafbcd4c640acfb1c)), closes [#32437](https://github.com/bitnami/charts/issues/32437)
|
||||
|
||||
## 11.5.0 (2025-03-12)
|
||||
|
||||
|
||||
@@ -32,4 +32,4 @@ maintainers:
|
||||
name: grafana
|
||||
sources:
|
||||
- https://github.com/bitnami/charts/tree/main/bitnami/grafana
|
||||
version: 11.5.1
|
||||
version: 11.6.0
|
||||
|
||||
@@ -413,6 +413,7 @@ See the [Parameters](#parameters) section to configure the PVC or to disable per
|
||||
| `clusterDomain` | Default Kubernetes cluster domain | `cluster.local` |
|
||||
| `commonLabels` | Labels to add to all deployed objects | `{}` |
|
||||
| `commonAnnotations` | Annotations to add to all deployed objects | `{}` |
|
||||
| `usePasswordFiles` | Mount credentials as files instead of using environment variables | `true` |
|
||||
|
||||
### Grafana parameters
|
||||
|
||||
|
||||
@@ -137,11 +137,16 @@ spec:
|
||||
optional: {{ include "common.tplvalues.render" (dict "value" .Values.grafana.extraEnvVarsSecretOptional "context" $) }}
|
||||
{{- end }}
|
||||
env:
|
||||
{{- if .Values.usePasswordFiles }}
|
||||
- name: GF_SECURITY_ADMIN_PASSWORD_FILE
|
||||
value: {{ printf "/opt/bitnami/grafana/secrets/%s" (include "grafana.adminSecretPasswordKey" .) }}
|
||||
{{- else }}
|
||||
- name: GF_SECURITY_ADMIN_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ include "grafana.adminSecretName" . }}
|
||||
key: {{ include "grafana.adminSecretPasswordKey" . }}
|
||||
{{- end }}
|
||||
{{- if .Values.smtp.enabled }}
|
||||
- name: GF_SMTP_ENABLED
|
||||
value: "true"
|
||||
@@ -161,6 +166,12 @@ spec:
|
||||
- name: GF_SMTP_SKIP_VERIFY
|
||||
value: "{{ .Values.smtp.skipVerify }}"
|
||||
{{- end }}
|
||||
{{- if .Values.usePasswordFiles }}
|
||||
- name: GF_SMTP_USER_FILE
|
||||
value: {{ printf "/opt/bitnami/grafana/secrets/%s" (include "grafana.smtpSecretUserKey" .) }}
|
||||
- name: GF_SMTP_PASSWORD_FILE
|
||||
value: {{ printf "/opt/bitnami/grafana/secrets/%s" (include "grafana.smtpSecretPasswordKey" .) }}
|
||||
{{- else }}
|
||||
- name: GF_SMTP_USER
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
@@ -172,6 +183,7 @@ spec:
|
||||
name: {{ include "grafana.smtpSecretName" . }}
|
||||
key: {{ include "grafana.smtpSecretPasswordKey" . }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if .Values.grafana.extraEnvVars }}
|
||||
{{- include "common.tplvalues.render" (dict "value" .Values.grafana.extraEnvVars "context" $) | nindent 12 }}
|
||||
{{- end }}
|
||||
@@ -188,6 +200,10 @@ spec:
|
||||
- name: empty-dir
|
||||
mountPath: /bitnami/grafana
|
||||
subPath: app-volume-dir
|
||||
{{- if and .Values.usePasswordFiles }}
|
||||
- name: grafana-secrets
|
||||
mountPath: /opt/bitnami/grafana/secrets
|
||||
{{- end }}
|
||||
{{- if .Values.config.useGrafanaIniFile }}
|
||||
- name: grafana-ini
|
||||
mountPath: /opt/bitnami/grafana/conf/grafana.ini
|
||||
@@ -299,6 +315,17 @@ spec:
|
||||
volumes:
|
||||
- name: empty-dir
|
||||
emptyDir: {}
|
||||
{{- if and .Values.usePasswordFiles }}
|
||||
- name: grafana-secrets
|
||||
projected:
|
||||
sources:
|
||||
- secret:
|
||||
name: {{ include "grafana.adminSecretName" . }}
|
||||
{{- if .Values.smtp.enabled }}
|
||||
- secret:
|
||||
name: {{ include "grafana.smtpSecretName" . }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
- name: data
|
||||
{{- if .Values.persistence.enabled }}
|
||||
persistentVolumeClaim:
|
||||
|
||||
@@ -57,6 +57,9 @@ commonLabels: {}
|
||||
## @param commonAnnotations Annotations to add to all deployed objects
|
||||
##
|
||||
commonAnnotations: {}
|
||||
## @param usePasswordFiles Mount credentials as files instead of using environment variables
|
||||
##
|
||||
usePasswordFiles: true
|
||||
## @section Grafana parameters
|
||||
|
||||
## Bitnami Grafana image version
|
||||
|
||||
Reference in New Issue
Block a user