From 8f44dfe0e855e9b55fafc5b366ec4ca0a6ca68e2 Mon Sep 17 00:00:00 2001 From: Juan Pedro Torres Date: Sat, 10 Aug 2024 18:11:12 +0200 Subject: [PATCH] feat: OpenDesk UDM loader --- helmfile/apps/nubus/values-nubus.yaml.gotmpl | 41 +++++++++++++++++++- helmfile/environments/default/charts.yaml | 2 +- helmfile/environments/default/images.yaml | 4 +- 3 files changed, 43 insertions(+), 4 deletions(-) diff --git a/helmfile/apps/nubus/values-nubus.yaml.gotmpl b/helmfile/apps/nubus/values-nubus.yaml.gotmpl index bd37e3d8..82c4f625 100644 --- a/helmfile/apps/nubus/values-nubus.yaml.gotmpl +++ b/helmfile/apps/nubus/values-nubus.yaml.gotmpl @@ -38,7 +38,7 @@ global: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/images/opendesk-nubus" imagePullPolicy: "IfNotPresent" - tag: "1.1.0" + tag: "1.2.0" # -- Allows to configure the system extensions to load. This is intended for # internal usage, prefer to use `global.extensions` for user configured @@ -212,6 +212,45 @@ nubusStackDataUms: externalMailDomain: {{ .Values.global.mailDomain | default .Values.global.domain }} umcHtmlTitle: "openDesk Portal" installUmcPolicies: true + templateContext: + portalRealtimeCollaborationLinkBase: {{ printf "https://%s.%s" .Values.global.hosts.element .Values.global.domain }} + portalRealtimeVideoconferenceLinkBase: {{ printf "https://%s.%s" .Values.global.hosts.jitsi .Values.global.domain }} + portalManagementProjectLinkBase: {{ printf "https://%s.%s" .Values.global.hosts.openproject .Values.global.domain }} + portalManagementKnowledgeLinkBase: {{ printf "https://%s.%s" .Values.global.hosts.xwiki .Values.global.domain }} + portalGroupwareLinkBase: {{ printf "https://%s.%s" .Values.global.hosts.openxchange .Values.global.domain }} + portalFileshareLinkBase: {{ printf "https://%s.%s" .Values.global.hosts.nextcloud .Values.global.domain }} + portalTitleDE: "openDesk Portal" + portalTitleEN: "openDesk Portal" + oxDefaultContext: "1" + ldapSearchUsers: + {{- range $username, $password := .Values.secrets.nubus.ldapSearch }} + - username: {{ printf "ldapsearch_%s" $username | quote }} + password: {{ $password | quote }} + lastname: "LDAP-Search-User" + {{- end }} + ldapSystemUsers: [] + portaltileGroupUserStandard: + - 'cn=Domain Users,cn=groups,{{ .Values.ldap.baseDn }}' + - 'cn=Domain Users,cn=groups,{{ .Values.ldap.baseDn }}' + portaltileGroupUserAdmin: + - 'cn=Domain Admins,cn=groups,{{ .Values.ldap.baseDn }}' + - 'cn=Support,cn=groups,{{ .Values.ldap.baseDn }}' + portaltileGroupUserAll: + - 'cn=Domain Admins,cn=groups,{{ .Values.ldap.baseDn }}' + - 'cn=Domain Users,cn=groups,{{ .Values.ldap.baseDn }}' + portaltileGroupGroupware: + - 'cn=managed-by-attribute-Groupware,cn=groups,{{ .Values.ldap.baseDn }}' + portaltileGroupFileshare: + - 'cn=managed-by-attribute-Fileshare,cn=groups,{{ .Values.ldap.baseDn }}' + portaltileGroupManagementProject: + - 'cn=managed-by-attribute-Projectmanagement,cn=groups,{{ .Values.ldap.baseDn }}' + portaltileGroupManagementKnowledge: + - 'cn=managed-by-attribute-Knowledgemanagement,cn=groups,{{ .Values.ldap.baseDn }}' + portaltileGroupManagementLearn: + - 'cn=managed-by-attribute-Learnmanagement,cn=groups,{{ .Values.ldap.baseDn }}' + portaltileGroupLiveCollaboration: + - 'cn=managed-by-attribute-Livecollaboration,cn=groups,{{ .Values.ldap.baseDn }}' + nubusUmcServer: memcached: auth: diff --git a/helmfile/environments/default/charts.yaml b/helmfile/environments/default/charts.yaml index 2776e988..53d7b810 100644 --- a/helmfile/environments/default/charts.yaml +++ b/helmfile/environments/default/charts.yaml @@ -254,7 +254,7 @@ charts: registry: "artifacts.software-univention.de" repository: "nubus/charts" name: "nubus" - version: "0.35.0" + version: "0.37.0" verify: true opendeskKeycloakBootstrap: # providerCategory: "Platform" diff --git a/helmfile/environments/default/images.yaml b/helmfile/environments/default/images.yaml index de0d3f0b..743a2e16 100644 --- a/helmfile/environments/default/images.yaml +++ b/helmfile/environments/default/images.yaml @@ -265,7 +265,7 @@ images: # upstreamMirrorStartFrom: ["0", "41", "5"] registry: "registry.opencode.de" repository: "bmi/opendesk/components/supplier/univention/images-mirror/data-loader" - tag: "0.60.0@sha256:9b43a66c32f4f66143db00b71cc62966df6ed809ec023a0d573a015f5d15305a" + tag: "0.61.0@sha256:598e9fa176c71a6da90ab200ca52abd88176c8cb22a1bf56fec9cd0daf58f58f" nubusGuardianAuthorizationApi: # providerCategory: "Supplier" # providerResponsible: "Univention" @@ -431,7 +431,7 @@ images: # upstreamMirrorStartFrom: ["0", "10", "0"] registry: "registry.opencode.de" repository: "bmi/opendesk/components/supplier/univention/images-mirror/ox-extension" - tag: "0.10.0@sha256:f6f32ce0486594eca9c8682b10f60e9d174a526d5acd2ba4d0abcb8f522539b9" + tag: "0.11.0@sha256:2cb5a9683b6ff81b995a5c71da52c2ff8177b662bb0be8f11e9cd0c6b48d8a11" nubusPortalConsumer: # providerCategory: "Supplier" # providerResponsible: "Univention"