From 3013751e6419d4655dee8865a9dcc95cd3ed56dd Mon Sep 17 00:00:00 2001 From: ryzenpay Date: Sat, 9 May 2026 21:04:16 -0400 Subject: [PATCH] chart env logic hotfix --- charts/wytui/templates/_helpers.tpl | 8 ++++++-- charts/wytui/templates/config/secret.yaml | 2 ++ charts/wytui/values.yaml | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/charts/wytui/templates/_helpers.tpl b/charts/wytui/templates/_helpers.tpl index 8016eb1..ba0439b 100644 --- a/charts/wytui/templates/_helpers.tpl +++ b/charts/wytui/templates/_helpers.tpl @@ -18,7 +18,11 @@ Usage: {{- include "wytui.appEnv" . | nindent 8 }} - name: DATABASE_URL valueFrom: secretKeyRef: + {{- if .Values.postgresql.secret.existing }} + name: {{ .Values.postgresql.secret.name }} + {{- else }} name: {{ .Values.secret.name }} + {{- end }} key: {{ .Values.postgresql.secret.urlKey }} - name: AUTH_SECRET valueFrom: @@ -30,7 +34,7 @@ Usage: {{- include "wytui.appEnv" . | nindent 8 }} - name: NODE_ENV value: "production" {{- if .Values.oidc.enabled }} -- name: OIDC_NAME +- name: OIDC_DISPLAY_NAME value: {{ .Values.oidc.name | quote }} - name: OIDC_CLIENT_ID valueFrom: @@ -42,7 +46,7 @@ Usage: {{- include "wytui.appEnv" . | nindent 8 }} secretKeyRef: name: {{ .Values.oidc.secret.name }} key: {{ .Values.oidc.secret.clientSecretKey }} -- name: OIDC_ISSUER +- name: OIDC_ISSUER_URL valueFrom: secretKeyRef: name: {{ .Values.oidc.secret.name }} diff --git a/charts/wytui/templates/config/secret.yaml b/charts/wytui/templates/config/secret.yaml index cd21165..ad31c8c 100644 --- a/charts/wytui/templates/config/secret.yaml +++ b/charts/wytui/templates/config/secret.yaml @@ -15,7 +15,9 @@ metadata: namespace: {{ .Release.Namespace }} type: Opaque stringData: + {{- if not .Values.postgresql.secret.existing }} {{ .Values.postgresql.secret.urlKey }}: {{ include "wytui.databaseUrl" . | quote }} + {{- end }} {{ .Values.secret.authSecretKey }}: {{ $authSecret | quote }} {{- end }} --- diff --git a/charts/wytui/values.yaml b/charts/wytui/values.yaml index f3cf6cd..50a0749 100644 --- a/charts/wytui/values.yaml +++ b/charts/wytui/values.yaml @@ -32,7 +32,7 @@ oidc: clientSecret: "" clientSecretKey: OIDC_CLIENT_SECRET issuer: "" - issuerKey: OIDC_ISSUER + issuerKey: OIDC_ISSUER_URL postgresql: enabled: true