fix(sops-cmp): grafana-admin secret needs admin-user key too — chart existingSecret requires both user and password

This commit is contained in:
Story Crater Bot
2026-07-20 23:07:51 -07:00
parent 42cd0204fa
commit 89fa87f7c1
+4 -2
View File
@@ -60,7 +60,9 @@ data:
# ── grafana (logging) ────────────────────────────────────────────── # ── grafana (logging) ──────────────────────────────────────────────
DEC="$(sops -d "$REPO_ROOT/k8s/platform/logging/grafana-secrets.enc.yaml")" DEC="$(sops -d "$REPO_ROOT/k8s/platform/logging/grafana-secrets.enc.yaml")"
emit_secret logging grafana-admin \ # grafana chart's admin.existingSecret needs BOTH admin-user and admin-password.
admin-password=.adminPassword printf 'apiVersion: v1\nkind: Secret\nmetadata:\n name: grafana-admin\n namespace: logging\ntype: Opaque\ndata:\n admin-user: %s\n admin-password: %s\n---\n' \
"$(printf 'admin' | base64 -w0)" \
"$(echo "$DEC" | yq -r '.adminPassword' | base64 -w0)"
emit_secret logging grafana-oidc \ emit_secret logging grafana-oidc \
GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET=.env.GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET=.env.GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET