Merge pull request #575 from vshn/appcat/284/fix/default_backup_retetion

Make sure backup retention is properly defaulted
vshn · Dec 20, 2024 · b790fa3 · b790fa3
2 parents 923fb7f + 71bb551
commit b790fa3
Show file tree

Hide file tree

Showing 74 changed files with 88 additions and 58 deletions.
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -55,7 +55,7 @@ parameters:
       appcat:
         registry: ghcr.io
         repository: vshn/appcat
-        tag: v4.118.2
+        tag: v4.118.3
       functionAppcat:
         registry: ${appcat:images:appcat:registry}
         repository: ${appcat:images:appcat:repository}

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -14,7 +14,9 @@ spec:
     name: vshnredis.vshn.appcat.vshn.io
   compositionUpdatePolicy: Automatic
   parameters:
-    backup: {}
+    backup:
+      retention:
+        keepDaily: 6
     security:
       deletionProtection: false
     service:

diff --git 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.118.2-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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -40,7 +40,7 @@ spec:
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
           ignoreNamespaceForBilling: vshn-test
-          imageTag: v4.118.2
+          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
@@ -40,7 +40,7 @@ spec:
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
           ignoreNamespaceForBilling: vshn-test
-          imageTag: v4.118.2
+          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
@@ -45,7 +45,7 @@ spec:
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
           ignoreNamespaceForBilling: vshn-test
-          imageTag: v4.118.2
+          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
@@ -41,7 +41,7 @@ spec:
           emailAlertingSmtpUsername: [email protected]
           externalDatabaseConnectionsEnabled: 'true'
           ignoreNamespaceForBilling: vshn-test
-          imageTag: v4.118.2
+          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
@@ -597,7 +597,7 @@ spec:
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
           ignoreNamespaceForBilling: vshn-test
-          imageTag: v4.118.2
+          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
@@ -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.118.2
+          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
@@ -23,7 +23,7 @@ spec:
           env:
             - name: PLANS_NAMESPACE
               value: syn-appcat
-          image: ghcr.io/vshn/appcat:v4.118.2
+          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
@@ -30,7 +30,7 @@ spec:
               envFrom:
                 - secretRef:
                     name: appcat-sla-reports-creds
-              image: ghcr.io/vshn/appcat:v4.118.2
+              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
@@ -6,6 +6,6 @@ metadata:
     argocd.argoproj.io/sync-wave: '-40'
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.118.2-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
@@ -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.118.2
+          image: ghcr.io/vshn/appcat:v4.118.3
           livenessProbe:
             failureThreshold: 3
             httpGet:

diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../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.118.2
+          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
@@ -6,6 +6,6 @@ metadata:
     argocd.argoproj.io/sync-wave: '-40'
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.118.2-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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -40,7 +40,7 @@ spec:
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
           ignoreNamespaceForBilling: vshn-test
-          imageTag: v4.118.2
+          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
@@ -40,7 +40,7 @@ spec:
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
           ignoreNamespaceForBilling: vshn-test
-          imageTag: v4.118.2
+          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
@@ -45,7 +45,7 @@ spec:
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
           ignoreNamespaceForBilling: vshn-test
-          imageTag: v4.118.2
+          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
@@ -41,7 +41,7 @@ spec:
           emailAlertingSmtpUsername: [email protected]
           externalDatabaseConnectionsEnabled: 'true'
           ignoreNamespaceForBilling: vshn-test
-          imageTag: v4.118.2
+          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
@@ -597,7 +597,7 @@ spec:
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
           ignoreNamespaceForBilling: vshn-test
-          imageTag: v4.118.2
+          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
@@ -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.118.2
+          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
@@ -23,7 +23,7 @@ spec:
           env:
             - name: PLANS_NAMESPACE
               value: syn-appcat
-          image: ghcr.io/vshn/appcat:v4.118.2
+          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
@@ -30,7 +30,7 @@ spec:
               envFrom:
                 - secretRef:
                     name: appcat-sla-reports-creds
-              image: ghcr.io/vshn/appcat:v4.118.2
+              image: ghcr.io/vshn/appcat:v4.118.3
               name: sla-reporter
               resources:
                 limits:

diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../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.118.2
+          image: ghcr.io/vshn/appcat:v4.118.3
           livenessProbe:
             httpGet:
               path: /healthz

diff --git a/tests/golden/exodev/appcat/appcat/10_function_appcat.yaml b/tests/golden/exodev/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.118.2-func
+  package: ghcr.io/vshn/appcat:v4.118.3-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/tests/golden/exodev/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/exodev/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.118.2
+          image: ghcr.io/vshn/appcat:v4.118.3
           livenessProbe:
             failureThreshold: 3
             httpGet:

diff --git a/tests/golden/exodev/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/exodev/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.118.2
+          image: ghcr.io/vshn/appcat:v4.118.3
           livenessProbe:
             httpGet:
               path: /healthz

diff --git a/tests/golden/exodev/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/exodev/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.118.2
+              image: ghcr.io/vshn/appcat:v4.118.3
               name: sla-reporter
               resources:
                 limits:

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
@@ -30,7 +30,7 @@ spec:
               secretKeyRef:
                 key: kubeconfig
                 name: controlclustercredentials
-          image: ghcr.io/vshn/appcat:v4.118.2
+          image: ghcr.io/vshn/appcat:v4.118.3
           livenessProbe:
             httpGet:
               path: /healthz

diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../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.118.2
+          image: ghcr.io/vshn/appcat:v4.118.3
           livenessProbe:
             httpGet:
               path: /healthz