From d8fbfa59d90a5b9cd6b8b31f84b575e7b31078ad Mon Sep 17 00:00:00 2001 From: Kidswiss <7460550+Kidswiss@users.noreply.github.com> Date: Thu, 12 Dec 2024 11:58:55 +0000 Subject: [PATCH 1/3] [create-pull-request] automated change --- class/defaults.yml | 2 +- .../golden/control-plane/appcat/appcat/10_function_appcat.yaml | 2 +- .../control-plane/appcat/appcat/20_xrd_vshn_keycloak.yaml | 1 + .../golden/control-plane/appcat/appcat/20_xrd_vshn_mariadb.yaml | 1 + .../control-plane/appcat/appcat/20_xrd_vshn_nextcloud.yaml | 1 + tests/golden/control-plane/appcat/appcat/20_xrd_vshn_redis.yaml | 1 + .../appcat/appcat/21_composition_vshn_keycloak.yaml | 2 +- .../appcat/appcat/21_composition_vshn_mariadb.yaml | 2 +- .../appcat/appcat/21_composition_vshn_nextcloud.yaml | 2 +- .../appcat/appcat/21_composition_vshn_postgres.yaml | 2 +- .../control-plane/appcat/appcat/21_composition_vshn_redis.yaml | 2 +- .../control-plane/appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- .../control-plane/appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- tests/golden/defaults/appcat/appcat/10_function_appcat.yaml | 2 +- .../golden/defaults/appcat/appcat/apiserver/30_deployment.yaml | 2 +- ...pps_v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- tests/golden/dev/appcat/appcat/10_function_appcat.yaml | 2 +- tests/golden/dev/appcat/appcat/20_xrd_vshn_keycloak.yaml | 1 + tests/golden/dev/appcat/appcat/20_xrd_vshn_mariadb.yaml | 1 + tests/golden/dev/appcat/appcat/20_xrd_vshn_nextcloud.yaml | 1 + tests/golden/dev/appcat/appcat/20_xrd_vshn_redis.yaml | 1 + .../golden/dev/appcat/appcat/21_composition_vshn_keycloak.yaml | 2 +- tests/golden/dev/appcat/appcat/21_composition_vshn_mariadb.yaml | 2 +- .../golden/dev/appcat/appcat/21_composition_vshn_nextcloud.yaml | 2 +- .../golden/dev/appcat/appcat/21_composition_vshn_postgres.yaml | 2 +- tests/golden/dev/appcat/appcat/21_composition_vshn_redis.yaml | 2 +- tests/golden/dev/appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../dev/appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- tests/golden/dev/appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- ...pps_v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- .../appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- ...pps_v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- tests/golden/vshn-cloud/appcat/appcat/10_function_appcat.yaml | 2 +- tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_keycloak.yaml | 1 + tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_mariadb.yaml | 1 + .../golden/vshn-cloud/appcat/appcat/20_xrd_vshn_nextcloud.yaml | 1 + tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_redis.yaml | 1 + .../vshn-cloud/appcat/appcat/21_composition_vshn_keycloak.yaml | 2 +- .../vshn-cloud/appcat/appcat/21_composition_vshn_mariadb.yaml | 2 +- .../vshn-cloud/appcat/appcat/21_composition_vshn_minio.yaml | 2 +- .../vshn-cloud/appcat/appcat/21_composition_vshn_nextcloud.yaml | 2 +- .../vshn-cloud/appcat/appcat/21_composition_vshn_postgres.yaml | 2 +- .../vshn-cloud/appcat/appcat/21_composition_vshn_redis.yaml | 2 +- .../vshn-cloud/appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- .../vshn-cloud/appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- ...pps_v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- tests/golden/vshn-managed/appcat/appcat/10_function_appcat.yaml | 2 +- .../golden/vshn-managed/appcat/appcat/20_xrd_vshn_keycloak.yaml | 1 + .../golden/vshn-managed/appcat/appcat/20_xrd_vshn_mariadb.yaml | 1 + .../vshn-managed/appcat/appcat/20_xrd_vshn_nextcloud.yaml | 1 + tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_redis.yaml | 1 + .../appcat/appcat/21_composition_vshn_keycloak.yaml | 2 +- .../vshn-managed/appcat/appcat/21_composition_vshn_mariadb.yaml | 2 +- .../vshn-managed/appcat/appcat/21_composition_vshn_minio.yaml | 2 +- .../appcat/appcat/21_composition_vshn_nextcloud.yaml | 2 +- .../appcat/appcat/21_composition_vshn_postgres.yaml | 2 +- .../vshn-managed/appcat/appcat/21_composition_vshn_redis.yaml | 2 +- .../vshn-managed/appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- .../vshn-managed/appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- ...pps_v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- 63 files changed, 63 insertions(+), 47 deletions(-) diff --git a/class/defaults.yml b/class/defaults.yml index 1e4c6a94d..a8265f70c 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -55,7 +55,7 @@ parameters: appcat: registry: ghcr.io repository: vshn/appcat - tag: v4.117.0 + tag: fix/default_backup_retetion functionAppcat: registry: ${appcat:images:appcat:registry} repository: ${appcat:images:appcat:repository} diff --git a/tests/golden/control-plane/appcat/appcat/10_function_appcat.yaml b/tests/golden/control-plane/appcat/appcat/10_function_appcat.yaml index 21465a512..471abf230 100644 --- a/tests/golden/control-plane/appcat/appcat/10_function_appcat.yaml +++ b/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.117.0-func + package: ghcr.io/vshn/appcat:fix_default_backup_retetion-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_keycloak.yaml b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_keycloak.yaml index d4a9cb190..589e55000 100644 --- a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_keycloak.yaml +++ b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_keycloak.yaml @@ -43,6 +43,7 @@ spec: should get backed up. properties: retention: + default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: diff --git a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_mariadb.yaml b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_mariadb.yaml index 1a71c67ec..4dce35cd4 100644 --- a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_mariadb.yaml +++ b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_mariadb.yaml @@ -44,6 +44,7 @@ spec: should get backed up. properties: retention: + default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: diff --git a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_nextcloud.yaml b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_nextcloud.yaml index 99385a143..7829a55a6 100644 --- a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_nextcloud.yaml +++ b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_nextcloud.yaml @@ -43,6 +43,7 @@ spec: should get backed up. properties: retention: + default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: diff --git a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_redis.yaml b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_redis.yaml index 7fd70639a..bfde9dded 100644 --- a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_redis.yaml +++ b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_redis.yaml @@ -46,6 +46,7 @@ spec: should get backed up. properties: retention: + default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_keycloak.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_keycloak.yaml index f3bc1cfb1..3dfa1a42b 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_keycloak.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_keycloak.yaml @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.117.0 + imageTag: fix_default_backup_retetion ingress_annotations: | nginx.ingress.kubernetes.io/backend-protocol: HTTPS cert-manager.io/cluster-issuer: letsencrypt-staging diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_mariadb.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_mariadb.yaml index 1645ec3cd..499c29905 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_mariadb.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_mariadb.yaml @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.117.0 + imageTag: fix_default_backup_retetion isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance mode: standalone diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_nextcloud.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_nextcloud.yaml index fb89fbb3e..c5c40511c 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_nextcloud.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_nextcloud.yaml @@ -45,7 +45,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.117.0 + imageTag: fix_default_backup_retetion ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-staging nginx.ingress.kubernetes.io/enable-cors: "true" diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgres.yaml index 76b7e2846..d00998a8d 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgres.yaml @@ -41,7 +41,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: v4.117.0 + imageTag: fix_default_backup_retetion initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m", "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile": {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m", diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_redis.yaml index 706432ddf..c19383b54 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_redis.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_redis.yaml @@ -597,7 +597,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.117.0 + imageTag: fix_default_backup_retetion isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance ownerGroup: vshn.appcat.vshn.io diff --git a/tests/golden/control-plane/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/control-plane/appcat/appcat/apiserver/30_deployment.yaml index eea8f591e..18fe4322f 100644 --- a/tests/golden/control-plane/appcat/appcat/apiserver/30_deployment.yaml +++ b/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.117.0 + image: ghcr.io/vshn/appcat:fix_default_backup_retetion livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/control-plane/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/control-plane/appcat/appcat/controllers/appcat/30_deployment.yaml index 175c13602..d3df4507c 100644 --- a/tests/golden/control-plane/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/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.117.0 + image: ghcr.io/vshn/appcat:fix_default_backup_retetion livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/control-plane/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/control-plane/appcat/appcat/sla_reporter/01_cronjob.yaml index d11dec077..416070e0a 100644 --- a/tests/golden/control-plane/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/tests/golden/control-plane/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:v4.117.0 + image: ghcr.io/vshn/appcat:fix_default_backup_retetion name: sla-reporter resources: limits: diff --git a/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml b/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml index 21465a512..471abf230 100644 --- a/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/defaults/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.117.0-func + package: ghcr.io/vshn/appcat:fix_default_backup_retetion-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml index eea8f591e..18fe4322f 100644 --- a/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/defaults/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.117.0 + image: ghcr.io/vshn/appcat:fix_default_backup_retetion livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index f495b69c5..49bbf03bf 100644 --- a/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -24,7 +24,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 env: [] - image: ghcr.io/vshn/appcat:v4.117.0 + image: ghcr.io/vshn/appcat:fix_default_backup_retetion livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/dev/appcat/appcat/10_function_appcat.yaml b/tests/golden/dev/appcat/appcat/10_function_appcat.yaml index 21465a512..471abf230 100644 --- a/tests/golden/dev/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/dev/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.117.0-func + package: ghcr.io/vshn/appcat:fix_default_backup_retetion-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/dev/appcat/appcat/20_xrd_vshn_keycloak.yaml b/tests/golden/dev/appcat/appcat/20_xrd_vshn_keycloak.yaml index 5b1262717..c893a506a 100644 --- a/tests/golden/dev/appcat/appcat/20_xrd_vshn_keycloak.yaml +++ b/tests/golden/dev/appcat/appcat/20_xrd_vshn_keycloak.yaml @@ -43,6 +43,7 @@ spec: should get backed up. properties: retention: + default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: diff --git a/tests/golden/dev/appcat/appcat/20_xrd_vshn_mariadb.yaml b/tests/golden/dev/appcat/appcat/20_xrd_vshn_mariadb.yaml index db2406390..f1affe1bc 100644 --- a/tests/golden/dev/appcat/appcat/20_xrd_vshn_mariadb.yaml +++ b/tests/golden/dev/appcat/appcat/20_xrd_vshn_mariadb.yaml @@ -44,6 +44,7 @@ spec: should get backed up. properties: retention: + default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: diff --git a/tests/golden/dev/appcat/appcat/20_xrd_vshn_nextcloud.yaml b/tests/golden/dev/appcat/appcat/20_xrd_vshn_nextcloud.yaml index 4486b4ae7..62ddbf48e 100644 --- a/tests/golden/dev/appcat/appcat/20_xrd_vshn_nextcloud.yaml +++ b/tests/golden/dev/appcat/appcat/20_xrd_vshn_nextcloud.yaml @@ -43,6 +43,7 @@ spec: should get backed up. properties: retention: + default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: diff --git a/tests/golden/dev/appcat/appcat/20_xrd_vshn_redis.yaml b/tests/golden/dev/appcat/appcat/20_xrd_vshn_redis.yaml index 47de0f5c0..a3849a580 100644 --- a/tests/golden/dev/appcat/appcat/20_xrd_vshn_redis.yaml +++ b/tests/golden/dev/appcat/appcat/20_xrd_vshn_redis.yaml @@ -46,6 +46,7 @@ spec: should get backed up. properties: retention: + default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_keycloak.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_keycloak.yaml index bb4c22d98..1239729c0 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_keycloak.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_keycloak.yaml @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.117.0 + imageTag: fix_default_backup_retetion ingress_annotations: | nginx.ingress.kubernetes.io/backend-protocol: HTTPS cert-manager.io/cluster-issuer: letsencrypt-staging diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_mariadb.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_mariadb.yaml index 89c4c4b8c..6211105d1 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_mariadb.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_mariadb.yaml @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.117.0 + imageTag: fix_default_backup_retetion isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance mode: standalone diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_nextcloud.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_nextcloud.yaml index ad47ba1f0..830f98009 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_nextcloud.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_nextcloud.yaml @@ -45,7 +45,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.117.0 + imageTag: fix_default_backup_retetion ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-staging isOpenshift: 'false' diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_postgres.yaml index 4257f0951..54681053a 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_postgres.yaml @@ -41,7 +41,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: v4.117.0 + imageTag: fix_default_backup_retetion initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m", "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile": {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m", diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_redis.yaml index 7f9fe1262..451fd96ca 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_redis.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_redis.yaml @@ -597,7 +597,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.117.0 + imageTag: fix_default_backup_retetion isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance ownerGroup: vshn.appcat.vshn.io diff --git a/tests/golden/dev/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/dev/appcat/appcat/apiserver/30_deployment.yaml index eea8f591e..18fe4322f 100644 --- a/tests/golden/dev/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/dev/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.117.0 + image: ghcr.io/vshn/appcat:fix_default_backup_retetion livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/dev/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/dev/appcat/appcat/controllers/appcat/30_deployment.yaml index 175c13602..d3df4507c 100644 --- a/tests/golden/dev/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/dev/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.117.0 + image: ghcr.io/vshn/appcat:fix_default_backup_retetion livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/dev/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/dev/appcat/appcat/sla_reporter/01_cronjob.yaml index d11dec077..416070e0a 100644 --- a/tests/golden/dev/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/tests/golden/dev/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:v4.117.0 + image: ghcr.io/vshn/appcat:fix_default_backup_retetion name: sla-reporter resources: limits: diff --git a/tests/golden/dev/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/dev/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index f495b69c5..49bbf03bf 100644 --- a/tests/golden/dev/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/dev/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -24,7 +24,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 env: [] - image: ghcr.io/vshn/appcat:v4.117.0 + image: ghcr.io/vshn/appcat:fix_default_backup_retetion livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/service-cluster/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/service-cluster/appcat/appcat/controllers/appcat/30_deployment.yaml index cb7f2e380..b3f60e583 100644 --- a/tests/golden/service-cluster/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/service-cluster/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -30,7 +30,7 @@ spec: secretKeyRef: key: kubeconfig name: controlclustercredentials - image: ghcr.io/vshn/appcat:v4.117.0 + image: ghcr.io/vshn/appcat:fix_default_backup_retetion livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/service-cluster/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/service-cluster/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index e03560d53..3f61a2297 100644 --- a/tests/golden/service-cluster/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/service-cluster/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -26,7 +26,7 @@ spec: env: - name: KUBECONFIG value: /.kube/config - image: ghcr.io/vshn/appcat:v4.117.0 + image: ghcr.io/vshn/appcat:fix_default_backup_retetion livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/vshn-cloud/appcat/appcat/10_function_appcat.yaml b/tests/golden/vshn-cloud/appcat/appcat/10_function_appcat.yaml index 21465a512..471abf230 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/vshn-cloud/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.117.0-func + package: ghcr.io/vshn/appcat:fix_default_backup_retetion-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_keycloak.yaml b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_keycloak.yaml index d4a9cb190..589e55000 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_keycloak.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_keycloak.yaml @@ -43,6 +43,7 @@ spec: should get backed up. properties: retention: + default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: diff --git a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_mariadb.yaml b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_mariadb.yaml index 1a71c67ec..4dce35cd4 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_mariadb.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_mariadb.yaml @@ -44,6 +44,7 @@ spec: should get backed up. properties: retention: + default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: diff --git a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_nextcloud.yaml b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_nextcloud.yaml index 99385a143..7829a55a6 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_nextcloud.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_nextcloud.yaml @@ -43,6 +43,7 @@ spec: should get backed up. properties: retention: + default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: diff --git a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_redis.yaml b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_redis.yaml index 7fd70639a..bfde9dded 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_redis.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_redis.yaml @@ -46,6 +46,7 @@ spec: should get backed up. properties: retention: + default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_keycloak.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_keycloak.yaml index 1662915da..be75703c5 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_keycloak.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_keycloak.yaml @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.117.0 + imageTag: fix_default_backup_retetion ingress_annotations: | nginx.ingress.kubernetes.io/backend-protocol: HTTPS cert-manager.io/cluster-issuer: letsencrypt-staging diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_mariadb.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_mariadb.yaml index 12c342007..9b600d346 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_mariadb.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_mariadb.yaml @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.117.0 + imageTag: fix_default_backup_retetion isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance mode: standalone diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_minio.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_minio.yaml index feb42a42b..cc0346b7d 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_minio.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_minio.yaml @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.117.0 + imageTag: fix_default_backup_retetion isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance minioChartRepository: https://charts.min.io diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_nextcloud.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_nextcloud.yaml index 6bf8cd80d..b0de043c4 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_nextcloud.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_nextcloud.yaml @@ -45,7 +45,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.117.0 + imageTag: fix_default_backup_retetion ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-staging isOpenshift: 'true' diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgres.yaml index ff7179416..ced002d7d 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgres.yaml @@ -41,7 +41,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: v4.117.0 + imageTag: fix_default_backup_retetion initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m", "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile": {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m", diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_redis.yaml index 361680ec2..f467d92fe 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_redis.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_redis.yaml @@ -597,7 +597,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.117.0 + imageTag: fix_default_backup_retetion isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance ownerGroup: vshn.appcat.vshn.io diff --git a/tests/golden/vshn-cloud/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/vshn-cloud/appcat/appcat/apiserver/30_deployment.yaml index 45703f5e3..6db3a42e6 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/vshn-cloud/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.117.0 + image: ghcr.io/vshn/appcat:fix_default_backup_retetion livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/vshn-cloud/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/vshn-cloud/appcat/appcat/controllers/appcat/30_deployment.yaml index 175c13602..d3df4507c 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/vshn-cloud/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.117.0 + image: ghcr.io/vshn/appcat:fix_default_backup_retetion livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/vshn-cloud/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/vshn-cloud/appcat/appcat/sla_reporter/01_cronjob.yaml index d11dec077..416070e0a 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:v4.117.0 + image: ghcr.io/vshn/appcat:fix_default_backup_retetion name: sla-reporter resources: limits: diff --git a/tests/golden/vshn-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/vshn-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index f495b69c5..49bbf03bf 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -24,7 +24,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 env: [] - image: ghcr.io/vshn/appcat:v4.117.0 + image: ghcr.io/vshn/appcat:fix_default_backup_retetion livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/vshn-managed/appcat/appcat/10_function_appcat.yaml b/tests/golden/vshn-managed/appcat/appcat/10_function_appcat.yaml index 21465a512..471abf230 100644 --- a/tests/golden/vshn-managed/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/vshn-managed/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.117.0-func + package: ghcr.io/vshn/appcat:fix_default_backup_retetion-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_keycloak.yaml b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_keycloak.yaml index d4a9cb190..589e55000 100644 --- a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_keycloak.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_keycloak.yaml @@ -43,6 +43,7 @@ spec: should get backed up. properties: retention: + default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: diff --git a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_mariadb.yaml b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_mariadb.yaml index 1a71c67ec..4dce35cd4 100644 --- a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_mariadb.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_mariadb.yaml @@ -44,6 +44,7 @@ spec: should get backed up. properties: retention: + default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: diff --git a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_nextcloud.yaml b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_nextcloud.yaml index 99385a143..7829a55a6 100644 --- a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_nextcloud.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_nextcloud.yaml @@ -43,6 +43,7 @@ spec: should get backed up. properties: retention: + default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: diff --git a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_redis.yaml b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_redis.yaml index 7fd70639a..bfde9dded 100644 --- a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_redis.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_redis.yaml @@ -46,6 +46,7 @@ spec: should get backed up. properties: retention: + default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_keycloak.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_keycloak.yaml index 32ac5f666..77813f604 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_keycloak.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_keycloak.yaml @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.117.0 + imageTag: fix_default_backup_retetion ingress_annotations: | nginx.ingress.kubernetes.io/backend-protocol: HTTPS cert-manager.io/cluster-issuer: letsencrypt-staging diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_mariadb.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_mariadb.yaml index 77fd48dfd..a3082e5ff 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_mariadb.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_mariadb.yaml @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.117.0 + imageTag: fix_default_backup_retetion isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance mode: standalone diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_minio.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_minio.yaml index 5fb61d9ad..b3f450405 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_minio.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_minio.yaml @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.117.0 + imageTag: fix_default_backup_retetion isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance minioChartRepository: https://charts.min.io diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_nextcloud.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_nextcloud.yaml index 7a30e18ec..e893d17a9 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_nextcloud.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_nextcloud.yaml @@ -45,7 +45,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.117.0 + imageTag: fix_default_backup_retetion ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-staging isOpenshift: 'true' diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgres.yaml index bb9b7d671..b578c4c7f 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgres.yaml @@ -41,7 +41,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: v4.117.0 + imageTag: fix_default_backup_retetion initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m", "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile": {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m", diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_redis.yaml index 8928a72fa..117505f7f 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_redis.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_redis.yaml @@ -597,7 +597,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.117.0 + imageTag: fix_default_backup_retetion isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance ownerGroup: vshn.appcat.vshn.io diff --git a/tests/golden/vshn-managed/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/vshn-managed/appcat/appcat/apiserver/30_deployment.yaml index 45703f5e3..6db3a42e6 100644 --- a/tests/golden/vshn-managed/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/vshn-managed/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.117.0 + image: ghcr.io/vshn/appcat:fix_default_backup_retetion livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/vshn-managed/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/vshn-managed/appcat/appcat/controllers/appcat/30_deployment.yaml index 175c13602..d3df4507c 100644 --- a/tests/golden/vshn-managed/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/vshn-managed/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.117.0 + image: ghcr.io/vshn/appcat:fix_default_backup_retetion livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/vshn-managed/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/vshn-managed/appcat/appcat/sla_reporter/01_cronjob.yaml index d11dec077..416070e0a 100644 --- a/tests/golden/vshn-managed/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:v4.117.0 + image: ghcr.io/vshn/appcat:fix_default_backup_retetion name: sla-reporter resources: limits: diff --git a/tests/golden/vshn-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/vshn-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index f495b69c5..49bbf03bf 100644 --- a/tests/golden/vshn-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -24,7 +24,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 env: [] - image: ghcr.io/vshn/appcat:v4.117.0 + image: ghcr.io/vshn/appcat:fix_default_backup_retetion livenessProbe: httpGet: path: /healthz From 5f4a684062db33fdfe21b0ec89cfde15efc91fee Mon Sep 17 00:00:00 2001 From: Simon Beck Date: Thu, 12 Dec 2024 13:06:23 +0100 Subject: [PATCH 2/3] Add e2e test for backup defaults --- tests/e2e/keycloak/00-assert.yaml | 4 +++- tests/e2e/keycloak/04-assert.yaml | 4 +++- tests/e2e/mariadb/03-assert.yaml | 4 +++- tests/e2e/nextcloud/00-assert.yaml | 4 +++- tests/e2e/nextcloud/04-assert.yaml | 4 +++- tests/e2e/redis/00-assert.yaml | 4 +++- tests/e2e/redis/04-assert.yaml | 4 +++- 7 files changed, 21 insertions(+), 7 deletions(-) diff --git a/tests/e2e/keycloak/00-assert.yaml b/tests/e2e/keycloak/00-assert.yaml index 222a2ce67..02bb1e9cb 100644 --- a/tests/e2e/keycloak/00-assert.yaml +++ b/tests/e2e/keycloak/00-assert.yaml @@ -14,7 +14,9 @@ spec: name: vshnkeycloak.vshn.appcat.vshn.io compositionUpdatePolicy: Automatic parameters: - backup: {} + backup: + retention: + keepDaily: 6 security: deletionProtection: true service: diff --git a/tests/e2e/keycloak/04-assert.yaml b/tests/e2e/keycloak/04-assert.yaml index b1c84bac9..c04ba4058 100644 --- a/tests/e2e/keycloak/04-assert.yaml +++ b/tests/e2e/keycloak/04-assert.yaml @@ -14,7 +14,9 @@ spec: name: vshnkeycloak.vshn.appcat.vshn.io compositionUpdatePolicy: Automatic parameters: - backup: {} + backup: + retention: + keepDaily: 6 security: deletionProtection: false service: diff --git a/tests/e2e/mariadb/03-assert.yaml b/tests/e2e/mariadb/03-assert.yaml index 0d4d43711..fca36173c 100644 --- a/tests/e2e/mariadb/03-assert.yaml +++ b/tests/e2e/mariadb/03-assert.yaml @@ -14,7 +14,9 @@ spec: name: vshnmariadb.vshn.appcat.vshn.io compositionUpdatePolicy: Automatic parameters: - backup: {} + backup: + retention: + keepDaily: 6 security: deletionProtection: false service: diff --git a/tests/e2e/nextcloud/00-assert.yaml b/tests/e2e/nextcloud/00-assert.yaml index f1fe33cdf..ccba1486a 100644 --- a/tests/e2e/nextcloud/00-assert.yaml +++ b/tests/e2e/nextcloud/00-assert.yaml @@ -14,7 +14,9 @@ spec: name: vshnnextcloud.vshn.appcat.vshn.io compositionUpdatePolicy: Automatic parameters: - backup: {} + backup: + retention: + keepDaily: 6 security: deletionProtection: true service: diff --git a/tests/e2e/nextcloud/04-assert.yaml b/tests/e2e/nextcloud/04-assert.yaml index 58ef9b66c..aa5387433 100644 --- a/tests/e2e/nextcloud/04-assert.yaml +++ b/tests/e2e/nextcloud/04-assert.yaml @@ -14,7 +14,9 @@ spec: name: vshnnextcloud.vshn.appcat.vshn.io compositionUpdatePolicy: Automatic parameters: - backup: {} + backup: + retention: + keepDaily: 6 security: deletionProtection: false service: diff --git a/tests/e2e/redis/00-assert.yaml b/tests/e2e/redis/00-assert.yaml index aa32a16d7..5f73ea79a 100644 --- a/tests/e2e/redis/00-assert.yaml +++ b/tests/e2e/redis/00-assert.yaml @@ -14,7 +14,9 @@ spec: name: vshnredis.vshn.appcat.vshn.io compositionUpdatePolicy: Automatic parameters: - backup: {} + backup: + retention: + keepDaily: 6 security: deletionProtection: true service: diff --git a/tests/e2e/redis/04-assert.yaml b/tests/e2e/redis/04-assert.yaml index 03d14a65a..2368e0508 100644 --- a/tests/e2e/redis/04-assert.yaml +++ b/tests/e2e/redis/04-assert.yaml @@ -14,7 +14,9 @@ spec: name: vshnredis.vshn.appcat.vshn.io compositionUpdatePolicy: Automatic parameters: - backup: {} + backup: + retention: + keepDaily: 6 security: deletionProtection: false service: From b71ed7a7132ca7da0b04ac263c2d0c406965584f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 20 Dec 2024 09:48:35 +0000 Subject: [PATCH 3/3] Update tag --- class/defaults.yml | 2 +- .../golden/control-plane/appcat/appcat/10_function_appcat.yaml | 2 +- .../control-plane/appcat/appcat/20_xrd_vshn_keycloak.yaml | 2 +- .../control-plane/appcat/appcat/20_xrd_vshn_nextcloud.yaml | 2 +- .../control-plane/appcat/appcat/20_xrd_vshn_postgres.yaml | 2 +- .../appcat/appcat/21_composition_vshn_keycloak.yaml | 2 +- .../appcat/appcat/21_composition_vshn_mariadb.yaml | 2 +- .../appcat/appcat/21_composition_vshn_nextcloud.yaml | 2 +- .../appcat/appcat/21_composition_vshn_postgres.yaml | 2 +- .../control-plane/appcat/appcat/21_composition_vshn_redis.yaml | 2 +- .../control-plane/appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- .../control-plane/appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- tests/golden/defaults/appcat/appcat/10_function_appcat.yaml | 2 +- .../golden/defaults/appcat/appcat/apiserver/30_deployment.yaml | 2 +- ...pps_v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- tests/golden/dev/appcat/appcat/10_function_appcat.yaml | 2 +- tests/golden/dev/appcat/appcat/20_xrd_vshn_keycloak.yaml | 2 +- tests/golden/dev/appcat/appcat/20_xrd_vshn_nextcloud.yaml | 2 +- tests/golden/dev/appcat/appcat/20_xrd_vshn_postgres.yaml | 2 +- .../golden/dev/appcat/appcat/21_composition_vshn_keycloak.yaml | 2 +- tests/golden/dev/appcat/appcat/21_composition_vshn_mariadb.yaml | 2 +- .../golden/dev/appcat/appcat/21_composition_vshn_nextcloud.yaml | 2 +- .../golden/dev/appcat/appcat/21_composition_vshn_postgres.yaml | 2 +- tests/golden/dev/appcat/appcat/21_composition_vshn_redis.yaml | 2 +- tests/golden/dev/appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../dev/appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- tests/golden/dev/appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- ...pps_v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- .../appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- ...pps_v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- tests/golden/vshn-cloud/appcat/appcat/10_function_appcat.yaml | 2 +- tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_keycloak.yaml | 2 +- .../golden/vshn-cloud/appcat/appcat/20_xrd_vshn_nextcloud.yaml | 2 +- tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_postgres.yaml | 2 +- .../vshn-cloud/appcat/appcat/21_composition_vshn_keycloak.yaml | 2 +- .../vshn-cloud/appcat/appcat/21_composition_vshn_mariadb.yaml | 2 +- .../vshn-cloud/appcat/appcat/21_composition_vshn_minio.yaml | 2 +- .../vshn-cloud/appcat/appcat/21_composition_vshn_nextcloud.yaml | 2 +- .../vshn-cloud/appcat/appcat/21_composition_vshn_postgres.yaml | 2 +- .../vshn-cloud/appcat/appcat/21_composition_vshn_redis.yaml | 2 +- .../vshn-cloud/appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- .../vshn-cloud/appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- ...pps_v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- tests/golden/vshn-managed/appcat/appcat/10_function_appcat.yaml | 2 +- .../golden/vshn-managed/appcat/appcat/20_xrd_vshn_keycloak.yaml | 2 +- .../vshn-managed/appcat/appcat/20_xrd_vshn_nextcloud.yaml | 2 +- .../golden/vshn-managed/appcat/appcat/20_xrd_vshn_postgres.yaml | 2 +- .../appcat/appcat/21_composition_vshn_keycloak.yaml | 2 +- .../vshn-managed/appcat/appcat/21_composition_vshn_mariadb.yaml | 2 +- .../vshn-managed/appcat/appcat/21_composition_vshn_minio.yaml | 2 +- .../appcat/appcat/21_composition_vshn_nextcloud.yaml | 2 +- .../appcat/appcat/21_composition_vshn_postgres.yaml | 2 +- .../vshn-managed/appcat/appcat/21_composition_vshn_redis.yaml | 2 +- .../vshn-managed/appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- .../vshn-managed/appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- ...pps_v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- 59 files changed, 59 insertions(+), 59 deletions(-) diff --git a/class/defaults.yml b/class/defaults.yml index a8265f70c..22ac4576a 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -55,7 +55,7 @@ parameters: appcat: registry: ghcr.io repository: vshn/appcat - tag: fix/default_backup_retetion + tag: v4.118.3 functionAppcat: registry: ${appcat:images:appcat:registry} repository: ${appcat:images:appcat:repository} diff --git a/tests/golden/control-plane/appcat/appcat/10_function_appcat.yaml b/tests/golden/control-plane/appcat/appcat/10_function_appcat.yaml index 471abf230..8cd610988 100644 --- a/tests/golden/control-plane/appcat/appcat/10_function_appcat.yaml +++ b/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:fix_default_backup_retetion-func + package: ghcr.io/vshn/appcat:v4.118.3-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_keycloak.yaml b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_keycloak.yaml index 589e55000..4a83d77cf 100644 --- a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_keycloak.yaml +++ b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_keycloak.yaml @@ -11904,7 +11904,7 @@ spec: type: default: Immediate description: |- - Type indicates the type of the UpdateStrategy. Default is OnRestart. + Type indicates the type of the UpdateStrategy. Default is Immediate. Possible enum values: - `"OnRestart"` indicates that the changes to the spec will only be applied once the instance is restarted by other means, most likely during maintenance. - `"Immediate"` indicates that update will be applied to the instance as soon as the spec changes. Please be aware that this might lead to short downtime. diff --git a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_nextcloud.yaml b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_nextcloud.yaml index 7829a55a6..d6c652e94 100644 --- a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_nextcloud.yaml +++ b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_nextcloud.yaml @@ -11890,7 +11890,7 @@ spec: type: default: Immediate description: |- - Type indicates the type of the UpdateStrategy. Default is OnRestart. + Type indicates the type of the UpdateStrategy. Default is Immediate. Possible enum values: - `"OnRestart"` indicates that the changes to the spec will only be applied once the instance is restarted by other means, most likely during maintenance. - `"Immediate"` indicates that update will be applied to the instance as soon as the spec changes. Please be aware that this might lead to short downtime. diff --git a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_postgres.yaml b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_postgres.yaml index 11650d5c4..e60dca0ed 100644 --- a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_postgres.yaml +++ b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_postgres.yaml @@ -5893,7 +5893,7 @@ spec: type: default: Immediate description: |- - Type indicates the type of the UpdateStrategy. Default is OnRestart. + Type indicates the type of the UpdateStrategy. Default is Immediate. Possible enum values: - `"OnRestart"` indicates that the changes to the spec will only be applied once the instance is restarted by other means, most likely during maintenance. - `"Immediate"` indicates that update will be applied to the instance as soon as the spec changes. Please be aware that this might lead to short downtime. diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_keycloak.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_keycloak.yaml index 3dfa1a42b..f8939b5b3 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_keycloak.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_keycloak.yaml @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: fix_default_backup_retetion + imageTag: v4.118.3 ingress_annotations: | nginx.ingress.kubernetes.io/backend-protocol: HTTPS cert-manager.io/cluster-issuer: letsencrypt-staging diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_mariadb.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_mariadb.yaml index 499c29905..834496c32 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_mariadb.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_mariadb.yaml @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: fix_default_backup_retetion + imageTag: v4.118.3 isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance mode: standalone diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_nextcloud.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_nextcloud.yaml index c5c40511c..bb199dd70 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_nextcloud.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_nextcloud.yaml @@ -45,7 +45,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: fix_default_backup_retetion + imageTag: v4.118.3 ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-staging nginx.ingress.kubernetes.io/enable-cors: "true" diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgres.yaml index d00998a8d..8c11e1f99 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgres.yaml @@ -41,7 +41,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: fix_default_backup_retetion + imageTag: v4.118.3 initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m", "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile": {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m", diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_redis.yaml index c19383b54..601349754 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_redis.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_redis.yaml @@ -597,7 +597,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: fix_default_backup_retetion + imageTag: v4.118.3 isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance ownerGroup: vshn.appcat.vshn.io diff --git a/tests/golden/control-plane/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/control-plane/appcat/appcat/apiserver/30_deployment.yaml index 18fe4322f..2a9a736cd 100644 --- a/tests/golden/control-plane/appcat/appcat/apiserver/30_deployment.yaml +++ b/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:fix_default_backup_retetion + image: ghcr.io/vshn/appcat:v4.118.3 livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/control-plane/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/control-plane/appcat/appcat/controllers/appcat/30_deployment.yaml index d3df4507c..b5130d2fc 100644 --- a/tests/golden/control-plane/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/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:fix_default_backup_retetion + image: ghcr.io/vshn/appcat:v4.118.3 livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/control-plane/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/control-plane/appcat/appcat/sla_reporter/01_cronjob.yaml index 416070e0a..e6787f567 100644 --- a/tests/golden/control-plane/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/tests/golden/control-plane/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:fix_default_backup_retetion + image: ghcr.io/vshn/appcat:v4.118.3 name: sla-reporter resources: limits: diff --git a/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml b/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml index 471abf230..8cd610988 100644 --- a/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/defaults/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:fix_default_backup_retetion-func + package: ghcr.io/vshn/appcat:v4.118.3-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml index 18fe4322f..2a9a736cd 100644 --- a/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/defaults/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:fix_default_backup_retetion + image: ghcr.io/vshn/appcat:v4.118.3 livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 49bbf03bf..edbe612c7 100644 --- a/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -24,7 +24,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 env: [] - image: ghcr.io/vshn/appcat:fix_default_backup_retetion + image: ghcr.io/vshn/appcat:v4.118.3 livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/dev/appcat/appcat/10_function_appcat.yaml b/tests/golden/dev/appcat/appcat/10_function_appcat.yaml index 471abf230..8cd610988 100644 --- a/tests/golden/dev/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/dev/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:fix_default_backup_retetion-func + package: ghcr.io/vshn/appcat:v4.118.3-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/dev/appcat/appcat/20_xrd_vshn_keycloak.yaml b/tests/golden/dev/appcat/appcat/20_xrd_vshn_keycloak.yaml index c893a506a..6c24d5151 100644 --- a/tests/golden/dev/appcat/appcat/20_xrd_vshn_keycloak.yaml +++ b/tests/golden/dev/appcat/appcat/20_xrd_vshn_keycloak.yaml @@ -11903,7 +11903,7 @@ spec: type: default: Immediate description: |- - Type indicates the type of the UpdateStrategy. Default is OnRestart. + Type indicates the type of the UpdateStrategy. Default is Immediate. Possible enum values: - `"OnRestart"` indicates that the changes to the spec will only be applied once the instance is restarted by other means, most likely during maintenance. - `"Immediate"` indicates that update will be applied to the instance as soon as the spec changes. Please be aware that this might lead to short downtime. diff --git a/tests/golden/dev/appcat/appcat/20_xrd_vshn_nextcloud.yaml b/tests/golden/dev/appcat/appcat/20_xrd_vshn_nextcloud.yaml index 62ddbf48e..6efba8740 100644 --- a/tests/golden/dev/appcat/appcat/20_xrd_vshn_nextcloud.yaml +++ b/tests/golden/dev/appcat/appcat/20_xrd_vshn_nextcloud.yaml @@ -11889,7 +11889,7 @@ spec: type: default: Immediate description: |- - Type indicates the type of the UpdateStrategy. Default is OnRestart. + Type indicates the type of the UpdateStrategy. Default is Immediate. Possible enum values: - `"OnRestart"` indicates that the changes to the spec will only be applied once the instance is restarted by other means, most likely during maintenance. - `"Immediate"` indicates that update will be applied to the instance as soon as the spec changes. Please be aware that this might lead to short downtime. diff --git a/tests/golden/dev/appcat/appcat/20_xrd_vshn_postgres.yaml b/tests/golden/dev/appcat/appcat/20_xrd_vshn_postgres.yaml index 5f7f21e83..73e81b14a 100644 --- a/tests/golden/dev/appcat/appcat/20_xrd_vshn_postgres.yaml +++ b/tests/golden/dev/appcat/appcat/20_xrd_vshn_postgres.yaml @@ -5891,7 +5891,7 @@ spec: type: default: Immediate description: |- - Type indicates the type of the UpdateStrategy. Default is OnRestart. + Type indicates the type of the UpdateStrategy. Default is Immediate. Possible enum values: - `"OnRestart"` indicates that the changes to the spec will only be applied once the instance is restarted by other means, most likely during maintenance. - `"Immediate"` indicates that update will be applied to the instance as soon as the spec changes. Please be aware that this might lead to short downtime. diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_keycloak.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_keycloak.yaml index 1239729c0..c7dfb2c36 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_keycloak.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_keycloak.yaml @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: fix_default_backup_retetion + imageTag: v4.118.3 ingress_annotations: | nginx.ingress.kubernetes.io/backend-protocol: HTTPS cert-manager.io/cluster-issuer: letsencrypt-staging diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_mariadb.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_mariadb.yaml index 6211105d1..5c16d9af2 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_mariadb.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_mariadb.yaml @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: fix_default_backup_retetion + imageTag: v4.118.3 isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance mode: standalone diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_nextcloud.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_nextcloud.yaml index 830f98009..ac7d83106 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_nextcloud.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_nextcloud.yaml @@ -45,7 +45,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: fix_default_backup_retetion + imageTag: v4.118.3 ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-staging isOpenshift: 'false' diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_postgres.yaml index 54681053a..f08620c1d 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_postgres.yaml @@ -41,7 +41,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: fix_default_backup_retetion + imageTag: v4.118.3 initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m", "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile": {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m", diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_redis.yaml index 451fd96ca..923db39ff 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_redis.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_redis.yaml @@ -597,7 +597,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: fix_default_backup_retetion + imageTag: v4.118.3 isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance ownerGroup: vshn.appcat.vshn.io diff --git a/tests/golden/dev/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/dev/appcat/appcat/apiserver/30_deployment.yaml index 18fe4322f..2a9a736cd 100644 --- a/tests/golden/dev/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/dev/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:fix_default_backup_retetion + image: ghcr.io/vshn/appcat:v4.118.3 livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/dev/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/dev/appcat/appcat/controllers/appcat/30_deployment.yaml index d3df4507c..b5130d2fc 100644 --- a/tests/golden/dev/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/dev/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -23,7 +23,7 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat - image: ghcr.io/vshn/appcat:fix_default_backup_retetion + image: ghcr.io/vshn/appcat:v4.118.3 livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/dev/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/dev/appcat/appcat/sla_reporter/01_cronjob.yaml index 416070e0a..e6787f567 100644 --- a/tests/golden/dev/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/tests/golden/dev/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:fix_default_backup_retetion + image: ghcr.io/vshn/appcat:v4.118.3 name: sla-reporter resources: limits: diff --git a/tests/golden/dev/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/dev/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 49bbf03bf..edbe612c7 100644 --- a/tests/golden/dev/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/dev/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -24,7 +24,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 env: [] - image: ghcr.io/vshn/appcat:fix_default_backup_retetion + image: ghcr.io/vshn/appcat:v4.118.3 livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/service-cluster/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/service-cluster/appcat/appcat/controllers/appcat/30_deployment.yaml index b3f60e583..7110c05ac 100644 --- a/tests/golden/service-cluster/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/service-cluster/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -30,7 +30,7 @@ spec: secretKeyRef: key: kubeconfig name: controlclustercredentials - image: ghcr.io/vshn/appcat:fix_default_backup_retetion + image: ghcr.io/vshn/appcat:v4.118.3 livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/service-cluster/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/service-cluster/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 3f61a2297..188045770 100644 --- a/tests/golden/service-cluster/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/service-cluster/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -26,7 +26,7 @@ spec: env: - name: KUBECONFIG value: /.kube/config - image: ghcr.io/vshn/appcat:fix_default_backup_retetion + image: ghcr.io/vshn/appcat:v4.118.3 livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/vshn-cloud/appcat/appcat/10_function_appcat.yaml b/tests/golden/vshn-cloud/appcat/appcat/10_function_appcat.yaml index 471abf230..8cd610988 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/vshn-cloud/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:fix_default_backup_retetion-func + package: ghcr.io/vshn/appcat:v4.118.3-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_keycloak.yaml b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_keycloak.yaml index 589e55000..4a83d77cf 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_keycloak.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_keycloak.yaml @@ -11904,7 +11904,7 @@ spec: type: default: Immediate description: |- - Type indicates the type of the UpdateStrategy. Default is OnRestart. + Type indicates the type of the UpdateStrategy. Default is Immediate. Possible enum values: - `"OnRestart"` indicates that the changes to the spec will only be applied once the instance is restarted by other means, most likely during maintenance. - `"Immediate"` indicates that update will be applied to the instance as soon as the spec changes. Please be aware that this might lead to short downtime. diff --git a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_nextcloud.yaml b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_nextcloud.yaml index 7829a55a6..d6c652e94 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_nextcloud.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_nextcloud.yaml @@ -11890,7 +11890,7 @@ spec: type: default: Immediate description: |- - Type indicates the type of the UpdateStrategy. Default is OnRestart. + Type indicates the type of the UpdateStrategy. Default is Immediate. Possible enum values: - `"OnRestart"` indicates that the changes to the spec will only be applied once the instance is restarted by other means, most likely during maintenance. - `"Immediate"` indicates that update will be applied to the instance as soon as the spec changes. Please be aware that this might lead to short downtime. diff --git a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_postgres.yaml b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_postgres.yaml index 11650d5c4..e60dca0ed 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_postgres.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_postgres.yaml @@ -5893,7 +5893,7 @@ spec: type: default: Immediate description: |- - Type indicates the type of the UpdateStrategy. Default is OnRestart. + Type indicates the type of the UpdateStrategy. Default is Immediate. Possible enum values: - `"OnRestart"` indicates that the changes to the spec will only be applied once the instance is restarted by other means, most likely during maintenance. - `"Immediate"` indicates that update will be applied to the instance as soon as the spec changes. Please be aware that this might lead to short downtime. diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_keycloak.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_keycloak.yaml index be75703c5..793d0bbda 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_keycloak.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_keycloak.yaml @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: fix_default_backup_retetion + imageTag: v4.118.3 ingress_annotations: | nginx.ingress.kubernetes.io/backend-protocol: HTTPS cert-manager.io/cluster-issuer: letsencrypt-staging diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_mariadb.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_mariadb.yaml index 9b600d346..390e6a781 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_mariadb.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_mariadb.yaml @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: fix_default_backup_retetion + imageTag: v4.118.3 isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance mode: standalone diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_minio.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_minio.yaml index cc0346b7d..6b572f68f 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_minio.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_minio.yaml @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: fix_default_backup_retetion + imageTag: v4.118.3 isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance minioChartRepository: https://charts.min.io diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_nextcloud.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_nextcloud.yaml index b0de043c4..ffabdc294 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_nextcloud.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_nextcloud.yaml @@ -45,7 +45,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: fix_default_backup_retetion + imageTag: v4.118.3 ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-staging isOpenshift: 'true' diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgres.yaml index ced002d7d..99bf274c5 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgres.yaml @@ -41,7 +41,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: fix_default_backup_retetion + imageTag: v4.118.3 initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m", "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile": {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m", diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_redis.yaml index f467d92fe..6a990a6ba 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_redis.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_redis.yaml @@ -597,7 +597,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: fix_default_backup_retetion + imageTag: v4.118.3 isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance ownerGroup: vshn.appcat.vshn.io diff --git a/tests/golden/vshn-cloud/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/vshn-cloud/appcat/appcat/apiserver/30_deployment.yaml index 6db3a42e6..879ff5c0d 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/vshn-cloud/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:fix_default_backup_retetion + image: ghcr.io/vshn/appcat:v4.118.3 livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/vshn-cloud/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/vshn-cloud/appcat/appcat/controllers/appcat/30_deployment.yaml index d3df4507c..b5130d2fc 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -23,7 +23,7 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat - image: ghcr.io/vshn/appcat:fix_default_backup_retetion + image: ghcr.io/vshn/appcat:v4.118.3 livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/vshn-cloud/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/vshn-cloud/appcat/appcat/sla_reporter/01_cronjob.yaml index 416070e0a..e6787f567 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:fix_default_backup_retetion + image: ghcr.io/vshn/appcat:v4.118.3 name: sla-reporter resources: limits: diff --git a/tests/golden/vshn-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/vshn-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 49bbf03bf..edbe612c7 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -24,7 +24,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 env: [] - image: ghcr.io/vshn/appcat:fix_default_backup_retetion + image: ghcr.io/vshn/appcat:v4.118.3 livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/vshn-managed/appcat/appcat/10_function_appcat.yaml b/tests/golden/vshn-managed/appcat/appcat/10_function_appcat.yaml index 471abf230..8cd610988 100644 --- a/tests/golden/vshn-managed/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/vshn-managed/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:fix_default_backup_retetion-func + package: ghcr.io/vshn/appcat:v4.118.3-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_keycloak.yaml b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_keycloak.yaml index 589e55000..4a83d77cf 100644 --- a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_keycloak.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_keycloak.yaml @@ -11904,7 +11904,7 @@ spec: type: default: Immediate description: |- - Type indicates the type of the UpdateStrategy. Default is OnRestart. + Type indicates the type of the UpdateStrategy. Default is Immediate. Possible enum values: - `"OnRestart"` indicates that the changes to the spec will only be applied once the instance is restarted by other means, most likely during maintenance. - `"Immediate"` indicates that update will be applied to the instance as soon as the spec changes. Please be aware that this might lead to short downtime. diff --git a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_nextcloud.yaml b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_nextcloud.yaml index 7829a55a6..d6c652e94 100644 --- a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_nextcloud.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_nextcloud.yaml @@ -11890,7 +11890,7 @@ spec: type: default: Immediate description: |- - Type indicates the type of the UpdateStrategy. Default is OnRestart. + Type indicates the type of the UpdateStrategy. Default is Immediate. Possible enum values: - `"OnRestart"` indicates that the changes to the spec will only be applied once the instance is restarted by other means, most likely during maintenance. - `"Immediate"` indicates that update will be applied to the instance as soon as the spec changes. Please be aware that this might lead to short downtime. diff --git a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_postgres.yaml b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_postgres.yaml index 11650d5c4..e60dca0ed 100644 --- a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_postgres.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_postgres.yaml @@ -5893,7 +5893,7 @@ spec: type: default: Immediate description: |- - Type indicates the type of the UpdateStrategy. Default is OnRestart. + Type indicates the type of the UpdateStrategy. Default is Immediate. Possible enum values: - `"OnRestart"` indicates that the changes to the spec will only be applied once the instance is restarted by other means, most likely during maintenance. - `"Immediate"` indicates that update will be applied to the instance as soon as the spec changes. Please be aware that this might lead to short downtime. diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_keycloak.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_keycloak.yaml index 77813f604..3627a5c7c 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_keycloak.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_keycloak.yaml @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: fix_default_backup_retetion + imageTag: v4.118.3 ingress_annotations: | nginx.ingress.kubernetes.io/backend-protocol: HTTPS cert-manager.io/cluster-issuer: letsencrypt-staging diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_mariadb.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_mariadb.yaml index a3082e5ff..3806d295b 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_mariadb.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_mariadb.yaml @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: fix_default_backup_retetion + imageTag: v4.118.3 isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance mode: standalone diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_minio.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_minio.yaml index b3f450405..1044a676e 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_minio.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_minio.yaml @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: fix_default_backup_retetion + imageTag: v4.118.3 isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance minioChartRepository: https://charts.min.io diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_nextcloud.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_nextcloud.yaml index e893d17a9..1a5b0ebd4 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_nextcloud.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_nextcloud.yaml @@ -45,7 +45,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: fix_default_backup_retetion + imageTag: v4.118.3 ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-staging isOpenshift: 'true' diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgres.yaml index b578c4c7f..df8c109f8 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgres.yaml @@ -41,7 +41,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: fix_default_backup_retetion + imageTag: v4.118.3 initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m", "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile": {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m", diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_redis.yaml index 117505f7f..4fb12c722 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_redis.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_redis.yaml @@ -597,7 +597,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: fix_default_backup_retetion + imageTag: v4.118.3 isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance ownerGroup: vshn.appcat.vshn.io diff --git a/tests/golden/vshn-managed/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/vshn-managed/appcat/appcat/apiserver/30_deployment.yaml index 6db3a42e6..879ff5c0d 100644 --- a/tests/golden/vshn-managed/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/vshn-managed/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:fix_default_backup_retetion + image: ghcr.io/vshn/appcat:v4.118.3 livenessProbe: failureThreshold: 3 httpGet: diff --git a/tests/golden/vshn-managed/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/vshn-managed/appcat/appcat/controllers/appcat/30_deployment.yaml index d3df4507c..b5130d2fc 100644 --- a/tests/golden/vshn-managed/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -23,7 +23,7 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat - image: ghcr.io/vshn/appcat:fix_default_backup_retetion + image: ghcr.io/vshn/appcat:v4.118.3 livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/vshn-managed/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/vshn-managed/appcat/appcat/sla_reporter/01_cronjob.yaml index 416070e0a..e6787f567 100644 --- a/tests/golden/vshn-managed/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:fix_default_backup_retetion + image: ghcr.io/vshn/appcat:v4.118.3 name: sla-reporter resources: limits: diff --git a/tests/golden/vshn-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/vshn-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 49bbf03bf..edbe612c7 100644 --- a/tests/golden/vshn-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -24,7 +24,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 env: [] - image: ghcr.io/vshn/appcat:fix_default_backup_retetion + image: ghcr.io/vshn/appcat:v4.118.3 livenessProbe: httpGet: path: /healthz