Merge pull request #844 from vshn/merge_to_dev

Merge master to dev

Author: Kidswiss

class/defaults.yml

@@ -61,7 +61,7 @@ parameters:
       appcat:
         registry: ghcr.io
         repository: vshn/appcat
-        tag: redis/ha
+        tag: v4.165.1
       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-redis-ha
+  name: function-appcat-master-v4-165-1
 spec:
-  package: ghcr.io/vshn/appcat:redis_ha-func
+  package: ghcr.io/vshn/appcat:v4.165.1-func
   packagePullPolicy: IfNotPresent
   runtimeConfigRef:
     name: function-appcat
@@ -18,9 +18,9 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/sync-wave: '-40'
-  name: function-appcat-v3-50-5-v4-163-3
+  name: function-appcat-v3-50-6-v4-163-4
 spec:
-  package: ghcr.io/vshn/appcat:v4.163.3-func
+  package: ghcr.io/vshn/appcat:v4.163.4-func
   packagePullPolicy: IfNotPresent
   runtimeConfigRef:
     name: function-appcat
@@ -32,7 +32,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/sync-wave: '-40'
-  name: function-appcat-v3-50-6-v4-163-4
+  name: function-appcat-v3-50-7-v4-163-4
 spec:
   package: ghcr.io/vshn/appcat:v4.163.4-func
   packagePullPolicy: IfNotPresent
@@ -46,9 +46,9 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/sync-wave: '-40'
-  name: function-appcat-v3-50-7-v4-163-4
+  name: function-appcat-v3-50-8-v4-164-0
 spec:
-  package: ghcr.io/vshn/appcat:v4.163.4-func
+  package: ghcr.io/vshn/appcat:v4.164.0-func
   packagePullPolicy: IfNotPresent
   runtimeConfigRef:
     name: function-appcat
@@ -60,9 +60,9 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/sync-wave: '-40'
-  name: function-appcat-v3-50-8-v4-164-0
+  name: function-appcat-v3-51-0-v4-165-0
 spec:
-  package: ghcr.io/vshn/appcat:v4.164.0-func
+  package: ghcr.io/vshn/appcat:v4.165.0-func
   packagePullPolicy: IfNotPresent
   runtimeConfigRef:
     name: function-appcat
@@ -74,9 +74,9 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/sync-wave: '-40'
-  name: function-appcat-v3-51-0-v4-165-0
+  name: function-appcat-v3-51-1-v4-165-1
 spec:
-  package: ghcr.io/vshn/appcat:v4.165.0-func
+  package: ghcr.io/vshn/appcat:v4.165.1-func
   packagePullPolicy: IfNotPresent
   runtimeConfigRef:
     name: function-appcat

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

@@ -73,14 +73,6 @@ spec:
                             (\*|([1-9]|1[0-2])|\*\/([1-9]|1[0-2])) (\*|([0-6])|\*\/([0-6]))$
                           type: string
                       type: object
-                    instances:
-                      default: 1
-                      description: Instances configures the number of Redis instances
-                        for the cluster.
-                      enum:
-                        - 1
-                        - 3
-                      type: integer
                     maintenance:
                       description: Maintenance contains settings to control the maintenance
                         of an instance.

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

@@ -21,7 +21,7 @@ spec:
   mode: Pipeline
   pipeline:
     - functionRef:
-        name: function-appcat-master-redis-ha
+        name: function-appcat-master-v4-165-1
       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-redis_ha
+    metadata.appcat.vshn.io/revision: master-v4.165.1
     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-redis_ha
+    metadata.appcat.vshn.io/revision: master-v4.165.1
     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-redis-ha
+        name: function-appcat-master-v4-165-1
       input:
         apiVersion: v1
         data:
@@ -43,7 +43,7 @@ spec:
           emailAlertingSmtpUsername: appcat@appuio.cloud
           ignoreNamespaceForBilling: vshn-test
           imageRegistry: code.forgejo.org
-          imageTag: redis_ha
+          imageTag: v4.165.1
           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-redis_ha
+    metadata.appcat.vshn.io/revision: master-v4.165.1
     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-redis-ha
+        name: function-appcat-master-v4-165-1
       input:
         apiVersion: v1
         data:
@@ -43,7 +43,7 @@ spec:
           emailAlertingSmtpUsername: appcat@appuio.cloud
           ignoreNamespaceForBilling: vshn-test
           imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed
-          imageTag: redis_ha
+          imageTag: v4.165.1
           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-redis_ha
+    metadata.appcat.vshn.io/revision: master-v4.165.1
     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-redis-ha
+        name: function-appcat-master-v4-165-1
       input:
         apiVersion: v1
         data:
@@ -42,7 +42,7 @@ spec:
           emailAlertingSmtpUsername: appcat@appuio.cloud
           ignoreNamespaceForBilling: vshn-test
           imageRegistry: docker.io
-          imageTag: redis_ha
+          imageTag: v4.165.1
           isOpenshift: 'false'
           maintenanceSA: helm-based-service-maintenance
           mode: standalone

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-redis_ha
+    metadata.appcat.vshn.io/revision: master-v4.165.1
     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-redis-ha
+        name: function-appcat-master-v4-165-1
       input:
         apiVersion: v1
         data:
@@ -49,7 +49,7 @@ spec:
           emailAlertingSmtpUsername: appcat@appuio.cloud
           ignoreNamespaceForBilling: vshn-test
           imageRegistry: docker.io
-          imageTag: redis_ha
+          imageTag: v4.165.1
           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-redis_ha
+    metadata.appcat.vshn.io/revision: master-v4.165.1
     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-redis-ha
+        name: function-appcat-master-v4-165-1
       input:
         apiVersion: v1
         data:
@@ -43,7 +43,7 @@ spec:
           emailAlertingSmtpUsername: appcat@appuio.cloud
           externalDatabaseConnectionsEnabled: 'true'
           ignoreNamespaceForBilling: vshn-test
-          imageTag: redis_ha
+          imageTag: v4.165.1
           initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m",
             "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile":
             {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m",