Make e2e more robust

Some of the statusfields in the status object will never actually become true, even thought the instance comes up correctly.

These status fields are deprecated and we have proper replacements for them. However Redis hasn't yet been migrated to comp functions.

So for now we don't assert these fields anymore to make sure the e2e tests work again.

Other changes:
- Make sure to remove any old claims before running
- Leave more spaces between the test names, so we don't have to rename all if we want to add one in between
- Make maintenance script sturdier

tests/e2e/keycloak/00-install.yaml

@@ -6,5 +6,7 @@ spec:
   parameters:
     service:
       fqdn: keycloak-e2e.example.com
+    security:
+      deletionProtection: false
   writeConnectionSecretToRef:
     name: keycloak-e2e

tests/e2e/keycloak/01-delete.yaml

@@ -0,0 +1,14 @@
+# Remove any leftover objects
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+delete:
+  - apiVersion: vshn.appcat.vshn.io/v1
+    kind: VSHNKeycloak
+    name: keycloak-e2e
+  - apiVersion: batch/v1
+    kind: Job
+    name: connect-keycloak-e2e
+  - apiVersion: v1
+    kind: Pod
+    labels:
+      e2e-test: keycloak-e2e

tests/e2e/keycloak/10-install.yaml

@@ -0,0 +1,10 @@
+apiVersion: vshn.appcat.vshn.io/v1
+kind: VSHNKeycloak
+metadata:
+  name: keycloak-e2e
+spec:
+  parameters:
+    service:
+      fqdn: keycloak-e2e.example.com
+  writeConnectionSecretToRef:
+    name: keycloak-e2e

tests/e2e/kuttl-test.yaml

@@ -3,4 +3,4 @@ kind: TestSuite
 testDirs:
   - ./test/e2e/
 namespace: appcat-e2e
-parallel: 1
+parallel: 2

tests/e2e/mariadb/00-install.yaml

@@ -4,7 +4,9 @@ metadata:
   name: mariadb-e2e
 spec:
   parameters:
-    service:
+    instances: 3
+    security:
+      deletionProtection: false
     size:
       plan: standard-2
   writeConnectionSecretToRef:

tests/e2e/mariadb/01-delete.yaml

@@ -0,0 +1,14 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+delete:
+  # This will wait until resources are really gone
+  - apiVersion: batch/v1
+    kind: Job
+    name: connect-mariadb
+  - apiVersion: v1
+    kind: Pod
+    labels:
+      e2e-test: mariadb
+  - apiVersion: vshn.appcat.vshn.io/v1
+    kind: VSHNMariaDB
+    name: mariadb-e2e

tests/e2e/mariadb/10-install.yaml

@@ -0,0 +1,11 @@
+apiVersion: vshn.appcat.vshn.io/v1
+kind: VSHNMariaDB
+metadata:
+  name: mariadb-e2e
+spec:
+  parameters:
+    service:
+    size:
+      plan: standard-2
+  writeConnectionSecretToRef:
+    name: mariadb-creds

tests/e2e/nextcloud/00-install.yaml

@@ -7,5 +7,7 @@ spec:
     service:
       fqdn:
         - nextcloud-e2e.example.com
+    security:
+      deletionProtection: false
   writeConnectionSecretToRef:
     name: nextcloud-e2e

tests/e2e/nextcloud/01-delete.yaml

@@ -0,0 +1,13 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+delete:
+  - apiVersion: vshn.appcat.vshn.io/v1
+    kind: VSHNNextcloud
+    name: nextcloud-e2e
+  - apiVersion: batch/v1
+    kind: Job
+    name: connect-nextcloud-e2e
+  - apiVersion: v1
+    kind: Pod
+    labels:
+      e2e-test: nextcloud-e2e

tests/e2e/nextcloud/10-install.yaml

@@ -0,0 +1,11 @@
+apiVersion: vshn.appcat.vshn.io/v1
+kind: VSHNNextcloud
+metadata:
+  name: nextcloud-e2e
+spec:
+  parameters:
+    service:
+      fqdn:
+        - nextcloud-e2e.example.com
+  writeConnectionSecretToRef:
+    name: nextcloud-e2e

tests/e2e/postgresql/00-install.yaml

@@ -4,6 +4,8 @@ metadata:
   name: postgresql-e2e-test
 spec:
   parameters:
+    security:
+      deletionProtection: false
     service:
       vacuumEnabled: true
       repackEnabled: true

tests/e2e/postgresql/03-install.yaml → tests/e2e/postgresql/10-install.yaml

@@ -4,10 +4,10 @@ metadata:
   name: postgresql-e2e-test
 spec:
   parameters:
-    size:
-      plan: standard-2
     service:
       vacuumEnabled: true
       repackEnabled: true
+    size:
+      plan: standard-2
   writeConnectionSecretToRef:
     name: postgresql-e2e-test-creds

tests/e2e/postgresql/03-assert.yaml → tests/e2e/postgresql/80-assert.yaml.yaml

@@ -19,10 +19,10 @@ spec:
       retention: 6
     instances: 1
     security:
-      deletionProtection: true
+      deletionProtection: false
     service:
       vacuumEnabled: true
-      repackEnabled: true
+      repackEnabled: false
       majorVersion: "15"
       serviceLevel: besteffort
     size:

tests/e2e/postgresql/80-install.yaml

@@ -0,0 +1,15 @@
+apiVersion: vshn.appcat.vshn.io/v1
+kind: VSHNPostgreSQL
+metadata:
+  name: postgresql-e2e-test
+spec:
+  parameters:
+    size:
+      plan: standard-2
+    security:
+      deletionProtection: false
+    service:
+      vacuumEnabled: true
+      repackEnabled: false
+  writeConnectionSecretToRef:
+    name: postgresql-e2e-test-creds

tests/e2e/postgresql/999-delete.yaml

@@ -0,0 +1,14 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+delete:
+  # This will wait until resources are really gone
+  - apiVersion: batch/v1
+    kind: Job
+    name: connect-postgresql
+  - apiVersion: v1
+    kind: Pod
+    labels:
+      e2e-test: postgresql
+  - apiVersion: vshn.appcat.vshn.io/v1
+    kind: VSHNPostgreSQL
+    name: postgresql-e2e-test

tests/e2e/postgresql/scripts/trigger-maintenance.sh

@@ -57,16 +57,16 @@ kubectl -n "$ns" wait --for=condition=complete --timeout=1000s job/test
 # I have to wait for job/jobs completion otherwise stackgres will recreate that even if I delete it...
 if [ "$to_be_found" == "r" ]; then
   kubectl -n "$ns" get job
-  kubectl -n "$ns" get job databasesrepack
+  kubectl -n "$ns" wait --for=create job/databasesrepack
   kubectl -n "$ns" wait --for=condition=complete --timeout=1000s job/databasesrepack
 elif [ "$to_be_found" == "v" ]; then
   kubectl -n "$ns" get job
-  kubectl -n "$ns" get job vacuum
+  kubectl -n "$ns" wait --for=create job/vacuum
   kubectl -n "$ns" wait --for=condition=complete --timeout=1000s 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
+  kubectl -n "$ns" wait --for=create job/databasesrepack
+  kubectl -n "$ns" wait --for=create job/vacuum
   kubectl -n "$ns" wait --for=condition=complete --timeout=1000s job/databasesrepack
   kubectl -n "$ns" wait --for=condition=complete --timeout=1000s job/vacuum
 else

tests/e2e/redis/00-install.yaml

@@ -4,6 +4,8 @@ metadata:
   name: redis-e2e-test
 spec:
   parameters:
+    security:
+      deletionProtection: false
     size:
       plan: standard-2
   writeConnectionSecretToRef:

tests/e2e/redis/01-delete.yaml

@@ -0,0 +1,14 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+delete:
+  # This will wait until resources are really gone
+  - apiVersion: batch/v1
+    kind: Job
+    name: connect-redis
+  - apiVersion: v1
+    kind: Pod
+    labels:
+      e2e-test: redis
+  - apiVersion: vshn.appcat.vshn.io/v1
+    kind: VSHNRedis
+    name: redis-e2e-test

tests/e2e/redis/00-assert.yaml → tests/e2e/redis/10-assert.yaml

@@ -33,24 +33,9 @@ spec:
   writeConnectionSecretToRef:
     name: redis-e2e-test-creds
 status:
-  caCertificateConditions:
-  - status: "True"
-  - status: "True"
-  clientCertificateConditions:
-  - status: "True"
-  - status: "True"
   conditions:
   - status: "True"
   - status: "True"
-  localCAConditions:
-  - status: "True"
-  - status: "True"
-  selfSignedIssuerConditions:
-  - status: "True"
-  - status: "True"
-  serverCertificateConditions:
-  - status: "True"
-  - status: "True"
 
 ---
 apiVersion: v1

tests/e2e/redis/10-install.yaml

@@ -0,0 +1,10 @@
+apiVersion: vshn.appcat.vshn.io/v1
+kind: VSHNRedis
+metadata:
+  name: redis-e2e-test
+spec:
+  parameters:
+    size:
+      plan: standard-2
+  writeConnectionSecretToRef:
+    name: redis-e2e-test-creds

tests/e2e/redis/04-assert.yaml → tests/e2e/redis/50-assert.yaml

@@ -33,24 +33,9 @@ spec:
   writeConnectionSecretToRef:
     name: redis-e2e-test-creds
 status:
-  caCertificateConditions:
-  - status: "True"
-  - status: "True"
-  clientCertificateConditions:
-  - status: "True"
-  - status: "True"
   conditions:
   - status: "True"
   - status: "True"
-  localCAConditions:
-  - status: "True"
-  - status: "True"
-  selfSignedIssuerConditions:
-  - status: "True"
-  - status: "True"
-  serverCertificateConditions:
-  - status: "True"
-  - status: "True"
 
 ---
 apiVersion: v1

tests/golden/dev/appcat/appcat/21_composition_vshn_keycloak.yaml

@@ -55,8 +55,8 @@ spec:
             "enabled": true, "memory": "4Gi"}}, "standard-8": {"size": {"cpu": "2",
             "disk": "16Gi", "enabled": true, "memory": "8Gi"}}}'
           quotasEnabled: 'false'
-          registry_password: ''
-          registry_username: ''
+          registry_password: HrssRli0X64b7ADvwEap
+          registry_username: ext-vshn-keycloak
           restoreSA: keycloakserviceaccount
           salesOrder: ''
           serviceName: keycloak