From fdfe76c37e597534b2a8b4bf609e28628aabff3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20Ro=C3=9Fner?= Date: Wed, 5 Mar 2025 07:34:44 +0100 Subject: [PATCH] fix(nextcloud): Disable integration with OX App Suite if groupware it is not available --- .../apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl | 11 +++++++---- .../default-enterprise-overrides/images.yaml.gotmpl | 2 +- helmfile/environments/default/charts.yaml.gotmpl | 4 ++-- helmfile/environments/default/images.yaml.gotmpl | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/helmfile/apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl b/helmfile/apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl index 3335c401..cacd441c 100644 --- a/helmfile/apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl +++ b/helmfile/apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl @@ -121,10 +121,13 @@ configuration: value: {{ .Values.secrets.keycloak.clientSecret.ncoidc | quote }} opendeskIntegration: - username: - value: "opendesk_username" - password: - value: {{ .Values.secrets.centralnavigation.apiKey | quote }} + centralnavigation: + username: + value: "opendesk_username" + password: + value: {{ .Values.secrets.centralnavigation.apiKey | quote }} + oxAppSuite: + enabled: {{ .Values.apps.oxAppSuite.enabled }} sharing: allowLinks: {{ .Values.functional.filestore.sharing.external.enabled }} diff --git a/helmfile/environments/default-enterprise-overrides/images.yaml.gotmpl b/helmfile/environments/default-enterprise-overrides/images.yaml.gotmpl index 570c6c10..203bc61a 100644 --- a/helmfile/environments/default-enterprise-overrides/images.yaml.gotmpl +++ b/helmfile/environments/default-enterprise-overrides/images.yaml.gotmpl @@ -13,7 +13,7 @@ images: nextcloud: registry: "registry.opencode.de" repository: "zendis/opendesk-enterprise/components/supplier/nextcloud/images/opendesk-nextcloud" - tag: "1.1.3@sha256:53d1abb1132569ef81c235da2397d156aa8b3b9c6567806cdf4dc7f247ba05e0" + tag: "1.1.5@sha256:825998ebf99ae3f9f80ba42fe8f652e9213a5f086d8c4dd96c7d66f88b8572c4" openxchangeCoreMW: registry: "registry.opencode.de" repository: "zendis/opendesk-enterprise/components/supplier/open-xchange/images-mirror/core-mw" diff --git a/helmfile/environments/default/charts.yaml.gotmpl b/helmfile/environments/default/charts.yaml.gotmpl index 00f93b69..63bb27d7 100644 --- a/helmfile/environments/default/charts.yaml.gotmpl +++ b/helmfile/environments/default/charts.yaml.gotmpl @@ -251,7 +251,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud" name: "opendesk-nextcloud" - version: "3.10.0" + version: "4.0.0" verify: true nextcloudManagement: # providerCategory: "Platform" @@ -261,7 +261,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud" name: "opendesk-nextcloud-management" - version: "3.10.0" + version: "4.0.0" verify: true nginx: # providerCategory: "Community" diff --git a/helmfile/environments/default/images.yaml.gotmpl b/helmfile/environments/default/images.yaml.gotmpl index 895105f5..b8b4784d 100644 --- a/helmfile/environments/default/images.yaml.gotmpl +++ b/helmfile/environments/default/images.yaml.gotmpl @@ -318,7 +318,7 @@ images: # upstreamRepository: "bmi/opendesk/components/platform-development/images/opendesk-nextcloud" registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/images/opendesk-nextcloud" - tag: "2.4.7@sha256:86775101c085904db2a93d26a4d7f304f6552025e40aacade7f7de175308824a" + tag: "2.4.8@sha256:4ff33258b7d13a04a7ba1121c4e1ff23dd91f5b7cd54ba548f4cb2061dcb2a8d" nextcloudExporter: # providerCategory: "Platform" # providerResponsible: "openDesk"