Merge pull request #1078 from vshn/develop

⬆️ Update appcat version to v4.181.0

Author: mikeshootzz

class/defaults.yml

@@ -24,7 +24,7 @@ parameters:
         version: 8.8.2
       forgejo:
         source: oci://code.forgejo.org/forgejo-helm/forgejo
-        version: 16.0.1
+        version: 16.2.0
       cnpg:
         source: https://cloudnative-pg.io/charts/
         version: 0.27.0
@@ -76,7 +76,7 @@ parameters:
       appcat:
         registry: ghcr.io
         repository: vshn/appcat
-        tag: v4.180.1
+        tag: v4.181.0
       functionAppcat:
         registry: ${appcat:images:appcat:registry}
         repository: ${appcat:images:appcat:repository}

component/vshn_codey.jsonnet

@@ -49,7 +49,7 @@ local composition =
     spec: {
       parameters: {
         service: {
-          majorVersion: '13.0.4',
+          majorVersion: '14.0.0',
           fqdn: [ 'myforgejo.127.0.0.1.nip.io' ],
           forgejoSettings: {
             config: {

tests/e2e/forgejo/10-assert.yaml

@@ -19,7 +19,7 @@ spec:
       - forgejo-e2e.apps.lab-cloudscale-rma-0.appuio.cloud
       - sub1.forgejo-e2e.apps.lab-cloudscale-rma-0.appuio.cloud
       serviceLevel: besteffort
-      majorVersion: 12.0.0
+      majorVersion: 14.0.0
     size:
       plan: small
   resourceRef:

tests/e2e/keycloak/70-backup-disabled-install.yaml

@@ -1,7 +1,7 @@
 apiVersion: vshn.appcat.vshn.io/v1
 kind: VSHNKeycloak
 metadata:
-  name: keycloak-backup-disabled-test
+  name: kc-backup-disabled
 spec:
   parameters:
     security:

tests/e2e/keycloak/71-backup-disabled-assert.yaml

@@ -2,4 +2,4 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 timeout: 400
 commands:
-  - script: ../common/scripts/check-backup-disabled.sh vshnkeycloak keycloak-backup-disabled-test
+  - script: ../common/scripts/check-backup-disabled.sh vshnkeycloak kc-backup-disabled

tests/e2e/keycloak/scripts/check-backup.sh

@@ -20,30 +20,32 @@ echo "Composite name: $comp"
 instancens="vshn-postgresql-$comp-pg"
 echo "Instance namespace: $instancens"
 
-echo "Creating SGBackup..."
+echo "Creating CNPG Backup..."
 cat <<EOF | kubectl apply -f -
-apiVersion: stackgres.io/v1
-kind: SGBackup
+apiVersion: postgresql.cnpg.io/v1
+kind: Backup
 metadata:
   name: e2e-backup
   namespace: $instancens
 spec:
-  managedLifecycle: true
-  reconciliationTimeout: 300
-  sgCluster: $comp-pg
+  method: plugin
+  cluster:
+    name: postgresql
+  pluginConfiguration:
+    name: barman-cloud.cloudnative-pg.io
 EOF
 
 echo "Checking backup status..."
 
 backup_status=$(kubectl -n "$NAMESPACE" get vshnkeycloakbackups.api.appcat.vshn.io e2e-backup -o json | jq -r '.status.databaseBackupStatus.process.status')
 
-while [ "$backup_status" == "Running" ] || [ "$backup_status" == "Pending" ] || [ "$backup_status" == "null" ]; do
+while [ "$backup_status" == "running" ] || [ "$backup_status" == "pending" ] || [ "$backup_status" == "started" ] || [ "$backup_status" == "null" ]; do
     echo "Backup status: $backup_status"
     backup_status=$(kubectl -n "$NAMESPACE" get vshnkeycloakbackups.api.appcat.vshn.io e2e-backup -o json | jq -r '.status.databaseBackupStatus.process.status')
     sleep 1
 done
 
-if [ "$backup_status" != "Completed" ]; then
+if [ "$backup_status" != "completed" ]; then
     echo "✗ Backup failed with status: $backup_status"
     exit 1
 fi

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-180-1
+  name: function-appcat-master-v4-181-0
 spec:
-  package: ghcr.io/vshn/appcat:v4.180.1-func
+  package: ghcr.io/vshn/appcat:v4.181.0-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-65-0-v4-179-0
+  name: function-appcat-v3-65-1-v4-179-1
 spec:
-  package: ghcr.io/vshn/appcat:v4.179.0-func
+  package: ghcr.io/vshn/appcat:v4.179.1-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-65-1-v4-179-1
+  name: function-appcat-v3-65-2-v4-179-1
 spec:
   package: ghcr.io/vshn/appcat:v4.179.1-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-65-2-v4-179-1
+  name: function-appcat-v3-66-0-v4-180-0
 spec:
-  package: ghcr.io/vshn/appcat:v4.179.1-func
+  package: ghcr.io/vshn/appcat:v4.180.0-func
   packagePullPolicy: IfNotPresent
   runtimeConfigRef:
     name: function-appcat
@@ -60,7 +60,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/sync-wave: '-40'
-  name: function-appcat-v3-66-0-v4-180-0
+  name: function-appcat-v3-66-1-v4-180-0
 spec:
   package: ghcr.io/vshn/appcat:v4.180.0-func
   packagePullPolicy: IfNotPresent
@@ -74,9 +74,9 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/sync-wave: '-40'
-  name: function-appcat-v3-66-1-v4-180-0
+  name: function-appcat-v3-66-2-v4-180-1
 spec:
-  package: ghcr.io/vshn/appcat:v4.180.0-func
+  package: ghcr.io/vshn/appcat:v4.180.1-func
   packagePullPolicy: IfNotPresent
   runtimeConfigRef:
     name: function-appcat

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

@@ -5434,10 +5434,10 @@ spec:
                           minItems: 1
                           type: array
                         majorVersion:
-                          default: 12.0.0
+                          default: 14.0.0
                           description: |-
                             Version contains supported version of Forgejo.
-                            Multiple versions are supported. Defaults to 12.0.0 if not set.
+                            Multiple versions are supported. Defaults to 14.0.0 if not set.
                           type: string
                         serviceLevel:
                           default: besteffort

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-180-1
+        name: function-appcat-master-v4-181-0
       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.180.1
+    metadata.appcat.vshn.io/revision: master-v4.181.0
     metadata.appcat.vshn.io/serviceID: vshn-codey
     name: codey.io
   name: codey.io
@@ -51,7 +51,7 @@ spec:
                           USER: __shared__/__shared__/appcat/codey_smtp_username
                     fqdn:
                       - myforgejo.127.0.0.1.nip.io
-                    majorVersion: 13.0.4
+                    majorVersion: 14.0.0
                   size:
                     plan: mini
             connectionDetails: