Merge pull request #1102 from vshn/fix/e2e_test

Fix daily E2E tests

Author: Kidswiss

component/rbac_testing.jsonnet

@@ -81,6 +81,11 @@ local e2eClusterRole = kube.ClusterRole('appcat:e2e') + {
       resources: [ 'clusters' ],
       verbs: [ 'get', 'list' ],
     },
+    {
+      apiGroups: [ 'postgresql.cnpg.io' ],
+      resources: [ 'backups' ],
+      verbs: [ 'get', 'list', 'create', 'delete' ],
+    },
   ],
 };
 

tests/dev.yml

@@ -31,14 +31,12 @@ parameters:
     charts:
       crossplane:
         version: 2.1.3
-
-      # garage:
-      #   source: oci://registry.kube-system.svc.cluster.local:5000/vshngaragecluster/vshngaragecluster
-      #   version: 0.0.0
-      # garageBucket:
-      #   source: oci://registry.kube-system.svc.cluster.local:5000/vshngaragebucket/vshngaragebucket
-      #   version: 0.0.0
-
+        # garage:
+        #   source: oci://registry.kube-system.svc.cluster.local:5000/vshngaragecluster/vshngaragecluster
+        #   version: 0.0.0
+        # garageBucket:
+        #   source: oci://registry.kube-system.svc.cluster.local:5000/vshngaragebucket/vshngaragebucket
+        #   version: 0.0.0
     garageOperator:
       enabled: true
 

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

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

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

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

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

@@ -149,6 +149,15 @@ rules:
     verbs:
       - get
       - list
+  - apiGroups:
+      - postgresql.cnpg.io
+    resources:
+      - backups
+    verbs:
+      - get
+      - list
+      - create
+      - delete
 ---
 apiVersion: v1
 data: {}

tests/golden/dev/appcat/appcat/20_rbac_vshn_e2e_tests.yaml

@@ -149,6 +149,15 @@ rules:
     verbs:
       - get
       - list
+  - apiGroups:
+      - postgresql.cnpg.io
+    resources:
+      - backups
+    verbs:
+      - get
+      - list
+      - create
+      - delete
 ---
 apiVersion: v1
 data: {}

tests/golden/service-cluster/appcat/appcat/20_rbac_vshn_e2e_tests.yaml

@@ -149,6 +149,15 @@ rules:
     verbs:
       - get
       - list
+  - apiGroups:
+      - postgresql.cnpg.io
+    resources:
+      - backups
+    verbs:
+      - get
+      - list
+      - create
+      - delete
 ---
 apiVersion: v1
 data: {}