From a41ddd5451a9fbd3c6319827fee3eaffbd931271 Mon Sep 17 00:00:00 2001
From: Andreas Niemann <a.niemann@olsitec.de>
Date: Thu, 21 Mar 2024 15:19:36 +0100
Subject: [PATCH] fix(univention-management-stack): Update ldap-notifier and
 ldap-server

---
 .../values-stack-data-ums.yaml.gotmpl                         | 2 +-
 .../values-udm-rest-api.yaml.gotmpl                           | 4 ++--
 helmfile/environments/default/charts.yaml                     | 4 ++--
 helmfile/environments/default/images.yaml                     | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/helmfile/apps/univention-management-stack/values-stack-data-ums.yaml.gotmpl b/helmfile/apps/univention-management-stack/values-stack-data-ums.yaml.gotmpl
index 56a48968..4062cc56 100644
--- a/helmfile/apps/univention-management-stack/values-stack-data-ums.yaml.gotmpl
+++ b/helmfile/apps/univention-management-stack/values-stack-data-ums.yaml.gotmpl
@@ -50,7 +50,7 @@ stackDataContext:
   initialPasswordAdministrator: {{ .Values.secrets.univentionManagementStack.systemAccounts.administratorPassword | quote }}
   initialPasswordSysIdpUser: {{ .Values.secrets.univentionManagementStack.systemAccounts.sysIdpUserPassword | quote }}
   umcPostgresqlHostname: {{ .Values.databases.umsSelfservice.host | quote }}
-  umcPostgresqUsername: {{ .Values.databases.umsSelfservice.username | quote }}
+  umcPostgresqlUsername: {{ .Values.databases.umsSelfservice.username | quote }}
   umcMemcachedHostname: {{ .Values.cache.umsSelfservice.host | quote }}
   umcMemcachedUsername: "selfservice"
 
diff --git a/helmfile/apps/univention-management-stack/values-udm-rest-api.yaml.gotmpl b/helmfile/apps/univention-management-stack/values-udm-rest-api.yaml.gotmpl
index 2eefbba5..8a1ab7da 100644
--- a/helmfile/apps/univention-management-stack/values-udm-rest-api.yaml.gotmpl
+++ b/helmfile/apps/univention-management-stack/values-udm-rest-api.yaml.gotmpl
@@ -43,7 +43,7 @@ containerSecurityContext:
 udmRestApi:
   secretRef: ums-udm-rest-api-credentials
   ldap:
-    uri: "ldap://{{ .Values.ldap.host }}:389"      
+    uri: "ldap://{{ .Values.ldap.host }}:389"
     baseDN: {{ .Values.ldap.baseDn | quote }}
   image:
     registry: {{ .Values.global.imageRegistry | default .Values.images.umsUdmRestApi.registry | quote }}
@@ -59,6 +59,6 @@ extraSecrets:
   - name: ums-udm-rest-api-credentials
     stringData:
       ldap.secret: {{ .Values.secrets.univentionManagementStack.ldapSecret | quote }}
-      machine.secret: {{ .Values.secrets.univentionManagementStack.ldapSecret | b64enc | quote }}
+      machine.secret: {{ .Values.secrets.univentionManagementStack.ldapSecret | quote }}
 
 ...
diff --git a/helmfile/environments/default/charts.yaml b/helmfile/environments/default/charts.yaml
index 1edf2d86..c2aa4c49 100644
--- a/helmfile/environments/default/charts.yaml
+++ b/helmfile/environments/default/charts.yaml
@@ -450,7 +450,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/charts-mirror"
     name: "ldap-notifier"
-    version: "0.10.0"
+    version: "0.10.1"
     verify: true
   umsLdapServer:
     # providerCategory: 'Supplier'
@@ -462,7 +462,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/charts-mirror"
     name: "ldap-server"
-    version: "0.10.0"
+    version: "0.10.1"
     verify: true
   umsNotificationsApi:
     # providerCategory: 'Supplier'
diff --git a/helmfile/environments/default/images.yaml b/helmfile/environments/default/images.yaml
index 553b7811..76e32056 100644
--- a/helmfile/environments/default/images.yaml
+++ b/helmfile/environments/default/images.yaml
@@ -566,7 +566,7 @@ images:
     # upstreamMirrorStartFrom: ['0', '8', '2']
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/ldap-notifier"
-    tag: "0.10.0@sha256:c2532b7a0920f49c115a58f1660cb7af495ebbb0e2eac0bb5f6723c59633a019"
+    tag: "0.10.1@sha256:940eb9c20c53f90aa477699c0393242a7064d974a856d714ad151069e8d12af4"
   umsLdapServer:
     # providerCategory: 'Supplier'
     # providerResponsible: 'Univention'
@@ -576,7 +576,7 @@ images:
     # upstreamMirrorStartFrom: ['0', '8', '2']
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/ldap-server"
-    tag: "0.10.0@sha256:ee54a0c6bf2e1d24fa04e7487cbebdec0a344f5db8f9a706db2b982fd07bc720"
+    tag: "0.10.1@sha256:5ae54faec6074c4653ef837158262dd6e7b7ff414f8d8722e35f929543a6a6ef"
   umsNotificationsApi:
     # providerCategory: 'Supplier'
     # providerResponsible: 'Univention'