diff --git a/docs/migrations.md b/docs/migrations.md index f676d066..99417b75 100644 --- a/docs/migrations.md +++ b/docs/migrations.md @@ -12,10 +12,10 @@ SPDX-License-Identifier: Apache-2.0 * [Manual checks/actions](#manual-checksactions) * [Versions ≥ v1.11.0](#versions--v1110) * [Pre-upgrade to versions ≥ v1.11.0](#pre-upgrade-to-versions--v1110) + * [Deployment cleanup: Collabora Controller](#deployment-cleanup-collabora-controller) * [Helmfile new option: Annotations for external services (Dovecot, Jitsi JVB, Postfix)](#helmfile-new-option-annotations-for-external-services-dovecot-jitsi-jvb-postfix) * [Versions ≥ v1.10.0](#versions--v1100) * [Pre-upgrade to versions ≥ v1.10.0](#pre-upgrade-to-versions--v1100) - * [Deployment cleanup: Collabora Controller](#deployment-cleanup-collabora-controller) * [Helmfile new secret: `secrets.nubus.ldapSearch.postfix`](#helmfile-new-secret-secretsnubusldapsearchpostfix) * [Helmfile new secret: `secrets.doveocot.sharedMailboxesMasterPassword`](#helmfile-new-secret-secretsdoveocotsharedmailboxesmasterpassword) * [New Helmfile default: Nubus provisioning debug container no longer deployed](#new-helmfile-default-nubus-provisioning-debug-container-no-longer-deployed) @@ -189,6 +189,25 @@ If you would like more details about the automated migrations, please read secti ### Pre-upgrade to versions ≥ v1.11.0 +#### Deployment cleanup: Collabora Controller + +**Target group:** Existing openDesk Enterprise deployments using Collabora Controller. Actually only long running +deployments are affected, but following the instructions won't hurt. + +As per upstream release notes for [Collabora Online Controller 1.1.7](https://www.collaboraonline.com/cool-controller-release-notes/) +you have to remove the existing leases of the Controller. You can do so by setting `` and executing +the commands below. + +```shell +export NAMESPACE= +export COLLABORA_CONTROLLER_DEPLOYMENT_NAME=collabora-controller-cool-controller +kubectl -n ${NAMESPACE} scale deployment/${COLLABORA_CONTROLLER_DEPLOYMENT_NAME} --replicas=0 +kubectl -n ${NAMESPACE} delete -n collabora leases.coordination.k8s.io collabora-online +``` + +> [!note] +> The Collabora Online Controller is not scaled up again, as this would happen as part of the upgrade deployment. + #### Helmfile new option: Annotations for external services (Dovecot, Jitsi JVB, Postfix) **Target group:** Existing deployments using `service` annotations. @@ -218,25 +237,6 @@ annotations for the external service use the newly introduced key `annotations.o ### Pre-upgrade to versions ≥ v1.10.0 -#### Deployment cleanup: Collabora Controller - -**Target group:** Existing openDesk Enterprise deployments using Collabora Controller. Actually only long running -deployments are affected, but following the instructions won't hurt. - -As per upstream release notes for [Collabora Online Controller 1.1.4](https://www.collaboraonline.com/cool-controller-release-notes/) -you have to remove the existing leases of the Controller. You can do so by setting `` and executing -the commands below. - -```shell -export NAMESPACE= -export COLLABORA_CONTROLLER_DEPLOYMENT_NAME=collabora-controller-cool-controller -kubectl -n ${NAMESPACE} scale deployment/${COLLABORA_CONTROLLER_DEPLOYMENT_NAME} --replicas=0 -kubectl -n ${NAMESPACE} delete -n collabora leases.coordination.k8s.io collabora-online -``` - -> [!note] -> The Collabora Online Controller is not scaled up again, as this would happen as part of the upgrade deployment. - #### Helmfile new secret: `secrets.nubus.ldapSearch.postfix` **Target group:** All existing deployments that use self-defined secrets. diff --git a/helmfile/environments/default/charts.yaml.gotmpl b/helmfile/environments/default/charts.yaml.gotmpl index 93608a70..f52d41d4 100644 --- a/helmfile/environments/default/charts.yaml.gotmpl +++ b/helmfile/environments/default/charts.yaml.gotmpl @@ -65,7 +65,7 @@ charts: registry: "registry.opencode.de" repository: "zendis/opendesk-enterprise/components/supplier/collabora/charts-mirror" name: "cool-controller" - version: "1.1.10" + version: "1.1.11" verify: false cryptpad: # providerCategory: "Supplier" diff --git a/helmfile/environments/default/images.yaml.gotmpl b/helmfile/environments/default/images.yaml.gotmpl index 093d9833..93a94a09 100644 --- a/helmfile/environments/default/images.yaml.gotmpl +++ b/helmfile/environments/default/images.yaml.gotmpl @@ -57,7 +57,7 @@ images: # providerResponsible: "Collabora" registry: "registry.opencode.de" repository: "zendis/opendesk-enterprise/components/supplier/collabora/images-mirror/cool-controller" - tag: "1.1.6@sha256:7935f21bf75cdddbbbd01754d8d0458014a68ab64b08121c8fca7a2715e0d85b" + tag: "1.1.7@sha256:f9b43219cf9de521b39bfe91e78b1e5e32a0b61712ab4ca2b401c67bc4a326fc" cryptpad: # providerCategory: "Supplier" # providerResponsible: "XWiki"