Skip to content

Commit

Permalink
fix: assertNoLeakedSecrets: grafana/helm-charts#2899
Browse files Browse the repository at this point in the history
  • Loading branch information
AaronForce1 committed Jan 16, 2024
1 parent 1065f89 commit 2138432
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- if and .Values.dashboardReloaderEnabled }}
{{- $namespace := .Release.Namespace -}}
apiVersion: batch/v1
kind: Job
Expand Down Expand Up @@ -30,10 +31,11 @@ spec:
# name: grafana-external-secrets
# key: admin-username
- name: password
value: admin
value: password
# valueFrom:
# secretKeyRef:
# name: grafana-external-secrets
# key: admin-password
restartPolicy: Never
backoffLimit: 1
{{- end }}
14 changes: 12 additions & 2 deletions applications/grafana-stack/grafana/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@ grafana:
nameOverride: grafana
fullnameOverride: grafana
kubeNamespace: grafana-stack

# assertNoLeakedSecrets is a helper function defined in _helpers.tpl that checks if secret
# values are not exposed in the rendered grafana.ini configmap. It is enabled by default.
#
# To pass values into grafana.ini without exposing them in a configmap, use variable expansion:
# https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#variable-expansion
#
# Alternatively, if you wish to allow secret values to be exposed in the rendered grafana.ini configmap,
# you can disable this check by setting assertNoLeakedSecrets to false.
assertNoLeakedSecrets: false

replicas: 1

Expand Down Expand Up @@ -175,8 +185,8 @@ grafanaExternalSecret:
remoteRef:
key: /grafana/${ARGOCD_ENV_ENVIRONMENT}-${ARGOCD_ENV_CLUSTER}/admin/password


# dashboardsToLoad: {} # directory name under dashboards
dashboardReloaderEnabled: false
# dashboardsToLoad: [] # directory name under dashboards
dashboardsToLoad: # only dashboards under these directories will be loaded into grafana
- infrastructure
- ithacanoemon

0 comments on commit 2138432

Please sign in to comment.