From 1cdfcf2784271f2b8ea61d2e8e534db2aa386f4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20Ro=C3=9Fner?= <thorsten.rossner.extern@zendis.de>
Date: Sat, 25 Jan 2025 17:57:41 +0100
Subject: [PATCH] fix(nextcloud): Update image and Helm chart to support app
 toggles during deployment

---
 .../values-nextcloud-mgmt.yaml.gotmpl         | 28 +++++++++++++++++++
 .../environments/default/charts.yaml.gotmpl   |  4 +--
 .../environments/default/images.yaml.gotmpl   |  2 +-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/helmfile/apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl b/helmfile/apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl
index 671d2a78..9c6c4b22 100644
--- a/helmfile/apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl
+++ b/helmfile/apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl
@@ -25,6 +25,7 @@ configuration:
       value: "nextcloud"
     password:
       value: {{ .Values.secrets.nextcloud.adminPassword | quote }}
+
   antivirus:
     {{- if .Values.antivirus.icap.host }}
     host: {{ .Values.antivirus.icap.host | quote }}
@@ -37,6 +38,7 @@ configuration:
     {{- end }}
     port: 1344
     {{- end }}
+
   cache:
     auth:
       enabled: true
@@ -47,9 +49,28 @@ configuration:
     host: {{ .Values.cache.nextcloud.host | quote }}
     port: {{ .Values.cache.nextcloud.port | quote }}
     tls: {{ .Values.cache.nextcloud.tls }}
+
+  feature:
+    apps:
+      contacts:
+        enabled: false
+      cryptpad:
+        enabled: {{ .Values.cryptpad.enabled }}
+      filesZip:
+        enabled: true
+      groupfolders:
+        enabled: true
+      integrationOpenproject:
+        enabled: {{ .Values.openproject.enabled }}
+      spreed:
+        enabled: true
+    circles:
+      enabled: false
+
   collabora:
     # internalWopiUrl: ""
     wopiAllowlist: {{ join ", " ( concat .Values.cluster.networking.cidr .Values.cluster.networking.incomingCIDR ) | quote }}
+
   database:
     {{ if eq .Values.databases.nextcloud.type "mariadb" }}
     type: "mysql"
@@ -72,11 +93,13 @@ configuration:
         {{- else }}
         value: {{ .Values.databases.nextcloud.password | quote }}
         {{- end }}
+
   ldap:
     host: {{ .Values.ldap.host | quote }}
     password:
       value: {{ .Values.secrets.nubus.ldapSearch.nextcloud | quote }}
     adminGroupName: "managed-by-attribute-FileshareAdmin"
+
   objectstore:
     auth:
       accessKey:
@@ -90,16 +113,19 @@ configuration:
     port: {{ .Values.objectstores.nextcloud.port | quote }}
     pathStyle: {{ .Values.objectstores.nextcloud.pathStyle | quote }}
     useSSL: {{ .Values.objectstores.nextcloud.useSSL | quote }}
+
   oidc:
     username:
       value: "opendesk-nextcloud"
     password:
       value: {{ .Values.secrets.keycloak.clientSecret.ncoidc | quote }}
+
   opendeskIntegration:
     username:
       value: "opendesk_username"
     password:
       value: {{ .Values.secrets.centralnavigation.apiKey | quote }}
+
   sharing:
     allowLinks: {{ .Values.functional.filestore.sharing.external.enabled }}
     allowMailNotification: {{ .Values.functional.filestore.sharing.external.enabled }}
@@ -113,6 +139,7 @@ configuration:
     defaultExternalExpireEnforced: {{ .Values.functional.filestore.sharing.external.expiry.enforced }}
     defaultExternalExpireDays: {{ .Values.functional.filestore.sharing.external.expiry.defaultDays | quote }}
     sendPasswordMail: {{ .Values.functional.filestore.sharing.external.sendPasswordMail | quote }}
+
   smtp:
     auth:
       enabled: false
@@ -126,6 +153,7 @@ configuration:
     mailDomain: "{{ .Values.global.domain }}"
     security: ""
     skipVerifyPeer: true
+
   quota:
     default: "{{ .Values.functional.filestore.quota.default }} GB"
     retentionObligation:
diff --git a/helmfile/environments/default/charts.yaml.gotmpl b/helmfile/environments/default/charts.yaml.gotmpl
index a457d619..8b4c3c42 100644
--- a/helmfile/environments/default/charts.yaml.gotmpl
+++ b/helmfile/environments/default/charts.yaml.gotmpl
@@ -256,7 +256,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud"
     name: "opendesk-nextcloud"
-    version: "3.6.4"
+    version: "3.7.1"
     verify: true
   nextcloudManagement:
     # providerCategory: "Platform"
@@ -266,7 +266,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud"
     name: "opendesk-nextcloud-management"
-    version: "3.6.4"
+    version: "3.7.1"
     verify: true
   nginx:
     # providerCategory: "Community"
diff --git a/helmfile/environments/default/images.yaml.gotmpl b/helmfile/environments/default/images.yaml.gotmpl
index 3929e1b7..9706ef37 100644
--- a/helmfile/environments/default/images.yaml.gotmpl
+++ b/helmfile/environments/default/images.yaml.gotmpl
@@ -243,7 +243,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.3.10@sha256:f38d523b6704610f2afecf1e8ae232a7bf702b0a9ad999e98f4639f304107e8f"
+    tag: "2.4.0@sha256:03d3273b49a3a51fc2d418302070657ad4198ee014f15ff4320e2164625431a1"
   nextcloudExporter:
     # providerCategory: "Platform"
     # providerResponsible: "openDesk"