Merge branch 'main' into main

.chainsaw.yaml

@@ -10,4 +10,5 @@ spec:
     cleanup: 5m0s
     delete: 5m0s
     error: 5m0s
-    apply: 10s
+    apply: 15s
+    exec: 15s

tests/e2e-openshift/Dockerfile

@@ -26,7 +26,7 @@ RUN curl -LO https://github.com/kudobuilder/kuttl/releases/download/v0.15.0/kube
     && mv kubectl-kuttl_0.15.0_linux_x86_64 /usr/local/bin/kuttl
 
 # Install Chainsaw e2e
-RUN go install github.com/kyverno/[email protected].6
+RUN go install github.com/kyverno/[email protected].7
 
 # Install kubectl and oc
 RUN curl -LO https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/latest/openshift-client-linux.tar.gz \

tests/e2e-openshift/kafka/chainsaw-test.yaml

@@ -39,4 +39,5 @@ spec:
   - name: step-05
     try:
     - script:
-        content: ./check_traces.sh
+        timeout: 2m
+        content: ./check_traces.sh

tests/e2e-openshift/monitoring/chainsaw-test.yaml

@@ -5,6 +5,8 @@ metadata:
   creationTimestamp: null
   name: monitoring
 spec:
+  # Avoid running this test case in parallel to prevent the deletion of shared resources used by multiple tests, specifically in the context of OpenShift user workload monitoring.
+  concurrent: false
   steps:
   - name: step-00
     try:
@@ -32,4 +34,4 @@ spec:
         file: 03-assert.yaml
     - script:
         timeout: 5m
-        content: ./check_metrics.sh
+        content: ./check_metrics.sh

tests/e2e-openshift/multi-cluster/chainsaw-test.yaml

@@ -21,6 +21,7 @@ spec:
   - name: step-02
     try:
     - script:
+        timeout: 60s
         content: ./generate_certs.sh
     - apply:
         file: 02-otlp-receiver.yaml

tests/e2e-openshift/otlp-metrics-traces/chainsaw-test.yaml

@@ -5,6 +5,8 @@ metadata:
   creationTimestamp: null
   name: otlp-metrics-traces
 spec:
+  # Avoid running this test case in parallel to prevent the deletion of shared resources used by multiple tests, specifically in the context of OpenShift user workload monitoring.
+  concurrent: false
   steps:
   - name: step-00
     try:

tests/e2e-openshift/route/chainsaw-test.yaml

@@ -15,6 +15,7 @@ spec:
   - name: step-01
     try:
     - script:
+        timeout: 3m
         content: |
           #!/bin/bash
           set -ex

tests/e2e/ingress/chainsaw-test.yaml

@@ -4,13 +4,6 @@ kind: Test
 metadata:
   name: ingress
 spec:
-  skip: false
-  concurrent: false
-  skipDelete: false
-  timeouts:
-    apply: 10s
-    assert: 10s
-    error: 10s
   steps:
     - name: step-00
       try: