From 8a305a6714a2652c5d0eb41b7709c2351dff43c6 Mon Sep 17 00:00:00 2001
From: Stefan Wiedemann <wistefan@googlemail.com>
Date: Mon, 18 Nov 2024 11:48:45 +0100
Subject: [PATCH 1/2] change db config

---
 .../templates/database-secrets.yaml              |  2 +-
 charts/data-space-connector/values.yaml          | 16 ++++------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/charts/data-space-connector/templates/database-secrets.yaml b/charts/data-space-connector/templates/database-secrets.yaml
index 1e1b0df..b50e81d 100644
--- a/charts/data-space-connector/templates/database-secrets.yaml
+++ b/charts/data-space-connector/templates/database-secrets.yaml
@@ -11,6 +11,6 @@ data:
   postgres-user-password: {{ randAlphaNum 30 | b64enc | quote }}
   postgres-admin-password: {{ randAlphaNum 30 | b64enc | quote }}
   {{- if (eq .Values.postgresql.auth.enablePostgresUser true) }}
-  postgres-user: "cG9zdGdyZXMK"
+  postgres-user: cG9zdGdyZXMK
   {{- end }}  
 {{- end }}
\ No newline at end of file
diff --git a/charts/data-space-connector/values.yaml b/charts/data-space-connector/values.yaml
index bf3591a..f140299 100644
--- a/charts/data-space-connector/values.yaml
+++ b/charts/data-space-connector/values.yaml
@@ -385,6 +385,10 @@ keycloak:
   # -- host of the external db to be used
   externalDatabase:
     host: postgresql
+    database: keycloak
+    existingSecret: database-secret
+    existingSecretPasswordKey: postgres-admin-password
+    existingSecretUserKey: postgres-user
 
   # -- extra volumes to be mounted
   extraVolumeMounts:
@@ -400,18 +404,6 @@ keycloak:
     # indicates ssl is terminated at the edge
     - name: KC_PROXY
       value: "edge"
-    # config for the db connection
-    - name: KC_DB_URL_HOST
-      value: postgresql
-    - name: KC_DB_URL_DATABASE
-      value: keycloak
-    - name: KC_DB_USERNAME
-      value: postgres
-    - name: KC_DB_PASSWORD
-      valueFrom:
-        secretKeyRef:
-          name: database-secret
-          key: postgres-admin-password
     # password for reading the key store connected to the did
     - name: STORE_PASS
       valueFrom:

From 80153c5107c3ed6617cc0078cf3c4d8aadc1f8e0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 18 Nov 2024 10:53:04 +0000
Subject: [PATCH 2/2] Update helm chart versions

---
 charts/data-space-connector/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/data-space-connector/Chart.yaml b/charts/data-space-connector/Chart.yaml
index f3e911e..da581fd 100644
--- a/charts/data-space-connector/Chart.yaml
+++ b/charts/data-space-connector/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: data-space-connector
 description: Umbrella Chart for the FIWARE Data Space Connector, combining all essential parts to be used by a participant.
 type: application
-version: 7.11.0
+version: 7.11.1
 dependencies:
   - name: postgresql
     condition: postgresql.enabled