CHANGELOG.md

+# [2.1.0](https://gitlab.opencode.de/bmi/opendesk/components/platform-development/charts/opendesk-otterize/compare/v2.0.1...v2.1.0) (2024-06-28)
+
+
+### Features
+
+* Add ClientIntents and ProtectedServices to support scalable, rendundant Nubus LDAP server deployments. ([d21f393](https://gitlab.opencode.de/bmi/opendesk/components/platform-development/charts/opendesk-otterize/commit/d21f3933f22fa88445ff8c12ae35a49f12866dec))
+
 ## [2.0.1](https://gitlab.opencode.de/bmi/opendesk/components/platform-development/charts/opendesk-otterize/compare/v2.0.0...v2.0.1) (2024-04-09)
 
 

charts/opendesk-otterize/Chart.yaml

@@ -17,5 +17,5 @@ name: "opendesk-otterize"
 sources:
   - "https://gitlab.souvap-univention.de/souvap/tooling/charts/opendesk-otterize"
 type: "application"
-version: "2.0.1"
+version: "2.1.0"
 ...

charts/opendesk-otterize/README.md

@@ -14,14 +14,14 @@ To install the chart with the release name `my-release`, you have two options:
 
 ```console
 helm repo add opendesk-otterize https://gitlab.opencode.de/api/v4/projects/2293/packages/helm/stable
-helm install my-release --version 2.0.1 opendesk-otterize/opendesk-otterize
+helm install my-release --version 2.1.0 opendesk-otterize/opendesk-otterize
 ```
 
 ### Install via OCI Registry
 
 ```console
 helm repo add opendesk-otterize oci://registry.opencode.de/bmi/opendesk/components/platform-development/charts/opendesk-otterize
-helm install my-release --version 2.0.1 opendesk-otterize/opendesk-otterize
+helm install my-release --version 2.1.0 opendesk-otterize/opendesk-otterize
 ```
 
 ## Requirements

charts/opendesk-otterize/templates/ClientIntents/ox-connector.yaml

@@ -23,6 +23,8 @@ spec:
   calls:
     {{- if .Values.apps.univentionManagementStack.enabled }}
     - name: {{ printf "%s.%s" "ums-ldap-server" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+    - name: {{ printf "%s.%s" "ums-ldap-server-primary" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+    - name: {{ printf "%s.%s" "ums-ldap-server-secondary" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
     {{- end }}
     {{- if .Values.apps.univentionManagementStack.enabled }}
     - name: {{ printf "%s.%s" "ums-ldap-notifier" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}

charts/opendesk-otterize/templates/ClientIntents/ums-ldap-server-primary.yaml

+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
+{{- if and .Values.apps.univentionManagementStack.enabled .Values.clientIntents.enabled }}
+---
+apiVersion: {{ .Values.clientIntents.apiVersion | quote }}
+kind: "ClientIntents"
+metadata:
+  name: "{{ include "common.names.fullname" . }}-ums-ldap-server-primary"
+  namespace: {{ .Values.apps.univentionManagementStack.namespace | default .Release.Namespace | quote }}
+  labels:
+    {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.additionalLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.additionalLabels "context" . ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.additionalAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.additionalAnnotations "context" . ) | nindent 4 }}
+  {{- end }}
+spec:
+  service:
+    name: "ums-ldap-server-primary"
+  calls:
+    - name: {{ printf "%s.%s" "ums-keycloak" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+    - name: {{ printf "%s.%s" "ums-ldap-server-primary" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+...
+{{- end }}

charts/opendesk-otterize/templates/ClientIntents/ums-ldap-server-secondary.yaml

+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
+{{- if and .Values.apps.univentionManagementStack.enabled .Values.clientIntents.enabled }}
+---
+apiVersion: {{ .Values.clientIntents.apiVersion | quote }}
+kind: "ClientIntents"
+metadata:
+  name: "{{ include "common.names.fullname" . }}-ums-ldap-server-secondary"
+  namespace: {{ .Values.apps.univentionManagementStack.namespace | default .Release.Namespace | quote }}
+  labels:
+    {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.additionalLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.additionalLabels "context" . ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.additionalAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.additionalAnnotations "context" . ) | nindent 4 }}
+  {{- end }}
+spec:
+  service:
+    name: "ums-ldap-server-secondary"
+  calls:
+    - name: {{ printf "%s.%s" "ums-keycloak" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+    - name: {{ printf "%s.%s" "ums-ldap-server-primary" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+...
+{{- end }}

charts/opendesk-otterize/templates/ClientIntents/ums-ldap-server.yaml

@@ -22,5 +22,7 @@ spec:
     name: "ums-ldap-server"
   calls:
     - name: {{ printf "%s.%s" "ums-keycloak" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+    - name: {{ printf "%s.%s" "ums-ldap-server-primary" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+    - name: {{ printf "%s.%s" "ums-ldap-server-secondary" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
 ...
 {{- end }}

charts/opendesk-otterize/templates/ClientIntents/ums-portal-consumer.yaml

+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
+{{- if and .Values.apps.univentionManagementStack.enabled .Values.clientIntents.enabled }}
+---
+apiVersion: {{ .Values.clientIntents.apiVersion | quote }}
+kind: "ClientIntents"
+metadata:
+  name: "{{ include "common.names.fullname" . }}-ums-portal-consumer"
+  namespace: {{ .Values.apps.univentionManagementStack.namespace | default .Release.Namespace | quote }}
+  labels:
+    {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.additionalLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.additionalLabels "context" . ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.additionalAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.additionalAnnotations "context" . ) | nindent 4 }}
+  {{- end }}
+spec:
+  service:
+    name: "ums-portal-consumer"
+  calls:
+    - name: {{ printf "%s.%s" "ums-provisioning-api" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+    - name: {{ printf "%s.%s" "ums-udm-rest-api" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+    - name: {{ printf "%s.%s" "minio" (coalesce .Values.apps.minio.namespace .Release.Namespace) | quote }}
+...
+{{- end }}

charts/opendesk-otterize/templates/ClientIntents/ums-portal-listener.yaml

@@ -22,6 +22,8 @@ spec:
     name: "ums-portal-listener"
   calls:
     - name: {{ printf "%s.%s" "ums-ldap-server" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+    - name: {{ printf "%s.%s" "ums-ldap-server-primary" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+    - name: {{ printf "%s.%s" "ums-ldap-server-secondary" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
     - name: {{ printf "%s.%s" "ums-ldap-notifier" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
     - name: {{ printf "%s.%s" "ums-udm-rest-api" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
     - name: {{ printf "%s.%s" "minio" (coalesce .Values.apps.minio.namespace .Release.Namespace) | quote }}

charts/opendesk-otterize/templates/ClientIntents/ums-provisioning-nats.yaml

+{{/*
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
+{{- if and .Values.apps.univentionManagementStack.enabled .Values.clientIntents.enabled }}
+---
+apiVersion: {{ .Values.clientIntents.apiVersion | quote }}
+kind: "ClientIntents"
+metadata:
+  name: "{{ include "common.names.fullname" . }}-ums-provisioning-nats"
+  namespace: {{ .Values.apps.univentionManagementStack.namespace | default .Release.Namespace | quote }}
+  labels:
+    {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.additionalLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.additionalLabels "context" . ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.additionalAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.additionalAnnotations "context" . ) | nindent 4 }}
+  {{- end }}
+spec:
+  service:
+    name: "ums-provisioning-nats"
+  calls:
+    - name: {{ printf "%s.%s" "ums-provisioning-nats" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+...
+{{- end }}

charts/opendesk-otterize/templates/ClientIntents/ums-provisioning-register-consumers.yaml

+{{/*
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
+{{- if and .Values.apps.univentionManagementStack.enabled .Values.clientIntents.enabled }}
+---
+apiVersion: {{ .Values.clientIntents.apiVersion | quote }}
+kind: "ClientIntents"
+metadata:
+  name: "{{ include "common.names.fullname" . }}-ums-provisioning-register-consumers"
+  namespace: {{ .Values.apps.univentionManagementStack.namespace | default .Release.Namespace | quote }}
+  labels:
+    {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.additionalLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.additionalLabels "context" . ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.additionalAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.additionalAnnotations "context" . ) | nindent 4 }}
+  {{- end }}
+spec:
+  service:
+    name: "ums-provisioning-register-consumers"
+  calls:
+    - name: {{ printf "%s.%s" "ums-provisioning-api" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+...
+{{- end }}

charts/opendesk-otterize/templates/ClientIntents/ums-provisioning-udm-listener.yaml

@@ -21,8 +21,9 @@ spec:
   service:
     name: "ums-provisioning-udm-listener"
   calls:
-    - name: {{ printf "%s.%s" "ums-provisioning-api" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
     - name: {{ printf "%s.%s" "ums-ldap-server" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+    - name: {{ printf "%s.%s" "ums-ldap-server-primary" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+    - name: {{ printf "%s.%s" "ums-ldap-server-secondary" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
     - name: {{ printf "%s.%s" "ums-ldap-notifier" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
     - name: {{ printf "%s.%s" "ums-provisioning-nats" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
 ...

charts/opendesk-otterize/templates/ClientIntents/ums-provisioning-udm-transformer.yaml

+{{/*
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
+{{- if and .Values.apps.univentionManagementStack.enabled .Values.clientIntents.enabled }}
+---
+apiVersion: {{ .Values.clientIntents.apiVersion | quote }}
+kind: "ClientIntents"
+metadata:
+  name: "{{ include "common.names.fullname" . }}-ums-provisioning-udm-transformer"
+  namespace: {{ .Values.apps.univentionManagementStack.namespace | default .Release.Namespace | quote }}
+  labels:
+    {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.additionalLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.additionalLabels "context" . ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.additionalAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.additionalAnnotations "context" . ) | nindent 4 }}
+  {{- end }}
+spec:
+  service:
+    name: "ums-provisioning-udm-transformer"
+  calls:
+    - name: {{ printf "%s.%s" "ums-ldap-server" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+    - name: {{ printf "%s.%s" "ums-ldap-server-primary" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+    - name: {{ printf "%s.%s" "ums-ldap-server-secondary" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+    - name: {{ printf "%s.%s" "ums-provisioning-api" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+    - name: {{ printf "%s.%s" "ums-provisioning-nats" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+...
+{{- end }}

charts/opendesk-otterize/templates/ClientIntents/ums-selfservice-listener.yaml

@@ -22,6 +22,8 @@ spec:
     name: "ums-selfservice-listener"
   calls:
     - name: {{ printf "%s.%s" "ums-ldap-server" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+    - name: {{ printf "%s.%s" "ums-ldap-server-primary" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+    - name: {{ printf "%s.%s" "ums-ldap-server-secondary" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
     - name: {{ printf "%s.%s" "ums-ldap-notifier" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
     - name: {{ printf "%s.%s" "ums-umc-server" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
 ...

charts/opendesk-otterize/templates/ClientIntents/ums-udm-rest-api.yaml

@@ -22,5 +22,7 @@ spec:
     name: "ums-udm-rest-api"
   calls:
     - name: {{ printf "%s.%s" "ums-ldap-server" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+    - name: {{ printf "%s.%s" "ums-ldap-server-primary" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+    - name: {{ printf "%s.%s" "ums-ldap-server-secondary" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
 ...
 {{- end }}

charts/opendesk-otterize/templates/ClientIntents/ums-umc-server.yaml

@@ -22,6 +22,8 @@ spec:
     name: "ums-umc-server"
   calls:
     - name: {{ printf "%s.%s" "ums-ldap-server" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+    - name: {{ printf "%s.%s" "ums-ldap-server-primary" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
+    - name: {{ printf "%s.%s" "ums-ldap-server-secondary" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
     - name: {{ printf "%s.%s" "ums-keycloak" (coalesce .Values.apps.univentionManagementStack.namespace .Release.Namespace) | quote }}
     {{- if .Values.apps.postfix.enabled }}
     - name: {{ printf "%s.%s" "postfix" (coalesce .Values.apps.postfix.namespace .Release.Namespace) | quote }}

charts/opendesk-otterize/templates/ProtectedServices/ums-ldap-server-primary.yaml

+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
+{{- if and .Values.apps.univentionManagementStack.enabled .Values.protectedServices.enabled }}
+---
+apiVersion: {{ .Values.protectedServices.apiVersion | quote }}
+kind: "ProtectedService"
+metadata:
+  name: "{{ include "common.names.fullname" . }}-ums-ldap-server-primary"
+  namespace: {{ .Values.apps.univentionManagementStack.namespace | default .Release.Namespace | quote }}
+  labels:
+    {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.additionalLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.additionalLabels "context" . ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.additionalAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.additionalAnnotations "context" . ) | nindent 4 }}
+  {{- end }}
+spec:
+  name: "ums-ldap-server-primary"
+...
+{{- end }}

charts/opendesk-otterize/templates/ProtectedServices/ums-ldap-server-secondary.yaml

+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
+{{- if and .Values.apps.univentionManagementStack.enabled .Values.protectedServices.enabled }}
+---
+apiVersion: {{ .Values.protectedServices.apiVersion | quote }}
+kind: "ProtectedService"
+metadata:
+  name: "{{ include "common.names.fullname" . }}-ums-ldap-server-secondary"
+  namespace: {{ .Values.apps.univentionManagementStack.namespace | default .Release.Namespace | quote }}
+  labels:
+    {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.additionalLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.additionalLabels "context" . ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.additionalAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.additionalAnnotations "context" . ) | nindent 4 }}
+  {{- end }}
+spec:
+  name: "ums-ldap-server-secondary"
+...
+{{- end }}

charts/opendesk-otterize/templates/ProtectedServices/ums-portal-consumer.yaml

+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
+{{- if and .Values.apps.univentionManagementStack.enabled .Values.protectedServices.enabled }}
+---
+apiVersion: {{ .Values.protectedServices.apiVersion | quote }}
+kind: "ProtectedService"
+metadata:
+  name: "{{ include "common.names.fullname" . }}-ums-portal-consumer"
+  namespace: {{ .Values.apps.univentionManagementStack.namespace | default .Release.Namespace | quote }}
+  labels:
+    {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.additionalLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.additionalLabels "context" . ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.additionalAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.additionalAnnotations "context" . ) | nindent 4 }}
+  {{- end }}
+spec:
+  name: "ums-portal-consumer"
+...
+{{- end }}

charts/opendesk-otterize/templates/ProtectedServices/ums-provisioning-register-consumers.yaml

+{{/*
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
+{{- if and .Values.apps.univentionManagementStack.enabled .Values.protectedServices.enabled }}
+---
+apiVersion: {{ .Values.protectedServices.apiVersion | quote }}
+kind: "ProtectedService"
+metadata:
+  name: "{{ include "common.names.fullname" . }}-ums-provisioning-register-consumers"
+  namespace: {{ .Values.apps.univentionManagementStack.namespace | default .Release.Namespace | quote }}
+  labels:
+    {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.additionalLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.additionalLabels "context" . ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.additionalAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.additionalAnnotations "context" . ) | nindent 4 }}
+  {{- end }}
+spec:
+  name: "ums-provisioning-register-consumers"
+...
+{{- end }}