From 2559aa6569a655d732c382ee861eb707573ccd8f Mon Sep 17 00:00:00 2001
From: haburger <haburger>
Date: Wed, 4 Sep 2024 14:23:02 +0000
Subject: [PATCH] new configuration version

---
 .../k8s-idm-db-ca0629d86201d4c4ac857d60.yaml  | 27 -------------------
 ...visidm-admin-ba7c7a3b091df0c4b8ba0bb2.yaml |  6 ++---
 .../default/conf/nevisidm-prod.properties     |  4 +--
 3 files changed, 4 insertions(+), 33 deletions(-)
 delete mode 100644 DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/etc/nevis/k8s-idm-db-ca0629d86201d4c4ac857d60.yaml

diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/etc/nevis/k8s-idm-db-ca0629d86201d4c4ac857d60.yaml b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/etc/nevis/k8s-idm-db-ca0629d86201d4c4ac857d60.yaml
deleted file mode 100644
index fac101e..0000000
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/etc/nevis/k8s-idm-db-ca0629d86201d4c4ac857d60.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-apiVersion: "operator.nevis-security.ch/v1"
-kind: "NevisDatabase"
-metadata:
-  name: "idm"
-  namespace: "adn-agov-nevisidm-admin-01-uat"
-  labels:
-    deploymentTarget: "idm"
-  annotations:
-    projectKey: "DEFAULT-ADN-AGOV-ADMIN-PROJECT"
-    patternId: "ca0629d86201d4c4ac857d60"
-spec:
-  type: "NevisIDM"
-  databaseType: "MariaDB"
-  version: "8.2405.2"
-  url: "mariadb-agov-uat.mariadb.database.azure.com"
-  port: 3306
-  ssl: true
-  database: "nevisidm_uat"
-  bootstrap: false
-  migrate: true
-  rootCredentials:
-    name: "root-adn-agov-nevisidm-admin-01-uat-idm"
-    namespace: "adn-agov-nevisidm-admin-01-uat"
-  podSecurity:
-    policy: "baseline"
-    automountServiceAccountToken: false
-  timeZone: "Europe/Zurich"
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/etc/nevis/k8s-nevisidm-admin-ba7c7a3b091df0c4b8ba0bb2.yaml b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/etc/nevis/k8s-nevisidm-admin-ba7c7a3b091df0c4b8ba0bb2.yaml
index f31de98..ddc8cfb 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/etc/nevis/k8s-nevisidm-admin-ba7c7a3b091df0c4b8ba0bb2.yaml
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/etc/nevis/k8s-nevisidm-admin-ba7c7a3b091df0c4b8ba0bb2.yaml
@@ -46,12 +46,9 @@ spec:
   podDisruptionBudget:
     maxUnavailable: "50%"
   git:
-    tag: "r-a5b664b2c1f534aab19c8301f3618a8c5096d222"
+    tag: "r-62cde4d69ffb364927e8f40db105fc6d83470228"
     dir: "DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm"
     credentials: "git-credentials"
-  database:
-    name: "idm"
-    requiredVersion: "8.2405.2"
   keystores:
   - "idm-default-identity"
   truststores:
@@ -63,4 +60,5 @@ spec:
   timeZone: "Europe/Zurich"
   secrets:
     secret:
+    - "a2068eb83a60702322c13949-27ed70d3"
     - "c418560f50e0332d087e85bf-89ec31e5"
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/nevisidm-prod.properties b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/nevisidm-prod.properties
index bf922f0..d068640 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/nevisidm-prod.properties
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/nevisidm-prod.properties
@@ -3,9 +3,9 @@ web.gui.languages.default=de
 # source: pattern://ca0629d86201d4c4ac857d60
 database.connection.url=jdbc:mariadb://mariadb-agov-uat.mariadb.database.azure.com:3306/nevisidm_uat?pinGlobalTxToPhysicalConnection=1&useMysqlMetadata=true&cachePrepStmts=true&prepStmtCacheSize=1000&useSSL=true&trustStore=/var/opt/keys/trust/idm-db-tls-truststore/truststore.jks
 # source: pattern://ca0629d86201d4c4ac857d60
-database.connection.username=${exec:/var/opt/nevisidm/default/conf/credentials/dbUser}
+database.connection.username=adndbadmin
 # source: pattern://ca0629d86201d4c4ac857d60
-database.connection.password=${exec:/var/opt/nevisidm/default/conf/credentials/dbPassword}
+database.connection.password=secret://a2068eb83a60702322c13949-27ed70d3
 # source: pattern://ba7c7a3b091df0c4b8ba0bb2
 application.mail.smtp.host=greenmail.adn-agov-mail-01-dev.svc
 # source: pattern://ba7c7a3b091df0c4b8ba0bb2