fix: Make dsn optional

ory · Dec 25, 2023 · 9d908b1 · 9d908b1
1 parent d3ffdad
commit 9d908b1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 1 deletion.
diff --git a/helm/charts/kratos/templates/cleanup-cron-job.yaml b/helm/charts/kratos/templates/cleanup-cron-job.yaml
@@ -71,7 +71,7 @@ spec:
                 - --config
                 - /etc/config/kratos.yaml
               env:
-              {{- if not (empty ( include "kratos.dsn" . )) }}
+              {{- if .Values.kratos.config.dsn }}
                 - name: DSN
                   valueFrom:
                     secretKeyRef:

diff --git a/helm/charts/kratos/templates/deployment-kratos.yaml b/helm/charts/kratos/templates/deployment-kratos.yaml
@@ -78,11 +78,13 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
           env:
+          {{- if .Values.kratos.config.dsn }}
             - name: DSN
               valueFrom:
                 secretKeyRef:
                   name: {{ include "kratos.secretname" . }}
                   key: dsn
+          {{- end }}
           {{- if $migrationExtraEnv }}
             {{- toYaml $migrationExtraEnv | nindent 12 }}
           {{- end }}
@@ -145,11 +147,13 @@ spec:
             {{- end }}
             {{- end }}
           env:
+            {{- if .Values.kratos.config.dsn }}
             - name: DSN
               valueFrom:
                 secretKeyRef:
                   name: {{ include "kratos.secretname" . }}
                   key: dsn
+            {{- end }}
             - name: SECRETS_DEFAULT
               valueFrom:
                 secretKeyRef:

diff --git a/helm/charts/kratos/templates/job-migration.yaml b/helm/charts/kratos/templates/job-migration.yaml
@@ -60,11 +60,13 @@ spec:
         args: ["migrate", "sql", "-e", "--yes", "--config", "/etc/config/kratos.yaml"]
         {{- end }}
         env:
+	{{- if .Values.kratos.config.dsn }}
           - name: DSN
             valueFrom:
               secretKeyRef:
                 name: {{ include "kratos.secretname" . }}
                 key: dsn
+	{{- end }}
           {{- if $migrationExtraEnv }}
             {{- toYaml $migrationExtraEnv | nindent 10 }}
           {{- end }}

diff --git a/helm/charts/kratos/templates/secrets.yaml b/helm/charts/kratos/templates/secrets.yaml
@@ -14,7 +14,9 @@ metadata:
 {{- end }}
 type: Opaque
 data:
+  {{- if .Values.kratos.config.dsn }}
   dsn: {{ include "kratos.dsn" . | b64enc | quote }}
+  {{- end }}
   # Generate a random secret if the user doesn't give one. User given secret has priority
   secretsDefault: {{ ( include "kratos.secrets.default" . | default ( randAlphaNum 32 )) | required "Value kratos.config.secrets.default can not be empty!" | b64enc | quote }}
   secretsCookie: {{ ( include "kratos.secrets.cookie" . | default ( randAlphaNum 32 )) | required "Value kratos.config.secrets.cookie can not be empty!" | b64enc | quote }}

diff --git a/helm/charts/kratos/templates/statefulset-mail.yaml b/helm/charts/kratos/templates/statefulset-mail.yaml
@@ -84,11 +84,13 @@ spec:
               value: {{ .Values.statefulSet.log.format }}
             - name: LOG_LEVEL
               value: {{ .Values.statefulSet.log.level }}
+          {{- if .Values.kratos.config.dsn }}
             - name: DSN
               valueFrom:
                 secretKeyRef:
                   name: {{ include "kratos.secretname" . }}
                   key: dsn
+          {{- end }}  
             - name: SECRETS_DEFAULT
               valueFrom:
                 secretKeyRef: