From c63665040cf3c985dc9878992785a893d261c420 Mon Sep 17 00:00:00 2001 From: Thomas Kaltenbrunner Date: Tue, 2 Sep 2025 17:00:35 +0200 Subject: [PATCH] feat(notes): Update from 3.2.1 to 3.4.0 --- README.md | 2 +- .../apps/notes/helmfile-child.yaml.gotmpl | 18 +++++++++++++ .../notes/values-customization.yaml.gotmpl | 8 ++++++ helmfile/apps/notes/values.yaml.gotmpl | 27 +++++++++++++------ .../values-opendesk-static-files.yaml.gotmpl | 6 ++--- .../default/customization.yaml.gotmpl | 1 + .../environments/default/images.yaml.gotmpl | 4 +-- 7 files changed, 52 insertions(+), 14 deletions(-) create mode 100644 helmfile/apps/notes/values-customization.yaml.gotmpl diff --git a/README.md b/README.md index a925adfb..eacb780f 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ openDesk currently features the following functional main components: | Function | Functional component | License | Component
version | Upstream documentation | |----------------------|-----------------------------|----------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------| | Chat & collaboration | Element ft. Nordeck widgets | AGPL-3.0-or-later (Element Web), AGPL-3.0-only (Synapse), Apache-2.0 (Nordeck widgets) | [1.11.89](https://github.com/element-hq/element-web/releases/tag/v1.11.89) | [For the most recent release](https://element.io/user-guide) | -| Collaborative notes | Notes (aka Docs) | MIT | [3.2.1](https://github.com/suitenumerique/docs/releases/tag/v3.2.1) | Online documentation/welcome document available in installed application | +| Collaborative notes | Notes (aka Docs) | MIT | [3.4.0](https://github.com/suitenumerique/docs/releases/tag/v3.4.0) | Online documentation/welcome document available in installed application | | Diagram editor | CryptPad ft. diagrams.net | AGPL-3.0-only | [2025.6.0](https://github.com/cryptpad/cryptpad/releases/tag/2025.6.0) | [For the most recent release](https://docs.cryptpad.org/en/) | | File management | Nextcloud | AGPL-3.0-or-later | [31.0.7](https://nextcloud.com/de/changelog/#31-0-7) | [Nextcloud 31](https://docs.nextcloud.com/) | | Groupware | OX App Suite | GPL-2.0-only (backend), AGPL-3.0-or-later (frontend) | [8.41](https://documentation.open-xchange.com/appsuite/releases/8.41/) | Online documentation available from within the installed application; [Additional resources](https://documentation.open-xchange.com/) | diff --git a/helmfile/apps/notes/helmfile-child.yaml.gotmpl b/helmfile/apps/notes/helmfile-child.yaml.gotmpl index 3730090f..874842b0 100644 --- a/helmfile/apps/notes/helmfile-child.yaml.gotmpl +++ b/helmfile/apps/notes/helmfile-child.yaml.gotmpl @@ -11,6 +11,13 @@ repositories: password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }} oci: true url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.notes.registry }}/{{ .Values.charts.notes.repository }}" + - name: "notes-customization-repo" + keyring: "../../files/gpg-pubkeys/opencode.gpg" + verify: {{ .Values.charts.notesCustomization.verify }} + username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }} + password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }} + oci: true + url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.notesCustomization.registry }}/{{ .Values.charts.notesCustomization.repository }}" releases: - name: "impress" @@ -24,6 +31,17 @@ releases: {{- end }} installed: {{ .Values.apps.notes.enabled }} timeout: 1800 + - name: "impress-customization" + chart: "notes-customization-repo/{{ .Values.charts.notesCustomization.name }}" + version: "{{ .Values.charts.notesCustomization.version }}" + wait: true + values: + - "values-customization.yaml.gotmpl" + {{- range .Values.customization.release.notesCustomization }} + - {{ . }} + {{- end }} + installed: {{ .Values.apps.notes.enabled }} + timeout: 1800 commonLabels: deploy-stage: "component-1" diff --git a/helmfile/apps/notes/values-customization.yaml.gotmpl b/helmfile/apps/notes/values-customization.yaml.gotmpl new file mode 100644 index 00000000..d05c79dc --- /dev/null +++ b/helmfile/apps/notes/values-customization.yaml.gotmpl @@ -0,0 +1,8 @@ +# SPDX-FileCopyrightText: 2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH +# SPDX-License-Identifier: Apache-2.0 +--- +frontend: + runtimeEnvs: + ICS_BASE_URL: {{ printf "https://%s.%s" .Values.global.hosts.intercomService .Values.global.domain | quote }} + PORTAL_BASE_URL: {{ printf "https://%s.%s" .Values.global.hosts.nubus .Values.global.domain | quote }} +... diff --git a/helmfile/apps/notes/values.yaml.gotmpl b/helmfile/apps/notes/values.yaml.gotmpl index c25a2a29..a47c500b 100644 --- a/helmfile/apps/notes/values.yaml.gotmpl +++ b/helmfile/apps/notes/values.yaml.gotmpl @@ -27,7 +27,7 @@ backend: {{- end }} ingressClassName: {{ .Values.ingress.ingressClassName }} ingressAdmin: - enabled: true + enabled: false annotations: {{ .Values.annotations.notesBackend.ingressAdmin | toYaml | nindent 6 }} ingressClassName: {{ .Values.ingress.ingressClassName }} @@ -131,19 +131,27 @@ backend: service: annotations: {{ .Values.annotations.notesBackend.service | toYaml | nindent 6 }} - {{- if .Values.certificate.selfSigned }} extraVolumes: + - name: "customization-volume" + configMap: + name: "impress-customization" + {{- if .Values.certificate.selfSigned }} - name: "trusted-cert-secret-volume" secret: secretName: "opendesk-certificates-ca-tls" items: - key: "ca.crt" path: "ca-certificates.crt" + {{- end }} extraVolumeMounts: + - name: "customization-volume" + mountPath: "/app/impress/configuration/theme/default.json" + subPath: "theme.json" + {{- if .Values.certificate.selfSigned }} - name: "trusted-cert-secret-volume" mountPath: "/usr/local/lib/python3.12/site-packages/certifi/cacert.pem" subPath: "ca-certificates.crt" - {{- end }} + {{- end }} frontend: image: @@ -161,11 +169,6 @@ frontend: annotations: {{ .Values.annotations.notesFrontend.ingressMedia | toYaml | nindent 6 }} ingressClassName: {{ .Values.ingress.ingressClassName }} - extraEnvVars: - - name: "ICS_BASE_URL" - value: {{ printf "https://%s.%s" .Values.global.hosts.intercomService .Values.global.domain | quote }} - - name: "PORTAL_BASE_URL" - value: {{ printf "https://%s.%s" .Values.global.hosts.nubus .Values.global.domain | quote }} configuration: objectStoreHost: {{ printf "%s.%s" .Values.global.hosts.minioApi .Values.global.domain | quote }} resources: @@ -197,6 +200,14 @@ frontend: serviceMedia: annotations: {{ .Values.annotations.notesFrontend.service | toYaml | nindent 6 }} + extraVolumes: + - name: "customization-volume" + configMap: + name: "impress-customization" + extraVolumeMounts: + - name: "customization-volume" + mountPath: "/usr/share/nginx/html/runtime-env.js" + subPath: "runtime-env.js" y-provider: image: diff --git a/helmfile/apps/opendesk-services/values-opendesk-static-files.yaml.gotmpl b/helmfile/apps/opendesk-services/values-opendesk-static-files.yaml.gotmpl index f1001f25..d6dea955 100644 --- a/helmfile/apps/opendesk-services/values-opendesk-static-files.yaml.gotmpl +++ b/helmfile/apps/opendesk-services/values-opendesk-static-files.yaml.gotmpl @@ -42,11 +42,11 @@ assets: notes: subdomain: {{ .Values.global.hosts.notes }} paths: - - path: "/favicon.ico" + - path: "/assets/favicon-light.ico" data: {{ .Values.theme.imagery.notes.faviconIco }} - - path: "/favicon.png" + - path: "/assets/favicon-dark.png" data: {{ .Values.theme.imagery.notes.faviconPng }} - - path: "/favicon-dark.png" + - path: "/assets/favicon-light.png" data: {{ .Values.theme.imagery.notes.faviconPng }} openproject: subdomain: {{ .Values.global.hosts.openproject }} diff --git a/helmfile/environments/default/customization.yaml.gotmpl b/helmfile/environments/default/customization.yaml.gotmpl index 8e662d82..3a4388c5 100644 --- a/helmfile/environments/default/customization.yaml.gotmpl +++ b/helmfile/environments/default/customization.yaml.gotmpl @@ -51,6 +51,7 @@ customization: opendeskNextcloudNotifyPush: {} # notes notes: {} + notesCustomization: {} # nubus ums: {} intercomService: {} diff --git a/helmfile/environments/default/images.yaml.gotmpl b/helmfile/environments/default/images.yaml.gotmpl index 001a41ac..182dead9 100644 --- a/helmfile/environments/default/images.yaml.gotmpl +++ b/helmfile/environments/default/images.yaml.gotmpl @@ -357,7 +357,7 @@ images: # upstreamRepository: "lasuite/impress-backend" registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/images/opendesk-notes" - tag: "1.9.0-docs-v3.2.1-backend@sha256:17c16e4e00b15e4637d01553d56e7eecb7a477bec48677d1e7fb07b04c48d2b8" + tag: "1.11.0-docs-v3.4.0-backend@sha256:a07acb86ee260fd9242c4173a01c67c36552d149a2af91220348bdb588c19bf5" notesFrontend: # providerCategory: "Supplier" # providerResponsible: "DINUM" @@ -365,7 +365,7 @@ images: # upstreamRepository: "lasuite/impress-frontend" registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/images/opendesk-notes" - tag: "1.9.0-docs-v3.2.1-frontend@sha256:328d5a8bf41875eb5945229adfc4a52eb2fef109e25d980910ee77edd4bc1887" + tag: "1.11.0-docs-v3.4.0-frontend@sha256:e7316700442455419ebb2e37fe2ae246bb90a7d09ad30477df608b5eb6089095" notesYProvider: # providerCategory: "Supplier" # providerResponsible: "DINUM"