Merge pull request #1000 from vshn/appcat/538/fix/various-nextcloud-bugs

Fix various Nextcloud bugs

Author: vshnbot

class/defaults.yml

@@ -72,7 +72,7 @@ parameters:
       appcat:
         registry: ghcr.io
         repository: vshn/appcat
-        tag: v4.173.2
+        tag: a692799d63d7658d97dc15fd2227045aa26543cd
       functionAppcat:
         registry: ${appcat:images:appcat:registry}
         repository: ${appcat:images:appcat:repository}

tests/golden/control-plane/appcat/appcat/10_function_appcat.yaml

@@ -4,9 +4,9 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/sync-wave: '-40'
-  name: function-appcat-master-v4-173-2
+  name: function-appcat-master-a692799d63d7658d97dc15fd2227045aa26543cd
 spec:
-  package: ghcr.io/vshn/appcat:v4.173.2-func
+  package: ghcr.io/vshn/appcat:a692799d63d7658d97dc15fd2227045aa26543cd-func
   packagePullPolicy: IfNotPresent
   runtimeConfigRef:
     name: function-appcat

tests/golden/control-plane/appcat/appcat/20_xrd_vshn_nextcloud.yaml

@@ -5398,8 +5398,11 @@ spec:
                                 URL in Your Nextcloud instance.
                               type: string
                             version:
-                              description: Version defines the Collabora version to
-                                use.
+                              description: |-
+                                Version defines the Collabora version to use.
+                                Only major (e.g., "24") or major.minor (e.g., "24.04") versions are allowed.
+                                Patch versions (e.g., "24.04.3") are not allowed as they break maintenance.
+                              pattern: ^[0-9]+(\.[0-9]+)?$
                               type: string
                           required:
                             - enabled
@@ -11473,6 +11476,9 @@ spec:
                           description: |-
                             Version contains supported version of nextcloud.
                             Multiple versions are supported. The latest version 31 is the default version.
+                            Only major (e.g., "31") or major.minor (e.g., "31.0") versions are allowed.
+                            Patch versions (e.g., "31.0.4") are not allowed as they break maintenance.
+                          pattern: ^[0-9]+(\.[0-9]+)?$
                           type: string
                       required:
                         - fqdn

tests/golden/control-plane/appcat/appcat/21_composition_objectstorage_minio.yaml

@@ -21,7 +21,7 @@ spec:
   mode: Pipeline
   pipeline:
     - functionRef:
-        name: function-appcat-master-v4-173-2
+        name: function-appcat-master-a692799d63d7658d97dc15fd2227045aa26543cd
       input:
         apiVersion: v1
         data:

tests/golden/control-plane/appcat/appcat/21_composition_vshn_codey.yaml

@@ -13,7 +13,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-v4.173.2
+    metadata.appcat.vshn.io/revision: master-a692799d63d7658d97dc15fd2227045aa26543cd
     metadata.appcat.vshn.io/serviceID: vshn-codey
     name: codey.io
   name: codey.io

tests/golden/control-plane/appcat/appcat/21_composition_vshn_forgejo.yaml

@@ -13,7 +13,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-v4.173.2
+    metadata.appcat.vshn.io/revision: master-a692799d63d7658d97dc15fd2227045aa26543cd
     metadata.appcat.vshn.io/serviceID: vshn-forgejo
     name: vshnforgejo.vshn.appcat.vshn.io
   name: vshnforgejo.vshn.appcat.vshn.io
@@ -24,7 +24,7 @@ spec:
   mode: Pipeline
   pipeline:
     - functionRef:
-        name: function-appcat-master-v4-173-2
+        name: function-appcat-master-a692799d63d7658d97dc15fd2227045aa26543cd
       input:
         apiVersion: v1
         data:
@@ -47,7 +47,7 @@ spec:
           emailAlertingSmtpUsername: appcat@appuio.cloud
           ignoreNamespaceForBilling: vshn-test
           imageRegistry: code.forgejo.org
-          imageTag: v4.173.2
+          imageTag: a692799d63d7658d97dc15fd2227045aa26543cd
           ingress_annotations: |
             cert-manager.io/cluster-issuer: letsencrypt-production
           isOpenshift: 'false'

tests/golden/control-plane/appcat/appcat/21_composition_vshn_keycloak.yaml

@@ -13,7 +13,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-v4.173.2
+    metadata.appcat.vshn.io/revision: master-a692799d63d7658d97dc15fd2227045aa26543cd
     metadata.appcat.vshn.io/serviceID: vshn-keycloak
     name: vshnkeycloak.vshn.appcat.vshn.io
   name: vshnkeycloak.vshn.appcat.vshn.io
@@ -24,7 +24,7 @@ spec:
   mode: Pipeline
   pipeline:
     - functionRef:
-        name: function-appcat-master-v4-173-2
+        name: function-appcat-master-a692799d63d7658d97dc15fd2227045aa26543cd
       input:
         apiVersion: v1
         data:
@@ -48,7 +48,7 @@ spec:
           emailAlertingSmtpUsername: appcat@appuio.cloud
           ignoreNamespaceForBilling: vshn-test
           imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed
-          imageTag: v4.173.2
+          imageTag: a692799d63d7658d97dc15fd2227045aa26543cd
           ingress_annotations: |
             nginx.ingress.kubernetes.io/backend-protocol: HTTPS
             cert-manager.io/cluster-issuer: letsencrypt-staging

tests/golden/control-plane/appcat/appcat/21_composition_vshn_mariadb.yaml

@@ -13,7 +13,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-v4.173.2
+    metadata.appcat.vshn.io/revision: master-a692799d63d7658d97dc15fd2227045aa26543cd
     metadata.appcat.vshn.io/serviceID: vshn-mariadb
     name: vshnmariadb.vshn.appcat.vshn.io
   name: vshnmariadb.vshn.appcat.vshn.io
@@ -24,7 +24,7 @@ spec:
   mode: Pipeline
   pipeline:
     - functionRef:
-        name: function-appcat-master-v4-173-2
+        name: function-appcat-master-a692799d63d7658d97dc15fd2227045aa26543cd
       input:
         apiVersion: v1
         data:
@@ -47,7 +47,7 @@ spec:
           ignoreNamespaceForBilling: vshn-test
           imageRegistry: docker.io
           imageRepositoryPrefix: bitnamilegacy
-          imageTag: v4.173.2
+          imageTag: a692799d63d7658d97dc15fd2227045aa26543cd
           isOpenshift: 'false'
           maintenanceSA: helm-based-service-maintenance
           maintenanceURL: https://hub.docker.com/v2/repositories/bitnamilegacy/mariadb-galera/tags/?page_size=100

tests/golden/control-plane/appcat/appcat/21_composition_vshn_nextcloud.yaml

@@ -13,7 +13,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-v4.173.2
+    metadata.appcat.vshn.io/revision: master-a692799d63d7658d97dc15fd2227045aa26543cd
     metadata.appcat.vshn.io/serviceID: vshn-nextcloud
     name: vshnnextcloud.vshn.appcat.vshn.io
   name: vshnnextcloud.vshn.appcat.vshn.io
@@ -24,7 +24,7 @@ spec:
   mode: Pipeline
   pipeline:
     - functionRef:
-        name: function-appcat-master-v4-173-2
+        name: function-appcat-master-a692799d63d7658d97dc15fd2227045aa26543cd
       input:
         apiVersion: v1
         data:
@@ -54,7 +54,7 @@ spec:
           emailAlertingSmtpUsername: appcat@appuio.cloud
           ignoreNamespaceForBilling: vshn-test
           imageRegistry: docker.io
-          imageTag: v4.173.2
+          imageTag: a692799d63d7658d97dc15fd2227045aa26543cd
           ingress_annotations: |
             cert-manager.io/cluster-issuer: letsencrypt-staging
             nginx.ingress.kubernetes.io/enable-cors: "true"

tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgres.yaml

@@ -15,7 +15,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-v4.173.2
+    metadata.appcat.vshn.io/revision: master-a692799d63d7658d97dc15fd2227045aa26543cd
     metadata.appcat.vshn.io/serviceID: vshn-postgresql
     name: vshnpostgres.vshn.appcat.vshn.io
   name: vshnpostgres.vshn.appcat.vshn.io
@@ -26,7 +26,7 @@ spec:
   mode: Pipeline
   pipeline:
     - functionRef:
-        name: function-appcat-master-v4-173-2
+        name: function-appcat-master-a692799d63d7658d97dc15fd2227045aa26543cd
       input:
         apiVersion: v1
         data:
@@ -50,7 +50,7 @@ spec:
           emailAlertingSmtpUsername: appcat@appuio.cloud
           externalDatabaseConnectionsEnabled: 'true'
           ignoreNamespaceForBilling: vshn-test
-          imageTag: v4.173.2
+          imageTag: a692799d63d7658d97dc15fd2227045aa26543cd
           initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m",
             "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile":
             {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m",