Merge pull request #584 from vshn/appcat/290/fix/nextcloud_image_registry

Custom Nextcloud registry and fix broken cronjob

Author: TheBigLee

class/defaults.yml

@@ -58,7 +58,7 @@ parameters:
       appcat:
         registry: ghcr.io
         repository: vshn/appcat
-        tag: v4.120.0
+        tag: v4.120.2
       functionAppcat:
         registry: ${appcat:images:appcat:registry}
         repository: ${appcat:images:appcat:repository}
@@ -92,6 +92,16 @@ parameters:
         registry: docker.io
         image: collabora/code
         tag: "24.04.9.2.1"
+      nextcloud:
+        registry: docker.io
+        image: nextcloud
+      busybox:
+        registry: docker.io
+        image: busybox
+      oc:
+        registry: quay.io
+        image: oc
+        tag: v4.13
     =_crd_version: ${appcat:images:appcat:tag}
 
     namespace: syn-appcat
@@ -899,6 +909,9 @@ parameters:
             collaboraMemoryRequests: 256Mi
             ingress_annotations: |
               cert-manager.io/cluster-issuer: letsencrypt-production
+            nextcloud_image: ${appcat:images:nextcloud:registry}/${appcat:images:nextcloud:image}
+            busybox_image: ${appcat:images:busybox:registry}/${appcat:images:busybox:image}
+            oc_image: ${appcat:images:oc:registry}/${appcat:images:oc:image}:${appcat:images:oc:tag}
           openshiftTemplate:
             serviceName: nextcloudbyvshn
             description: "Nextcloud is an open source suite of client-server software for creating and using file hosting services."

tests/dev.yml

@@ -23,6 +23,11 @@ parameters:
     namespace: syn-crossplane
 
   appcat:
+    images:
+      nextcloud:
+        registry: dockerhub.vshn.net
+      busybox:
+        registry: dockerhub.vshn.net
     grpcEndpoint: host.docker.internal:9443
     proxyFunction: false
 

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

@@ -6,6 +6,6 @@ metadata:
     argocd.argoproj.io/sync-wave: '-40'
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.120.0-func
+  package: ghcr.io/vshn/appcat:v4.120.2-func
   runtimeConfigRef:
     name: function-appcat

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

@@ -40,7 +40,7 @@ spec:
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
           ignoreNamespaceForBilling: vshn-test
-          imageTag: v4.120.0
+          imageTag: v4.120.2
           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

@@ -40,7 +40,7 @@ spec:
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
           ignoreNamespaceForBilling: vshn-test
-          imageTag: v4.120.0
+          imageTag: v4.120.2
           isOpenshift: 'false'
           maintenanceSA: helm-based-service-maintenance
           mode: standalone

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

@@ -28,6 +28,7 @@ spec:
         apiVersion: v1
         data:
           bucketRegion: lpg
+          busybox_image: docker.io/busybox
           chartRepository: https://nextcloud.github.io/helm/
           chartVersion: 6.2.4
           collaboraCPULimit: '1'
@@ -45,14 +46,16 @@ spec:
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
           ignoreNamespaceForBilling: vshn-test
-          imageTag: v4.120.0
+          imageTag: v4.120.2
           ingress_annotations: |
             cert-manager.io/cluster-issuer: letsencrypt-staging
             nginx.ingress.kubernetes.io/enable-cors: "true"
             nginx.ingress.kubernetes.io/cors-allow-headers: "X-Forwarded-For"
           isOpenshift: 'false'
           maintenanceSA: helm-based-service-maintenance
           mode: standalone
+          nextcloud_image: docker.io/nextcloud
+          oc_image: quay.io/oc:v4.13
           ownerGroup: vshn.appcat.vshn.io
           ownerKind: XVSHNNextcloud
           ownerVersion: v1

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

@@ -41,7 +41,7 @@ spec:
           emailAlertingSmtpUsername: [email protected]
           externalDatabaseConnectionsEnabled: 'true'
           ignoreNamespaceForBilling: vshn-test
-          imageTag: v4.120.0
+          imageTag: v4.120.2
           initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m",
             "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile":
             {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m",

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

@@ -597,7 +597,7 @@ spec:
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
           ignoreNamespaceForBilling: vshn-test
-          imageTag: v4.120.0
+          imageTag: v4.120.2
           isOpenshift: 'false'
           maintenanceSA: helm-based-service-maintenance
           ownerGroup: vshn.appcat.vshn.io

tests/golden/control-plane/appcat/appcat/apiserver/30_deployment.yaml

@@ -29,7 +29,7 @@ spec:
             - --secure-port=9443
             - --tls-cert-file=/apiserver.local.config/certificates/tls.crt
             - --tls-private-key-file=/apiserver.local.config/certificates/tls.key
-          image: ghcr.io/vshn/appcat:v4.120.0
+          image: ghcr.io/vshn/appcat:v4.120.2
           livenessProbe:
             failureThreshold: 3
             httpGet:

tests/golden/control-plane/appcat/appcat/controllers/appcat/30_deployment.yaml

@@ -23,7 +23,7 @@ spec:
           env:
             - name: PLANS_NAMESPACE
               value: syn-appcat
-          image: ghcr.io/vshn/appcat:v4.120.0
+          image: ghcr.io/vshn/appcat:v4.120.2
           livenessProbe:
             httpGet:
               path: /healthz