diff --git a/smardigo/templates/connect/secret.yml b/smardigo/templates/connect/secret.yml index 4971003..0b54a52 100644 --- a/smardigo/templates/connect/secret.yml +++ b/smardigo/templates/connect/secret.yml @@ -6,12 +6,12 @@ metadata: annotations: "helm.sh/resource-policy": "keep" data: - # try to get the old secrets - # keep in mind, that a dry-run only returns an empty map - {{- $previous := lookup "v1" "Secret" .Release.Namespace "connect-secrets" }} + # try to get the old secret + # keep in mind, that a dry-run only returns an empty map + {{- $old_sec := lookup "v1" "Secret" .Release.Namespace "connect-secrets" }} - # check, if a secret is already set - {{- if or (not $previous) (not $previous.data) }} + # check, if a secret is already set + {{- if or (not $old_sec) (not $old_sec.data) }} # if not set, then generate a new password JWT_SECRET: "{{ .Values.connect.jwt.secret | b64enc }}" ADMIN_PASSWORD: "{{ .Values.connect.admin.password | b64enc }}" @@ -24,13 +24,13 @@ data: MAIL_PASSWORD: "{{ .Values.connect.mail.password | b64enc }}" {{ else }} # if set, then use the old value - JWT_SECRET: "{{ index $previous.data "JWT_SECRET" }}" - ADMIN_PASSWORD: "{{ index $previous.data "ADMIN_PASSWORD" }}" - DATASOURCE_USERNAME: "{{ index $previous.data "DATASOURCE_USERNAME" }}" - DATASOURCE_PASSWORD: "{{ index $previous.data "DATASOURCE_PASSWORD" }}" - ELASTIC_USERNAME: "{{ index $previous.data "ELASTIC_USERNAME" }}" - ELASTIC_PASSWORD: "{{ index $previous.data "ELASTIC_PASSWORD" }}" - OIDC_CLIENT_SECRET: "{{ index $previous.data "OIDC_CLIENT_SECRET" }}" - MAIL_USER: "{{ index $previous.data "MAIL_USER" }}" - MAIL_PASSWORD: "{{ index $previous.data "MAIL_PASSWORD" }}" + JWT_SECRET: {{ index $old_sec.data "JWT_SECRET" }} + ADMIN_PASSWORD: {{ index $old_sec.data "ADMIN_PASSWORD" }} + DATASOURCE_USERNAME: {{ index $old_sec.data "DATASOURCE_USERNAME" }} + DATASOURCE_PASSWORD: {{ index $old_sec.data "DATASOURCE_PASSWORD" }} + ELASTIC_USERNAME: {{ index $old_sec.data "ELASTIC_USERNAME" }} + ELASTIC_PASSWORD: {{ index $old_sec.data "ELASTIC_PASSWORD" }} + OIDC_CLIENT_SECRET: {{ index $old_sec.data "OIDC_CLIENT_SECRET" }} + MAIL_USER: {{ index $old_sec.data "MAIL_USER" }} + MAIL_PASSWORD: {{ index $old_sec.data "MAIL_PASSWORD" }} {{ end }}