From adb3fa18eb36de91927c8118493038b400ff77d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20Ro=C3=9Fner?= <thorsten.rossner.extern@zendis.de>
Date: Mon, 24 Mar 2025 18:54:39 +0100
Subject: [PATCH] fix(nubus): Register OX provisioning consumer only when OX is
 enabled; See migrations.md for details

---
 docs/migrations.md                           | 27 +++++++++++++++++---
 helmfile/apps/nubus/values-nubus.yaml.gotmpl |  2 ++
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/docs/migrations.md b/docs/migrations.md
index e308c31e..71032d2a 100644
--- a/docs/migrations.md
+++ b/docs/migrations.md
@@ -92,13 +92,32 @@ Be sure you check all the sections for the releases your are going to update you
 
 ## From v1.1.2
 
+#### Helmfile cleanup: Do not configure OX provisioning when no OX installed
+
+**Target group:** Installations that have no OX App Suite installed.
+
+With openDesk 1.2.0 the OX provisioning consumer will not be registered when there is no OX installed.
+
+We do not remove the consumer for existing installations, if you want to do that for your existing installation please perform the following steps:
+
+```
+export NAMESPACE=<your_namespace>
+kubectl -n ${NAMESPACE} exec -it ums-provisioning-nats-0 -c nats-box -- sh -c 'nats consumer rm stream:ox-connector durable_name:ox-connector --user=admin --password=${NATS_PASSWORD} --force'
+kubectl -n ${NAMESPACE} exec -it ums-provisioning-nats-0 -c nats-box -- sh -c 'nats stream rm stream:ox-connector --user=admin --password=${NATS_PASSWORD} --force'
+kubectl -n ${NAMESPACE} delete secret ums-provisioning-ox-credentials-test
+```
+
 #### Helmfile new default: PostgreSQL for XWiki and Nextcloud
 
+**Target group:** All upgrade installations that do not already use the previous optional PostgreSQL database backend for Nextcloud and XWiki.
+
 openDesk now uses PostgreSQL as default database backend for Nextcloud and XWiki.
 
-When upgrading existing instances you likely want to keep the current database backend (MariaDB). Please follow the instructions below.
+When upgrading existing instances you likely want to keep the current database backend (MariaDB).
 
-**If you use your own external database services**, you just have to add the new `type` attribute and set it to `mariadb`:
+**Use case A:** You use your own external database services, if not see "Use case B" further down.
+
+You just have to add the new `type` attribute and set it to `mariadb`:
 
 ```yaml
 databases:
@@ -108,7 +127,9 @@ databases:
     type: "mariadb"
 ```
 
-**If you use the openDesk supplied database services**, ensure you set the following attributes before upgrading, this includes the aforementioned `type` attribute.
+**Use case B:** You use the openDesk supplied database services.
+
+Ensure you set the following attributes before upgrading, this includes the aforementioned `type` attribute.
 
 ```yaml
 databases:
diff --git a/helmfile/apps/nubus/values-nubus.yaml.gotmpl b/helmfile/apps/nubus/values-nubus.yaml.gotmpl
index 4557a451..164e6d0d 100644
--- a/helmfile/apps/nubus/values-nubus.yaml.gotmpl
+++ b/helmfile/apps/nubus/values-nubus.yaml.gotmpl
@@ -974,12 +974,14 @@ nubusProvisioning:
   registerConsumers:
     additionalAnnotations:
       intents.otterize.com/service-name: "ums-provisioning-register-consumers"
+    {{- if .Values.apps.oxAppSuite.enabled }}
     createUsers:
       oxConsumer:
         existingSecret:
           name: ums-provisioning-ox-credentials
           keyMapping:
             password: "ox-connector.json"
+    {{- end }}
     image:
       registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusWaitForDependency.registry | quote }}
       repository: {{ .Values.images.nubusWaitForDependency.repository }}