From 30393e2da43323fcc0ba25abc67238dfdee0d7a6 Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Fri, 21 Jan 2022 15:13:02 +0100
Subject: [PATCH] move HYDRA_CLIENT_SECRET and KRATOS_URL out of IF

---
 deployment/helmchart/templates/deployment.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/deployment/helmchart/templates/deployment.yaml b/deployment/helmchart/templates/deployment.yaml
index 1557dec4..e22ce4fd 100644
--- a/deployment/helmchart/templates/deployment.yaml
+++ b/deployment/helmchart/templates/deployment.yaml
@@ -132,12 +132,6 @@ spec:
                 secretKeyRef:
                   name: {{ include "backend.secretName" . }}
                   key: backend-password
-            {{- if (include "backend.smtp.password.enabled" .) }}
-            - name: DASHBOARD_SMTP_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "backend.smtp.secretName" . }}
-                  key: smtp-password
             - name: HYDRA_CLIENT_SECRET
               valueFrom:
                 secretKeyRef:
@@ -145,6 +139,12 @@ spec:
                   key: oidc-client-secret
             - name: KRATOS_URL
               value: {{ .Values.backend.kratosUrl }}
+            {{- if (include "backend.smtp.password.enabled" .) }}
+            - name: DASHBOARD_SMTP_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "backend.smtp.secretName" . }}
+                  key: smtp-password
             {{- end }}
             {{- if .Values.backend.extraEnvVars }}
             {{- include "common.tplvalues.render" (dict "value" .Values.backend.extraEnvVars "context" $) | nindent 12 }}
-- 
GitLab