From 5a36d40cacf3fe253497e5c8a8aab5131b36f6a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20B=C5=82aszczyk?= Date: Fri, 1 Dec 2023 14:46:04 +0100 Subject: [PATCH] fix: unify secret handling for hydra (#657) --- hacks/values/hydra.yaml | 7 +++++++ helm/charts/hydra/templates/_helpers.tpl | 18 +++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/hacks/values/hydra.yaml b/hacks/values/hydra.yaml index 8838559754..9e4a0c669f 100644 --- a/hacks/values/hydra.yaml +++ b/hacks/values/hydra.yaml @@ -28,6 +28,13 @@ hydra: - "foo bar 123 456 lorem 1" - "foo bar 123 456 lorem 2" - "foo bar 123 456 lorem 3" + cookie: + - "OG5XbmxXa3dYeGplQXpQanYxeEFuRUFa" + - "foo bar 123 456 lorem" + - "foo bar 123 456 lorem 1" + - "foo bar 123 456 lorem 2" + - "foo bar 123 456 lorem 3" + maester: enabled: false diff --git a/helm/charts/hydra/templates/_helpers.tpl b/helm/charts/hydra/templates/_helpers.tpl index d1bb5edfce..969dec06c5 100644 --- a/helm/charts/hydra/templates/_helpers.tpl +++ b/helm/charts/hydra/templates/_helpers.tpl @@ -103,11 +103,19 @@ Generate the secrets.system value Generate the secrets.cookie value */}} {{- define "hydra.secrets.cookie" -}} -{{- if (.Values.hydra.config.secrets).cookie -}} -{{- .Values.hydra.config.secrets.cookie }} -{{- else -}} -{{- include "hydra.secrets.system" . }} -{{- end -}} + {{- if (.Values.hydra.config.secrets).cookie -}} + {{- if kindIs "slice" .Values.hydra.config.secrets.cookie -}} + {{- if gt (len .Values.hydra.config.secrets.cookie) 1 -}} + "{{- join "\",\"" .Values.hydra.config.secrets.cookie -}}" + {{- else -}} + {{- join "" .Values.hydra.config.secrets.cookie -}} + {{- end -}} + {{- else -}} + {{- fail "Expected hydra.config.secrets.cookie to be a list of strings" -}} + {{- end -}} + {{- else -}} + {{- include "hydra.secrets.system" . }} + {{- end -}} {{- end -}} {{/*