added vacuum and repack

vshn · May 10, 2024 · ed37442 · ed37442
1 parent a917f64
commit ed37442
Show file tree

Hide file tree

Showing 49 changed files with 222 additions and 34 deletions.
diff --git a/component/class/defaults.yml b/component/class/defaults.yml
@@ -45,7 +45,7 @@ parameters:
       appcat:
         registry: ghcr.io
         repository: vshn/appcat
-        tag: v4.69.0
+        tag: vacuum_repack
       apiserver:
         registry: ghcr.io
         repository: vshn/appcat-apiserver

diff --git a/component/component/rbac_e2e.jsonnet b/component/component/rbac_e2e.jsonnet
@@ -41,6 +41,11 @@ local e2eClusterRole = kube.ClusterRole('appcat:e2e') + {
       resources: [ 'namespaces' ],
       verbs: [ 'delete' ],
     },
+    {
+      apiGroups: [ 'batch' ],
+      resources: [ 'jobs', 'cronjobs', 'jobs/finalizers', 'cronjobs/finalizers' ],
+      verbs: [ 'get', 'list', 'create', 'delete' ],
+    }
   ],
 };
 

diff --git a/component/component/vshn_services.jsonnet b/component/component/vshn_services.jsonnet
@@ -30,11 +30,13 @@ local maintenanceRole = kube.ClusterRole(maintenanceRoleName) {
   ],
 };
 
+
 local maintenanceClusterRoleBinding = kube.ClusterRoleBinding('crossplane:appcat:job:helm:maintenance') + {
   roleRef_: maintenanceRole,
   subjects_: [ maintenanceServiceAccount ],
 };
 
+
 if params.services.vshn.enabled then {
   '10_namespace_vshn_control': controlNamespace,
   '10_rbac_helm_service_maintenance_sa': maintenanceServiceAccount,

diff --git a/component/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.69.0-func
+  package: ghcr.io/vshn/appcat:vacuum_repack-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/...ent/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml b/...ent/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.69.0-func
+  package: ghcr.io/vshn/appcat:vacuum_repack-func
   runtimeConfigRef:
     name: function-appcat
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
@@ -36,7 +36,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_VSHNMARIADB
           value: "false"
-        image: ghcr.io/vshn/appcat:v4.69.0
+        image: ghcr.io/vshn/appcat:vacuum_repack
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/...t/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml b/...t/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.69.0-func
+  package: ghcr.io/vshn/appcat:vacuum_repack-func
   runtimeConfigRef:
     name: function-appcat
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
@@ -36,7 +36,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_VSHNMARIADB
           value: "false"
-        image: ghcr.io/vshn/appcat:v4.69.0
+        image: ghcr.io/vshn/appcat:vacuum_repack
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/component/tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.69.0-func
+  package: ghcr.io/vshn/appcat:vacuum_repack-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/component/tests/golden/controllers/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/controllers/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.69.0-func
+  package: ghcr.io/vshn/appcat:vacuum_repack-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/component/tests/golden/controllers/appcat/appcat/controllers/appcat/30_deployment.yaml b/component/tests/golden/controllers/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.69.0
+          image: ghcr.io/vshn/appcat:vacuum_repack
           livenessProbe:
             httpGet:
               path: /healthz

diff --git a/component/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.69.0-func
+  package: ghcr.io/vshn/appcat:vacuum_repack-func
   runtimeConfigRef:
     name: function-appcat
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
@@ -36,7 +36,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_VSHNMARIADB
           value: "false"
-        image: ghcr.io/vshn/appcat:v4.69.0
+        image: ghcr.io/vshn/appcat:vacuum_repack
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/...onent/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml b/...onent/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.69.0-func
+  package: ghcr.io/vshn/appcat:vacuum_repack-func
   runtimeConfigRef:
     name: function-appcat
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
@@ -36,7 +36,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_VSHNMARIADB
           value: "false"
-        image: ghcr.io/vshn/appcat:v4.69.0
+        image: ghcr.io/vshn/appcat:vacuum_repack
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/...ent/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml b/...ent/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.69.0-func
+  package: ghcr.io/vshn/appcat:vacuum_repack-func
   runtimeConfigRef:
     name: function-appcat
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
@@ -36,7 +36,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_VSHNMARIADB
           value: "false"
-        image: ghcr.io/vshn/appcat:v4.69.0
+        image: ghcr.io/vshn/appcat:vacuum_repack
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/component/tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.69.0-func
+  package: ghcr.io/vshn/appcat:vacuum_repack-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/component/tests/golden/minio/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/minio/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.69.0-func
+  package: ghcr.io/vshn/appcat:vacuum_repack-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/component/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml b/component/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml
@@ -28,7 +28,7 @@ spec:
         data:
           controlNamespace: syn-appcat-control
           defaultPlan: standard-1
-          imageTag: v4.69.0
+          imageTag: vacuum_repack
           isOpenshift: 'false'
           maintenanceSA: helm-based-service-maintenance
           minioChartRepository: https://charts.min.io

diff --git a/component/tests/golden/minio/appcat/appcat/controllers/appcat/30_deployment.yaml b/component/tests/golden/minio/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.69.0
+          image: ghcr.io/vshn/appcat:vacuum_repack
           livenessProbe:
             httpGet:
               path: /healthz

diff --git a/component/tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml b/component/tests/golden/minio/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.69.0
+              image: ghcr.io/vshn/appcat:vacuum_repack
               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
@@ -36,7 +36,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_VSHNMARIADB
           value: "false"
-        image: ghcr.io/vshn/appcat:v4.69.0
+        image: ghcr.io/vshn/appcat:vacuum_repack
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/component/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.69.0-func
+  package: ghcr.io/vshn/appcat:vacuum_repack-func
   runtimeConfigRef:
     name: function-appcat
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
@@ -36,7 +36,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_VSHNMARIADB
           value: "false"
-        image: ghcr.io/vshn/appcat:v4.69.0
+        image: ghcr.io/vshn/appcat:vacuum_repack
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/component/tests/golden/vshn/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/vshn/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.69.0-func
+  package: ghcr.io/vshn/appcat:vacuum_repack-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/component/tests/golden/vshn/appcat/appcat/20_xrd_vshn_keycloak.yaml b/component/tests/golden/vshn/appcat/appcat/20_xrd_vshn_keycloak.yaml
@@ -5647,6 +5647,11 @@ spec:
                                     settings.
                                   type: object
                                   x-kubernetes-preserve-unknown-fields: true
+                                repackEnabled:
+                                  default: true
+                                  description: This is default option if neither repack
+                                    or vacuum are selected
+                                  type: boolean
                                 serviceLevel:
                                   default: besteffort
                                   description: ServiceLevel defines the service level
@@ -5656,6 +5661,9 @@ spec:
                                     - besteffort
                                     - guaranteed
                                   type: string
+                                vacuumEnabled:
+                                  default: false
+                                  type: boolean
                               type: object
                             size:
                               description: Size contains settings to control the sizing

diff --git a/component/tests/golden/vshn/appcat/appcat/20_xrd_vshn_postgres.yaml b/component/tests/golden/vshn/appcat/appcat/20_xrd_vshn_postgres.yaml
@@ -5103,6 +5103,11 @@ spec:
                           description: PGSettings contains additional PostgreSQL settings.
                           type: object
                           x-kubernetes-preserve-unknown-fields: true
+                        repackEnabled:
+                          default: true
+                          description: This is default option if neither repack or
+                            vacuum are selected
+                          type: boolean
                         serviceLevel:
                           default: besteffort
                           description: ServiceLevel defines the service level of this
@@ -5112,6 +5117,9 @@ spec:
                             - besteffort
                             - guaranteed
                           type: string
+                        vacuumEnabled:
+                          default: false
+                          type: boolean
                       type: object
                     size:
                       default: {}

diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml
@@ -31,7 +31,7 @@ spec:
           chartRepository: https://codecentric.github.io/helm-charts
           chartVersion: 2.3.0
           controlNamespace: syn-appcat-control
-          imageTag: v4.69.0
+          imageTag: vacuum_repack
           ingress_annotations: |
             nginx.ingress.kubernetes.io/backend-protocol: HTTPS
             cert-manager.io/cluster-issuer: letsencrypt-staging

diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml
@@ -31,7 +31,7 @@ spec:
           chartRepository: https://charts.bitnami.com/bitnami
           chartVersion: 11.6.2
           controlNamespace: syn-appcat-control
-          imageTag: v4.69.0
+          imageTag: vacuum_repack
           isOpenshift: 'false'
           maintenanceSA: helm-based-service-maintenance
           ownerGroup: vshn.appcat.vshn.io

diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml
@@ -653,7 +653,7 @@ spec:
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
           externalDatabaseConnectionsEnabled: 'true'
-          imageTag: v4.69.0
+          imageTag: vacuum_repack
           isOpenshift: 'false'
           loadbalancerAnnotations: |
             foo: bar

diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml
@@ -755,7 +755,7 @@ spec:
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
           externalDatabaseConnectionsEnabled: 'true'
-          imageTag: v4.69.0
+          imageTag: vacuum_repack
           isOpenshift: 'false'
           loadbalancerAnnotations: |
             foo: bar

diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml
@@ -595,7 +595,7 @@ spec:
           emailAlertingSmtpFromAddress: [email protected]
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
-          imageTag: v4.69.0
+          imageTag: vacuum_repack
           isOpenshift: 'false'
           maintenanceSA: helm-based-service-maintenance
           ownerGroup: vshn.appcat.vshn.io

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

diff --git a/component/tests/golden/vshn/appcat/appcat/sla_reporter/01_cronjob.yaml b/component/tests/golden/vshn/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.69.0
+              image: ghcr.io/vshn/appcat:vacuum_repack
               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
@@ -36,7 +36,7 @@ spec:
           value: "true"
         - name: APPCAT_SLI_VSHNMARIADB
           value: "true"
-        image: ghcr.io/vshn/appcat:v4.69.0
+        image: ghcr.io/vshn/appcat:vacuum_repack
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/package/main.yaml b/package/main.yaml
@@ -7,7 +7,7 @@ parameters:
     image:
       registry: ghcr.io
       repository: vshn/appcat
-      tag: v4.69.0
+      tag: vacuum_repack
   components:
     appcat:
       url: https://github.com/vshn/component-appcat.git

diff --git a/tests/e2e/common/scripts/trigger-maintenance.sh b/tests/e2e/common/scripts/trigger-maintenance.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -e
+
+type="$1"
+name="$2"
+to_be_found="$3"
+
+ns=$(kubectl -n "$NAMESPACE" get "$type" "$name" -oyaml | yq -r '.status.instanceNamespace')
+
+kubectl -n "$ns" delete job --ignore-not-found=true --now=true vacuum databasesrepack
+kubectl -n "$ns" create job --from cronjob/maintenancejob test
+
+# wait until job is done
+kubectl -n "$ns" wait --for=condition=complete --timeout=240s job/test
+
+if [ "$to_be_found" == "r" ]; then
+  kubectl -n "$ns" get job
+  kubectl -n "$ns" get job databasesrepack
+elif [ "$to_be_found" == "v" ]; then
+  kubectl -n "$ns" get job
+  kubectl -n "$ns" get job vacuum
+elif [ "$to_be_found" == "b" ]; then
+  kubectl -n "$ns" get job
+  kubectl -n "$ns" get job databasesrepack
+  kubectl -n "$ns" get job vacuum
+else
+  echo "Invalid argument"
+  exit 1
+fi
diff --git a/tests/e2e/postgresql/00-assert.yaml b/tests/e2e/postgresql/00-assert.yaml
@@ -20,6 +20,8 @@ spec:
         retention: 6
     instances: 1
     service:
+      vacuumEnabled: true
+      repackEnabled: true
       majorVersion: "15"
       serviceLevel: besteffort
     size: