From 81c1038d8b948be700d8117615284b1266f3deef Mon Sep 17 00:00:00 2001
From: "olof.pettersson" <olof.pettersson@columbiaroad.com>
Date: Thu, 11 Dec 2025 16:11:03 +0100
Subject: [PATCH] Read db envs from env automatically

---
 templates/configmap.yaml      | 11 -----------
 templates/deployment-app.yaml | 14 ++++----------
 2 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 templates/configmap.yaml

diff --git a/templates/configmap.yaml b/templates/configmap.yaml
deleted file mode 100644
index ff6c510..0000000
--- a/templates/configmap.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "solidtime.fullname" . }}-env
-data:
-  APP_URL: "https://{{ .Values.domain }}"
-  DB_CONNECTION: "pgsql"
-  DB_HOST: "{{ .Release.Name }}-postgresql" # Connects to the dependency
-  DB_PORT: "5432"
-  DB_DATABASE: "{{ .Values.postgresql.auth.database }}"
-  DB_USERNAME: "{{ .Values.postgresql.auth.username }}"
\ No newline at end of file
diff --git a/templates/deployment-app.yaml b/templates/deployment-app.yaml
index 603fecb..ed22cc3 100644
--- a/templates/deployment-app.yaml
+++ b/templates/deployment-app.yaml
@@ -21,13 +21,7 @@ spec:
             - configMapRef:
                 name: {{ include "solidtime.fullname" . }}-env
           env:
-            - name: DB_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.secret.existingSecret | default (printf "%s-secret" (include "solidtime.fullname" .)) }}
-                  key: DB_PASSWORD
-            - name: APP_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.secret.existingSecret | default (printf "%s-secret" (include "solidtime.fullname" .)) }}
-                  key: APP_KEY
\ No newline at end of file
+            {{- range $key, $value := .Values.env }}
+            - name: {{ $key }}
+              value: {{ $value | quote }}
+            {{- end }}
\ No newline at end of file