From f3d8cf08efbba1b1dd5969821c3af7603202e67f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Garc=C3=ADa-Mauri=C3=B1o?=
 <garcia-maurino@univention.de>
Date: Fri, 17 May 2024 10:24:55 +0200
Subject: [PATCH] feat(nubus): Cleanup Keycloak values.

---
 .../values-umbrella.yaml.gotmpl               | 26 ++++++++++++-------
 helmfile/environments/default/charts.yaml     |  2 +-
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/helmfile/apps/univention-management-stack/values-umbrella.yaml.gotmpl b/helmfile/apps/univention-management-stack/values-umbrella.yaml.gotmpl
index da70548a..29166799 100644
--- a/helmfile/apps/univention-management-stack/values-umbrella.yaml.gotmpl
+++ b/helmfile/apps/univention-management-stack/values-umbrella.yaml.gotmpl
@@ -993,16 +993,6 @@ keycloak:
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 
   config:
-    admin:
-      password: {{ .Values.secrets.keycloak.adminPassword | quote }}
-    database:
-      host: {{ .Values.databases.keycloak.host | quote }}
-      port: {{ .Values.databases.keycloak.port }}
-      user: {{ .Values.databases.keycloak.username | quote }}
-      database: {{ .Values.databases.keycloak.name | quote }}
-      existingSecret:
-        name: "ums-keycloak-postgresql-credentials"
-        key: "keycloakDatabasePassword"
     logLevel: {{ if .Values.debug.enabled }}"DEBUG"{{ else }}"WARN"{{ end }}
     enableMetrics: true
     # The availability of the admin console is already restricted through the path settings in the Keycloak Extensions
@@ -1010,6 +1000,22 @@ keycloak:
     # through an own ingress.
     exposeAdminConsole: false
 
+  postgresql:
+    connection:
+      host: {{ .Values.databases.keycloak.host | quote }}
+      port: {{ .Values.databases.keycloak.port }}
+    auth:
+      username: {{ .Values.databases.keycloak.username | quote }}
+      database: {{ .Values.databases.keycloak.name | quote }}
+      credentialSecret:
+        name: "ums-keycloak-postgresql-credentials"
+        key: "keycloakDatabasePassword"
+
+  keycloak:
+    auth:
+      username: "kcadmin"
+      password: {{ .Values.secrets.keycloak.adminPassword | quote }}
+
   containerSecurityContext:
     allowPrivilegeEscalation: false
     capabilities:
diff --git a/helmfile/environments/default/charts.yaml b/helmfile/environments/default/charts.yaml
index 6a56c490..752cc1e5 100644
--- a/helmfile/environments/default/charts.yaml
+++ b/helmfile/environments/default/charts.yaml
@@ -378,7 +378,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/charts-mirror"
     name: "ums"
-    version: "0.13.0"
+    version: "0.15.0"
     verify: true
   umsKeycloakBootstrap:
     # providerCategory: "Supplier"