Skip to content

Move the cookieSigningKey to a secret #55

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

Closed
vmoudy wants to merge 8 commits into from
Closed

Move the cookieSigningKey to a secret #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1e2432e
Move the cookieSigningKey to a secret
Feb 6, 2026
118d2c9
bump chart version
Feb 6, 2026
24bcdad
Resolve merge conflicts
Feb 12, 2026
f1dae2c
consistent file naming
Feb 12, 2026
f396a1f
fix merge conflicts
Feb 19, 2026
255ee0f
remove newlines
Feb 19, 2026
52bcd05
Merge remote-tracking branch 'origin/main' into vmoudy/make-cookieSig…
Feb 25, 2026
62f596c
fix add cookie secret in deployment
Feb 25, 2026
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
8 changes: 2 additions & 6 deletions charts/kellnr/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ Cookie signing key used by Kellnr.
Note: Helm templates don't have a "bytes" unit here; we can only validate string length.
*/}}
{{- define "kellnr.cookieSigningKey" -}}
{{- $key := default "" .Values.kellnr.registry.cookieSigningKey -}}
{{- $key := default "" .Values.kellnr.registry.cookieSecret.cookieSigningKey -}}
{{- if ne $key "" -}}
{{- if lt (len $key) 64 -}}
{{- fail "kellnr.registry.cookieSigningKey must be at least 64 characters" -}}
{{- fail "kellnr.registry.cookieSecret.cookieSigningKey must be at least 64 characters" -}}
{{- end -}}
{{- $key -}}
{{- else -}}
Expand Down Expand Up @@ -139,10 +139,6 @@ KELLNR_REGISTRY__TOKEN_DB_RETRY_COUNT: {{ .Values.kellnr.registry.token.db.retry
{{ if not (eq .Values.kellnr.registry.token.db.retryDelayMs nil) }}
KELLNR_REGISTRY__TOKEN_DB_RETRY_DELAY_MS: {{ .Values.kellnr.registry.token.db.retryDelayMs | quote }}
{{ end }}
{{ $cookieKey := include "kellnr.cookieSigningKey" . }}
{{ if ne $cookieKey "" }}
KELLNR_REGISTRY__COOKIE_SIGNING_KEY: {{ $cookieKey | quote }}
{{ end }}
{{ if .Values.kellnr.registry.requiredCrateFields }}
KELLNR_REGISTRY__REQUIRED_CRATE_FIELDS: {{ .Values.kellnr.registry.requiredCrateFields | quote }}
{{ end }}
Expand Down
5 changes: 5 additions & 0 deletions charts/kellnr/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ spec:
valueFrom:
secretKeyRef: {{ toYaml .Values.kellnr.postgres.pwdSecretRef | nindent 16 }}
{{- end }}
{{- if .Values.kellnr.registry.cookieSecret.enabled }}
- name: KELLNR_REGISTRY__COOKIE_SECRET
valueFrom:
secretKeyRef: {{ toYaml .Values.kellnr.registry.cookieSecret.cookieSecretRef | nindent 16 }}
{{- end }}
{{- if and .Values.kellnr.oauth2.enabled .Values.kellnr.oauth2.clientSecretRef.name }}
- name: KELLNR_OAUTH2__CLIENT_SECRET
valueFrom:
Expand Down
9 changes: 9 additions & 0 deletions charts/kellnr/templates/secret-cookie.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{{- $cookieKey := include "kellnr.cookieSigningKey" . -}}
{{ if and .Values.kellnr.registry.cookieSecret.enabled (not (empty $cookieKey)) -}}
apiVersion: v1
kind: Secret
metadata:
name: {{ .Values.kellnr.registry.cookieSecret.cookieSecretRef.name }}
stringData:
{{ .Values.kellnr.registry.cookieSecret.cookieSecretRef.key }}: {{ $cookieKey | quote }}
{{- end }}
9 changes: 7 additions & 2 deletions charts/kellnr/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,13 @@ kellnr:

# Used to sign the session cookie. Must be at least 64 bytes.
# If empty, a random 64-byte value is generated by the chart (when `secret.enabled: true`).
# When `secret.enabled: false`, you should set this to a fixed value.
cookieSigningKey: ""
# When `secret.enabled: false`, set cookieSecret.enable to true and set cookieSecret.cookieSigningKey to a fixed value.
cookieSecret:
enabled: false
cookieSigningKey: ""
cookieSecretRef:
name: kellnr-cookie-secret
key: cookieSigningKey

docs:
enabled: null # false
Expand Down