restore helper

cryostatio · Aug 7, 2024 · 038fa66 · 038fa66
1 parent faa7b39
commit 038fa66
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/charts/cryostat/templates/_helpers.tpl b/charts/cryostat/templates/_helpers.tpl
@@ -115,6 +115,24 @@ Get or generate a default secret key for object storage.
 {{- end -}}
 {{- end -}}
 
+{{/*
+Get or generate a default secret key for auth proxy cookies.
+*/}}
+{{- define "cryostat.cookieSecret" -}}
+{{- $secret := (lookup "v1" "Secret" .Release.Namespace (printf "%s-cookie-secret" .Release.Name)) -}}
+{{- if $secret -}}
+{{/*
+   Use current secret. Do not regenerate.
+*/}}
+{{- $secret.data.COOKIE_SECRET -}}
+{{- else -}}
+{{/*
+    Generate new secret
+*/}}
+{{- (randAlphaNum 32) | b64enc | quote -}}
+{{- end -}}
+{{- end -}}
+
 {{/*
     Get sanitized list or defaults (if not disabled) as comma-separated list.
 */}}

diff --git a/charts/cryostat/templates/cookie_secret.yaml b/charts/cryostat/templates/cookie_secret.yaml
@@ -1,13 +1,7 @@
-{{- $secret := (lookup "v1" "Secret" .Release.Namespace (printf "%s-cookie-secret" .Release.Name)) -}}
 apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .Release.Name }}-cookie-secret
 type: Opaque
-{{ if $secret -}}
 data:
-  COOKIE_SECRET: {{ $secret.data.COOKIE_SECRET }}
-{{ else -}}
-stringData:
-  COOKIE_SECRET: {{ randAlphaNum 32 }}
-{{ end }}
+  COOKIE_SECRET: {{ include "cryostat.cookieSecret" . }}
diff --git a/charts/cryostat/tests/cookie_secret_test.yaml b/charts/cryostat/tests/cookie_secret_test.yaml
@@ -17,4 +17,4 @@ tests:
           path: type
           value: Opaque
       - exists:
-          path: stringData.COOKIE_SECRET
+          path: data.COOKIE_SECRET