Skip to content

fix(secret): read pinnable secrets with dig to survive --reuse-values #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MartinHell merged 1 commit into from
Aug 21, 2026
Merged

fix(secret): read pinnable secrets with dig to survive --reuse-values #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/patchmon/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: patchmon
description: PatchMon v2 – Linux patch management platform with optional Gateway API, Postgres, Valkey, and Guacd
type: application
version: 0.3.6
version: 0.3.7
appVersion: "2.1.3"

maintainers:
Expand Down
18 changes: 15 additions & 3 deletions charts/patchmon/templates/secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,18 @@
{{- $oldOidc = (index (index $s "data") "OIDC_CLIENT_SECRET") | b64dec -}}
{{- end -}}

{{- /*
Read the pinnable secrets with `dig` rather than a direct path. `helm upgrade
--reuse-values` substitutes the previous release's values for the incoming
chart's defaults instead of merging them, so a release created before these
keys existed has no `patchmon.session` / `patchmon.encryption` map at all and
a direct `.Values.patchmon.session.secret` fails to render with
"nil pointer evaluating interface {}.secret".
*/ -}}
{{- $jwtVal := dig "jwt" "secret" "" .Values.patchmon -}}
{{- $sessionVal := dig "session" "secret" "" .Values.patchmon -}}
{{- $aiKeyVal := dig "encryption" "aiKey" "" .Values.patchmon -}}

apiVersion: v1
kind: Secret
metadata:
Expand All @@ -41,9 +53,9 @@ stringData:
{{- if and (eq .Values.database.mode "internal") (not .Values.postgres.auth.existingSecret) }}
POSTGRES_PASSWORD: {{ default (randAlphaNum 32) $oldPg | quote }}
{{- end }}
JWT_SECRET: {{ default (randAlphaNum 64) (default $oldJwt .Values.patchmon.jwt.secret) | quote }}
SESSION_SECRET: {{ default (randAlphaNum 64) (default $oldSession .Values.patchmon.session.secret) | quote }}
AI_ENCRYPTION_KEY: {{ default (randAlphaNum 64) (default $oldAiKey .Values.patchmon.encryption.aiKey) | quote }}
JWT_SECRET: {{ default (randAlphaNum 64) (default $oldJwt $jwtVal) | quote }}
SESSION_SECRET: {{ default (randAlphaNum 64) (default $oldSession $sessionVal) | quote }}
AI_ENCRYPTION_KEY: {{ default (randAlphaNum 64) (default $oldAiKey $aiKeyVal) | quote }}
{{- if .Values.valkey.auth.enabled }}
REDIS_PASSWORD: {{ default (randAlphaNum 32) $oldRedis | quote }}
{{- end }}
Expand Down
Loading