mirror of
https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk.git
synced 2025-12-06 15:31:38 +01:00
feat(notes): Update from 3.2.1 to 3.4.0
This commit is contained in:
committed by
Thorsten Roßner
parent
69f20057cd
commit
c63665040c
@@ -35,7 +35,7 @@ openDesk currently features the following functional main components:
|
|||||||
| Function | Functional component | License | Component<br/>version | Upstream documentation |
|
| Function | Functional component | License | Component<br/>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) |
|
| 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/) |
|
| 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/) |
|
| 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/) |
|
| 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/) |
|
||||||
|
|||||||
@@ -11,6 +11,13 @@ repositories:
|
|||||||
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
|
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
|
||||||
oci: true
|
oci: true
|
||||||
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.notes.registry }}/{{ .Values.charts.notes.repository }}"
|
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:
|
releases:
|
||||||
- name: "impress"
|
- name: "impress"
|
||||||
@@ -24,6 +31,17 @@ releases:
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
installed: {{ .Values.apps.notes.enabled }}
|
installed: {{ .Values.apps.notes.enabled }}
|
||||||
timeout: 1800
|
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:
|
commonLabels:
|
||||||
deploy-stage: "component-1"
|
deploy-stage: "component-1"
|
||||||
|
|||||||
8
helmfile/apps/notes/values-customization.yaml.gotmpl
Normal file
8
helmfile/apps/notes/values-customization.yaml.gotmpl
Normal file
@@ -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 }}
|
||||||
|
...
|
||||||
@@ -27,7 +27,7 @@ backend:
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
ingressClassName: {{ .Values.ingress.ingressClassName }}
|
ingressClassName: {{ .Values.ingress.ingressClassName }}
|
||||||
ingressAdmin:
|
ingressAdmin:
|
||||||
enabled: true
|
enabled: false
|
||||||
annotations:
|
annotations:
|
||||||
{{ .Values.annotations.notesBackend.ingressAdmin | toYaml | nindent 6 }}
|
{{ .Values.annotations.notesBackend.ingressAdmin | toYaml | nindent 6 }}
|
||||||
ingressClassName: {{ .Values.ingress.ingressClassName }}
|
ingressClassName: {{ .Values.ingress.ingressClassName }}
|
||||||
@@ -131,15 +131,23 @@ backend:
|
|||||||
service:
|
service:
|
||||||
annotations:
|
annotations:
|
||||||
{{ .Values.annotations.notesBackend.service | toYaml | nindent 6 }}
|
{{ .Values.annotations.notesBackend.service | toYaml | nindent 6 }}
|
||||||
{{- if .Values.certificate.selfSigned }}
|
|
||||||
extraVolumes:
|
extraVolumes:
|
||||||
|
- name: "customization-volume"
|
||||||
|
configMap:
|
||||||
|
name: "impress-customization"
|
||||||
|
{{- if .Values.certificate.selfSigned }}
|
||||||
- name: "trusted-cert-secret-volume"
|
- name: "trusted-cert-secret-volume"
|
||||||
secret:
|
secret:
|
||||||
secretName: "opendesk-certificates-ca-tls"
|
secretName: "opendesk-certificates-ca-tls"
|
||||||
items:
|
items:
|
||||||
- key: "ca.crt"
|
- key: "ca.crt"
|
||||||
path: "ca-certificates.crt"
|
path: "ca-certificates.crt"
|
||||||
|
{{- end }}
|
||||||
extraVolumeMounts:
|
extraVolumeMounts:
|
||||||
|
- name: "customization-volume"
|
||||||
|
mountPath: "/app/impress/configuration/theme/default.json"
|
||||||
|
subPath: "theme.json"
|
||||||
|
{{- if .Values.certificate.selfSigned }}
|
||||||
- name: "trusted-cert-secret-volume"
|
- name: "trusted-cert-secret-volume"
|
||||||
mountPath: "/usr/local/lib/python3.12/site-packages/certifi/cacert.pem"
|
mountPath: "/usr/local/lib/python3.12/site-packages/certifi/cacert.pem"
|
||||||
subPath: "ca-certificates.crt"
|
subPath: "ca-certificates.crt"
|
||||||
@@ -161,11 +169,6 @@ frontend:
|
|||||||
annotations:
|
annotations:
|
||||||
{{ .Values.annotations.notesFrontend.ingressMedia | toYaml | nindent 6 }}
|
{{ .Values.annotations.notesFrontend.ingressMedia | toYaml | nindent 6 }}
|
||||||
ingressClassName: {{ .Values.ingress.ingressClassName }}
|
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:
|
configuration:
|
||||||
objectStoreHost: {{ printf "%s.%s" .Values.global.hosts.minioApi .Values.global.domain | quote }}
|
objectStoreHost: {{ printf "%s.%s" .Values.global.hosts.minioApi .Values.global.domain | quote }}
|
||||||
resources:
|
resources:
|
||||||
@@ -197,6 +200,14 @@ frontend:
|
|||||||
serviceMedia:
|
serviceMedia:
|
||||||
annotations:
|
annotations:
|
||||||
{{ .Values.annotations.notesFrontend.service | toYaml | nindent 6 }}
|
{{ .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:
|
y-provider:
|
||||||
image:
|
image:
|
||||||
|
|||||||
@@ -42,11 +42,11 @@ assets:
|
|||||||
notes:
|
notes:
|
||||||
subdomain: {{ .Values.global.hosts.notes }}
|
subdomain: {{ .Values.global.hosts.notes }}
|
||||||
paths:
|
paths:
|
||||||
- path: "/favicon.ico"
|
- path: "/assets/favicon-light.ico"
|
||||||
data: {{ .Values.theme.imagery.notes.faviconIco }}
|
data: {{ .Values.theme.imagery.notes.faviconIco }}
|
||||||
- path: "/favicon.png"
|
- path: "/assets/favicon-dark.png"
|
||||||
data: {{ .Values.theme.imagery.notes.faviconPng }}
|
data: {{ .Values.theme.imagery.notes.faviconPng }}
|
||||||
- path: "/favicon-dark.png"
|
- path: "/assets/favicon-light.png"
|
||||||
data: {{ .Values.theme.imagery.notes.faviconPng }}
|
data: {{ .Values.theme.imagery.notes.faviconPng }}
|
||||||
openproject:
|
openproject:
|
||||||
subdomain: {{ .Values.global.hosts.openproject }}
|
subdomain: {{ .Values.global.hosts.openproject }}
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ customization:
|
|||||||
opendeskNextcloudNotifyPush: {}
|
opendeskNextcloudNotifyPush: {}
|
||||||
# notes
|
# notes
|
||||||
notes: {}
|
notes: {}
|
||||||
|
notesCustomization: {}
|
||||||
# nubus
|
# nubus
|
||||||
ums: {}
|
ums: {}
|
||||||
intercomService: {}
|
intercomService: {}
|
||||||
|
|||||||
@@ -357,7 +357,7 @@ images:
|
|||||||
# upstreamRepository: "lasuite/impress-backend"
|
# upstreamRepository: "lasuite/impress-backend"
|
||||||
registry: "registry.opencode.de"
|
registry: "registry.opencode.de"
|
||||||
repository: "bmi/opendesk/components/platform-development/images/opendesk-notes"
|
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:
|
notesFrontend:
|
||||||
# providerCategory: "Supplier"
|
# providerCategory: "Supplier"
|
||||||
# providerResponsible: "DINUM"
|
# providerResponsible: "DINUM"
|
||||||
@@ -365,7 +365,7 @@ images:
|
|||||||
# upstreamRepository: "lasuite/impress-frontend"
|
# upstreamRepository: "lasuite/impress-frontend"
|
||||||
registry: "registry.opencode.de"
|
registry: "registry.opencode.de"
|
||||||
repository: "bmi/opendesk/components/platform-development/images/opendesk-notes"
|
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:
|
notesYProvider:
|
||||||
# providerCategory: "Supplier"
|
# providerCategory: "Supplier"
|
||||||
# providerResponsible: "DINUM"
|
# providerResponsible: "DINUM"
|
||||||
|
|||||||
Reference in New Issue
Block a user