From c4989d41e886f6bfac9240d5311355957c0707c0 Mon Sep 17 00:00:00 2001 From: Filippo Ledda Date: Fri, 22 Nov 2024 15:05:47 +0100 Subject: [PATCH] CH-162 fix comments --- .../helm/templates/auto-secrets.yaml | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/deployment-configuration/helm/templates/auto-secrets.yaml b/deployment-configuration/helm/templates/auto-secrets.yaml index a7d3b0b8..280e1e27 100644 --- a/deployment-configuration/helm/templates/auto-secrets.yaml +++ b/deployment-configuration/helm/templates/auto-secrets.yaml @@ -8,36 +8,35 @@ metadata: labels: app: {{ .app.harness.deployment.name }} type: Opaque -{{- $secret := (lookup "v1" "Secret" .root.Values.namespace $secret_name) }} -{{- if $secret }} -# secret already exists +{{ $secret := (lookup "v1" "Secret" .root.Values.namespace $secret_name) }} +{{/*- $secret := dict "data" (dict "test" "test") */}} stringData: +{{- if $secret }} {{- range $k, $v := .app.harness.secrets }} - {{- if and $v (eq (typeOf $v) "string") }} - {{- if (ne $v "?")}} - # Set secret value to value in values.yaml if specified - {{ $k }}: {{ $v }} - {{- else }} - # Refresh at any deployment for ? (pure random) value - {{ $k }}: {{ randAlphaNum 20 }} - {{- end }} + {{- if $v }} + {{- if eq (typeOf $v) "string" }} + {{- if ne $v "?" }} + {{/* Set secret value to value in values.yaml if specified */}} + {{ $k }}: {{ $v | quote }} + {{- else }} + {{/* Refresh at any deployment for ? (pure random) value */}} + {{ $k }}: {{ randAlphaNum 20 | quote }} + {{- end }} + {{- end }} {{- else if eq (typeOf $secret.data) "map" }} {{- if not (hasKey $secret.data $k) }} - # Create a random secret value if not specified in values.yaml if - # it is not set and it is not already in the deployed secret (static random secret) - {{ $k }}: {{ randAlphaNum 20 }} + {{/* Create a random secret value if not specified in values.yaml if + it is not set and it is not already in the deployed secret (static random secret) */}} + {{ $k }}: {{ randAlphaNum 20 | quote }} {{- end}} - {{- else }} - failsafe: check your values file + {{/* if it's not set and it's not ?, ignore */}} {{- end }} {{- end }} {{- else }} -# secret doesn't exist -stringData: - {{- range $k, $v := .app.harness.secrets }} - {{ $k }}: {{ $v | default (randAlphaNum 20) }} - {{- end }} + {{- range $k, $v := .app.harness.secrets }} + {{ $k }}: {{ $v | default (randAlphaNum 20) | quote }} {{- end }} +{{- end }} --- {{- end }} {{- range $app := .Values.apps }}