fix(nubus): Restore systemInformation

fix(nubus): Remove stack-data-swp
fix(nubus): Update chart and images to version 0.57.2
2025-12-07 07:51:38 +01:00 · 2024-09-17 12:59:36 +02:00 · 2024-09-17 08:31:15 +02:00 · 2024-09-17 08:31:15 +02:00 · 2024-09-17 08:31:15 +02:00 · 2024-09-17 08:31:15 +02:00
4 changed files with 19 additions and 41 deletions
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ openDesk is a Kubernetes based, open-source and cloud-native digital workplace s
 openDesk currently features the following functional main components:

 | Function             | Functional Component        | Component<br/>Version                                                                 | Upstream Documentation                                                                                                                       |
-| -------------------- | --------------------------- |---------------------------------------------------------------------------------------| -------------------------------------------------------------------------------------------------------------------------------------------- |
+| -------------------- | --------------------------- | ------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- |
 | Chat & collaboration | Element ft. Nordeck widgets | [1.11.67](https://github.com/element-hq/element-desktop/releases/tag/v1.11.67)        | [For the most recent release](https://element.io/user-guide)                                                                                 |
 | Diagram editor       | CryptPad ft. diagrams.net   | [5.6.0](https://github.com/cryptpad/cryptpad/releases/tag/5.6.0)                      | [For the most recent release](https://docs.cryptpad.org/en/)                                                                                 |
 | File management      | Nextcloud                   | [28.0.5](https://nextcloud.com/de/changelog/#28-0-5)                                  | [Nextcloud 28](https://docs.nextcloud.com/)                                                                                                  |
@@ -38,7 +38,7 @@ openDesk currently features the following functional main components:
 | Portal & IAM         | Nubus                       | Product Preview[^1]                                                                   | [Univention's documentation website](https://docs.software-univention.de/n/en/index.html)                                                    |
 | Project management   | OpenProject                 | [14.4.1](https://www.openproject.org/docs/release-notes/14-4-1/)                      | [For the most recent release](https://www.openproject.org/docs/user-guide/)                                                                  |
 | Videoconferencing    | Jitsi                       | [2.0.9646](https://github.com/jitsi/jitsi-meet/releases/tag/stable%2Fjitsi-meet_9646) | [For the most recent  release](https://jitsi.github.io/handbook/docs/category/user-guide/)                                                   |
-| Weboffice            | Collabora                   | [24.04.7.1.2](https://www.collaboraoffice.com/code-24-04-release-notes/)              | Online documentation available from within the installed application; [Additional resources](https://sdk.collaboraonline.com/)               |
+| Weboffice            | Collabora                   | [24.04.7.2](https://www.collaboraoffice.com/code-24-04-release-notes/)                | Online documentation available from within the installed application; [Additional resources](https://sdk.collaboraonline.com/)               |

 While not all components are perfectly shaped for the execution inside containers, one of the project's objectives is to
 align the applications with best practices regarding container design and operations.
--- a/helmfile/apps/nubus/values-nubus.yaml.gotmpl
+++ b/helmfile/apps/nubus/values-nubus.yaml.gotmpl
@@ -401,38 +401,16 @@ nubusStackDataUms:
      - 'cn=managed-by-attribute-Learnmanagement,cn=groups,{{ .Values.ldap.baseDn }}'
    portaltileGroupLiveCollaboration:
      - 'cn=managed-by-attribute-Livecollaboration,cn=groups,{{ .Values.ldap.baseDn }}'
+    systemInformation:
+      enabled: {{ .Values.functional.admin.portal.deploymentInformation.enabled }}
+      releaseVersion: "Release: {{ .Values.global.systemInformation.releaseVersion }}"
+      deployDate: "Deployed: {{ now | date "2006-01-02T15:04:05-0700" }}"

  nubusUmcServer:
    memcached:
      auth:
        username: ""

-# TODO: Remove values when upstreaming fixes
-nubusStackDataSwp:
-  stackDataSwp:
-    {{- if .Values.functional.admin.portal.deploymentInformation.enabled }}
-    systemInformation:
-      deployDate: "Deployed: {{ now | date "2006-01-02T15:04:05-0700" }}"
-      releaseVersion: "Release: {{ .Values.global.systemInformation.releaseVersion }}"
-    {{- end }}
-  stackDataContext:
-    externalMailDomain: {{ .Values.global.mailDomain | default .Values.global.domain }}
-    smtpHost: {{ printf "%s.%s.svc.%s" "postfix" (.Values.postfix.namespace | default .Release.Namespace) .Values.cluster.networking.domain | quote }}
-    smtpPort: 25
-    smtpUser: ""
-    smtpStartTls: false
-    ldapBase: {{ .Values.ldap.baseDn }}
-    # FIXME: Should be templated correctly in the future
-    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"
-
 nubusUmcServer:
  postgresql:
    bundled: false
--- a/helmfile/environments/default/charts.yaml
+++ b/helmfile/environments/default/charts.yaml
@@ -46,7 +46,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/collabora/charts-mirror"
    name: "collabora-online"
-    version: "1.1.20"
+    version: "1.1.21"
    verify: true
  cryptpad:
    # providerCategory: "Supplier"
@@ -264,7 +264,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/charts-mirror"
    name: "nubus"
-    version: "0.56.1"
+    version: "0.57.2"
    verify: true
  opendeskKeycloakBootstrap:
    # providerCategory: "Platform"
--- a/helmfile/environments/default/images.yaml
+++ b/helmfile/environments/default/images.yaml
@@ -20,7 +20,7 @@ images:
    # upstreamRepository: "bmi/opendesk/components/supplier/collabora/images/collabora-online-for-opendesk"
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/collabora/images/collabora-online-for-opendesk"
-    tag: "24.04.7.1.2@sha256:6e3d64dfdf4a429c374f18947d7c4e987f585a13642817672123fd1963dc8a2d"
+    tag: "24.04.7.2.1@sha256:5b00478f2c6c7372b2a67e68783d9b1a91265679bbd4afdc1416e50720d50ce6"
  cryptpad:
    # providerCategory: "Supplier"
    # providerResponsible: "XWiki"
@@ -413,7 +413,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "9", "4"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/notifications-api"
-    tag: "0.38.1@sha256:da8bed3e1ce40804d8ac4ac5901109dcce8cd76eb7c6c711787fff6cbcc76733"
+    tag: "0.38.2@sha256:86aac1927e3f4b7f8d50773d3211ea180a9d8877345909c0b5504067ae91d7e6"
  nubusOpendeskExtension:
    # providerCategory: "Platform"
    # providerResponsible: "openDesk"
@@ -421,7 +421,7 @@ images:
    # upstreamRepository: "bmi/opendesk/components/platform-development/images/opendesk-nubus"
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/images/opendesk-nubus"
-    tag: "1.4.0@sha256:8f3a278c41b799f23f0559e6bc4ebfe9a3ee3d70a906205ea84597a5411af5d5"
+    tag: "1.5.0-jconde-system-information@sha256:fe56d29536046becaa3593cf8c0035fe42793b286b5e611c4ff2f82f6945bf1d"
  nubusOpenPolicyAgent:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -451,7 +451,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "27", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-consumer"
-    tag: "0.38.1@sha256:beaa9f6f9cf2045781dba6f4aa67ed0b129b0f01a5a719ac038a07be135b6430"
+    tag: "0.38.2@sha256:976211f0b1d17453eed59578a1984174ba40f20276b136e5b66d807e4865e7af"
  nubusPortalExtension:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -471,7 +471,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "9", "4"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-frontend"
-    tag: "0.38.1@sha256:ace41eb46cc751efda5e0c827a5707c0442b454254944a71cd6a7a265a5e2247"
+    tag: "0.38.2@sha256:11f262e64303c3d9fe0709fd72ba30bac4ddd6648f48d945e546076d75576685"
  nubusPortalServer:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -481,7 +481,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "9", "4"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-server"
-    tag: "0.38.1@sha256:3cb56bf434607282bad4a70e6be0ee72d8889c4135b63af91db54d8f48b31b0a"
+    tag: "0.38.2@sha256:6ad0766f6f0a84a2a9e9a72d5ac3ab461ca2aa58fb2c8540d82f56d09428b83e"
  nubusProvisioningDispatcher:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -491,7 +491,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "14", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-dispatcher"
-    tag: "0.38.0@sha256:d583151b108164374bd11dc74626c62aace0ff4ddc5997b08553b559d7c0bf91"
+    tag: "0.39.0@sha256:cff262c399785594a07d61a0645ca304e4da044d37831c29f848d8d70b2e58c9"
  nubusProvisioningEventsAndConsumerApi:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -501,7 +501,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "14", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-events-and-consumer-api"
-    tag: "0.38.0@sha256:b459c3a9bfd51692691736f0afeb0c7ba2d75efe30a5b1e2a8b51c5c48f08ac4"
+    tag: "0.39.0@sha256:9f537eb138863ea9c3f6f7b416e7787ab1841e3e0ba3a8dd39fe35464955d75d"
  nubusProvisioningPrefill:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -511,7 +511,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "14", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-prefill"
-    tag: "0.38.0@sha256:7fe6dfe75c3131ebf9bb9a36210adf4bd0bead06d6214985427d59eb4b420b40"
+    tag: "0.39.0@sha256:72ab91cd235b52875c03411c5488984b482aafc6d58f2064bd5313ab7a119cab"
  nubusProvisioningUdmListener:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -521,7 +521,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "14", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-udm-listener"
-    tag: "0.38.0@sha256:99a7fdc23650c5bcbf58c38ffea86b5fe779b12a834824ae5e206fc5f2c0301a"
+    tag: "0.39.0@sha256:f0e63353f0ea28890c992a374b82ac65f379f9dfd4c7fe645f002b170df1da69"
  nubusProvisioningUdmTransformer:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -531,7 +531,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "14", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-udm-transformer"
-    tag: "0.38.0@sha256:e40b33188f11d82f669532e1f085ba5e1758fd6099f679a759f6ae2b1d0ee3ef"
+    tag: "0.39.0@sha256:64166fae60856da544698b601b70037a93239e9f6072ced890cd5965fab148dc"
  nubusSelfserviceInvitation:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
Author	SHA1	Message	Date
Jaime Conde	e3fd0ed3af	fix(nubus): Restore systemInformation fix(nubus): Remove stack-data-swp	2024-09-17 12:59:36 +02:00
Johannes Lohmer	0dabf39c0f	fix(nubus): Update chart and images to version 0.57.2	2024-09-17 08:31:15 +02:00
Johannes Bornhold	c13748e0a7	fix(nubus): Configure "global.subDomains" based on "global.hosts"	2024-09-17 08:31:15 +02:00
Nubus CI Bot	4167b7be94	feat(nubus): Update chart and images to version 0.56.1	2024-09-17 08:31:15 +02:00
Johannes Bornhold	cd001bc680	fix(ci): Correct the way how credentials for the RUN_TESTS job are extracted	2024-09-17 08:31:15 +02:00
Carlos García-Mauriño	2bb66aaffe	chore(nubus): Remove installUmcPolicies option	2024-09-17 08:31:15 +02:00
Johannes Bornhold	2962324b15	fix(nubus): Update images to match version 0.56.0	2024-09-17 08:31:15 +02:00
Carlos García-Mauriño	d96fc39db5	feat(nubus): Upgrade nubus chart to 0.56.0	2024-09-17 08:31:15 +02:00
Nubus CI Bot	9ae82182cf	feat(nubus): Update chart to version 0.54.1-pre-jlohmer-consumer-race-condition	2024-09-17 08:31:15 +02:00
Johannes Lohmer	b08f640b27	fix(nubus): Clean up portal-listener and selfservice-listener artifacts	2024-09-17 08:31:14 +02:00
Johannes Lohmer	a6efadddf6	fix(nubus): Use helmfile secrets in provisioning and remove unused secrets.	2024-09-17 08:31:14 +02:00
Johannes Lohmer	6d35d26f69	feat(nubus): Activate Nubus Provisioning components and Consumers to replace portal-listener and selfservice-listener	2024-09-17 08:31:14 +02:00
Johannes Lohmer	5bfbd987c9	fix(nubus): Keep provisioning and consumers behind a feature-flag for easier merging This commit should be reverted once we are confident that provisioning and the consumers work as expected.	2024-09-17 08:31:14 +02:00
Johannes Lohmer	c4048958be	fix(nubus): Update nubus provisioning and consumer configuration	2024-09-17 08:31:14 +02:00
Nubus CI Bot	b6ce7f9893	feat(nubus): Update chart to version 0.51.0	2024-09-17 08:31:14 +02:00
Juan Pedro Torres	d4ab65e9bf	feat(nubus): Bump chart version for default tiles removal	2024-09-17 08:31:14 +02:00
Johannes Bornhold	5155c960c2	fix(nubus): Adjust keyring for intercom service	2024-09-17 08:31:14 +02:00
Nubus CI Bot	46111ba718	feat(nubus): Integrate keycloak provisioning	2024-09-17 08:31:13 +02:00
Juan Pedro Torres	12951d4063	feat(nubus): Bump chart version for default tiles removal	2024-09-17 08:31:13 +02:00
Nubus CI Bot	55618b4e29	feat(nubus): Update chart to version 0.47.0	2024-09-17 08:31:13 +02:00
Jaime Conde	c73380710d	fix(nubus): Map Administrator credentials	2024-09-17 08:31:13 +02:00
Jaime Conde	fcacae2c21	fix(nubus): Univention Portal images	2024-09-17 08:31:13 +02:00
Nubus CI Bot	26a56e8278	feat(nubus): Update chart to version 0.45.0	2024-09-17 08:31:13 +02:00
Carlos García-Mauriño	f7ab971b6a	feat(nubus): Update charts and images	2024-09-17 08:31:13 +02:00
Carlos García-Mauriño	9d5dec8059	fix(nubus): Configure stackDataContext	2024-09-17 08:31:13 +02:00
Carlos García-Mauriño	e2b75f1a87	feat(nubus): Add custom UCR values	2024-09-17 08:31:12 +02:00
Juan Pedro Torres	03f46fbfc3	fix(nubus): Cleanup values	2024-09-17 08:31:12 +02:00
Juan Pedro Torres	35c4b38cb2	feat(nubus): Upgrade Keycloak version	2024-09-17 08:31:12 +02:00
Juan Pedro Torres	28c2790ac9	fix(nubus): Fix Keycloak init race condition	2024-09-17 08:31:12 +02:00
Juan Pedro Torres	7b2d3381b9	feat(nubus): Bump Nubus version to 0.41.0, readonly user from Nubus	2024-09-17 08:31:12 +02:00
Jaime Conde	61bc3b545f	fix(nubus): Use Nubus LDAP server image	2024-09-17 08:31:12 +02:00
Nubus CI Bot	ff0869343c	feat(nubus): Update ldap-server with umc-server license fix	2024-09-17 08:31:12 +02:00
Johannes Lohmer	fddfa5d54f	fix(nubus): Comments are not allowed in images.yaml	2024-09-17 08:31:12 +02:00
Johannes Lohmer	9ac06a7383	fix(nubus): Keep provisioning and consumers behind a feature-flag for easier merging This commit should be reverted once we are confident that provisioning and the consumers work as expected.	2024-09-17 08:31:11 +02:00
Johannes Lohmer	4340ba6fbc	fix(nubus): Update nubus provisioning and consumer configuration	2024-09-17 08:31:11 +02:00
Johannes Lohmer	4545acb06d	feat(nubus): Update nubus chart and images to version 0.39.2	2024-09-17 08:31:11 +02:00
Johannes Bornhold	718a0028c3	fix(nubus): Disable certManager	2024-09-17 08:31:11 +02:00
Johannes Bornhold	02dd070307	fix(nubus): Support "ingress.tls.secretName"	2024-09-17 08:31:10 +02:00
Johannes Lohmer	31753ffb19	fix(nubus): Only use one LDAP Primary and make replica count of Secondary and Proxy others configurable	2024-09-16 17:15:25 +02:00
Johannes Bornhold	73455630fd	feat(nubus): Update to Nubus 0.39.2 chart	2024-09-16 17:14:00 +02:00
openDesk Bot	5f72da4e57	fix(collabora): Update to 24.04.7.2.	2024-09-16 09:26:24 +02:00