From 0b974d01da4c0ea5121eebe1def2fce49a594309 Mon Sep 17 00:00:00 2001
From: j37hr0 <jethro.cotton3@gmail.com>
Date: Sun, 22 Mar 2026 20:55:50 +1300
Subject: [PATCH] AI fix to secret mappings for kimai

---
 apps/kimai/values.yaml    | 5 ++---
 secrets/kimaisecrets.yaml | 8 ++++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/apps/kimai/values.yaml b/apps/kimai/values.yaml
index 3bfb8f3..b2912b8 100644
--- a/apps/kimai/values.yaml
+++ b/apps/kimai/values.yaml
@@ -16,13 +16,12 @@ persistence:
 database:
   type: mariadb
 
+existingSecret: kimai-secrets
+
 mariadb:
   enabled: true
   auth:
     existingSecret: kimai-secrets
-    existingSecretMappings:
-      rootPassword: kimai-db-root-password
-      password: kimai-db-password
     username: kimai
   primary:
     persistence:
diff --git a/secrets/kimaisecrets.yaml b/secrets/kimaisecrets.yaml
index 09a4fe2..ee2ffc8 100644
--- a/secrets/kimaisecrets.yaml
+++ b/secrets/kimaisecrets.yaml
@@ -11,6 +11,14 @@ spec:
   target:
     name: kimai-secrets
     creationPolicy: Owner
+    template:
+      engineVersion: v2
+      mergePolicy: Merge
+      data:
+        app-secret: '{{ index . "kimai-admin-password" }}'
+        admin-password: '{{ index . "kimai-admin-password" }}'
+        mailer-url: 'null://localhost'
+        database-url: 'mysql://kimai:{{ index . "mariadb-password" }}@kimai-mariadb/kimai?charset=utf8&serverVersion=10.6'
   data:
     - secretKey: mariadb-root-password
       remoteRef: