fix(nubus): OX connector deputy and minor fixes

.gitlab-ci.yml

@@ -292,12 +292,16 @@ db-cleanup:
           exit 1
           ;;
       esac
+    # First: Gather all files that contain the "database:" keyword in the default environment
     - |
-      export FILES=(
-        "${CI_PROJECT_DIR}/helmfile/environments/default/database.yaml.gotmpl"
-        "${CI_PROJECT_DIR}/helmfile/environments/dev/values.yaml.gotmpl"
-        "${CI_PROJECT_DIR}/helmfile/environments/dev/write-over-values-for-environment.yaml.gotmpl"
-      )
+      export FILES="$(grep -r 'databases:' "${CI_PROJECT_DIR}/helmfile/environments/default" |
+                      awk -F ':' '{print $1}')"
+    # Second: Gather all files that contain the "database:" keyword in the dev environment
+    # where the adjustments from opendesk-env are placed
+    - |
+      export FILES="${FILES} $(grep -r 'databases:' "${CI_PROJECT_DIR}/helmfile/environments/dev" |
+                               awk -F ':' '{print $1}')"
+    - "echo \"${FILES[@]}\""
     # Cleanup MariaDB
     - "export MARIADB_HOST=\"\""
     - "export MARIADB_PORT=\"\""
@@ -305,11 +309,11 @@ db-cleanup:
     - "export MARIADB_PASSWORD=\"\""
     - "export ENV_DATABASE=\"oxAppSuite\""
 
-      # Parse cluster values
+    # Parse cluster values
     - |
       for FILE in ${FILES[@]}; do
-        if [ -f ${FILE} ]; then
-          if [[ $(tail -n +1 $FILE | grep -v '{{' | yq '.databases.[env(ENV_DATABASE)]') != "null" ]]; then
+        if [ -f "${FILE}" ]; then
+          if [[ $(tail -n +1 "${FILE}" | grep -v '{{' | yq '.databases.[env(ENV_DATABASE)]') != "null" ]]; then
             MARIADB_DATABASE=$(tail -n +1 $FILE | grep -v '{{' | yq '.databases.[env(ENV_DATABASE)].name')
             MARIADB_USERNAME=$(tail -n +1 $FILE | grep -v '{{' | yq '.databases.[env(ENV_DATABASE)].username')
             MARIADB_PASSWORD=$(tail -n +1 $FILE | grep -v '{{' | yq '.databases.[env(ENV_DATABASE)].password')

helmfile/apps/nubus/values-nubus.yaml.gotmpl

@@ -37,7 +37,7 @@ global:
   systemExtensions:
     - name: "ox"
       image:
-        registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusOxExtension.registry | quote }}
+        registry: {{ .Values.images.nubusOxExtension.registry | quote }}
         repository: {{ .Values.images.nubusOxExtension.repository }}
         tag: {{ .Values.images.nubusOxExtension.tag }}
     - name: "opendesk"
@@ -1309,6 +1309,8 @@ nubusStackDataUms:
     portalLinkSupport: {{ .Values.functional.portal.linkSupport | quote }}
     portalLinkFeedback: {{ .Values.functional.portal.linkFeedback | quote }}
     oxDefaultContext: "1"
+    portalOxLinkBase: {{ printf "https://%s.%s" .Values.global.hosts.openxchange .Values.global.domain }}
+    oxSystemUserPassword: {{ .Values.secrets.nubus.ldapSearch.ox | quote }}
     oxContextHidden: true
     ldapSearchUsers:
       {{- range $username, $password := .Values.secrets.nubus.ldapSearch }}

helmfile/apps/open-xchange/values-oxconnector.yaml.gotmpl

@@ -17,7 +17,7 @@ extraVolumeMounts:
 {{- end }}
 
 image:
-  registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.oxConnector.registry | quote }}
+  registry: {{ .Values.images.oxConnector.registry | quote }}
   repository: {{ .Values.images.oxConnector.repository | quote }}
   pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
   tag: {{ .Values.images.oxConnector.tag | quote }}

helmfile/environments/default/images.yaml.gotmpl

@@ -576,9 +576,9 @@ images:
     # upstreamRepository: "nubus/images/ox-extension"
     # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
     # upstreamMirrorStartFrom: ["0", "10", "0"]
-    registry: "registry.opencode.de"
-    repository: "bmi/opendesk/components/supplier/univention/images-mirror/ox-extension"
-    tag: "0.11.1@sha256:e57df5c02d0480ccf1d299964e3c676d92440d5e959b4f587945f08624da3ae9"
+    registry: "artifacts.software-univention.de"
+    repository: "nubus-dev/images/ox-extension"
+    tag: "0.26.0-pre-jtorres-fix-ox-extensions"
   nubusPortalConsumer:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -894,9 +894,9 @@ images:
     # upstreamRepository: "nubus/images/ox-connector-standalone"
     # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
     # upstreamMirrorStartFrom: ["0", "4", "2"]
-    registry: "registry.opencode.de"
-    repository: "bmi/opendesk/components/supplier/univention/images-mirror/ox-connector-standalone"
-    tag: "0.19.0@sha256:447e3c3e0cdd8bf1f86004d2088c24fcf6141ff6fef78ade8dfe86f7f16ba40e"
+    registry: "artifacts.software-univention.de"
+    repository: "nubus-dev/images/ox-connector-standalone"
+    tag: "0.26.0-pre-jtorres-fix-ox-extensions"
   postfix:
     # providerCategory: "Platform"
     # providerResponsible: "openDesk"