chore: remove unnecessary cleanup steps from kuttl tests (#6771)

Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>

test/conformance/kuttl/verifyImages/clusterpolicy/cornercases/multiple-attestors/99-cleanup.yaml

@@ -1,4 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - command: kubectl delete -f 01-policy.yaml,02-pod.yaml --force --wait=true --ignore-not-found=true

test/conformance/kuttl/verifyImages/clusterpolicy/standard/configmap-context-lookup/99-cleanup.yaml

@@ -1,4 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - command: kubectl delete -f 01-manifests.yaml --force --wait=true --ignore-not-found=true

test/conformance/kuttl/verifyImages/clusterpolicy/standard/imageExtractors-complex/02-create-task.yaml

@@ -1,14 +1,5 @@
-## Checks that the manifests.yaml file CANNOT be successfully created. If it can, fail the test as this is incorrect.
-
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
-commands:
-- script: |
-    if kubectl apply -f badtask.yaml
-    then 
-      echo "Tested failed. Task was created when it shouldn't have been."
-      exit 1 
-    else 
-      echo "Test succeeded. Task was not created as intended."
-      exit 0
-    fi
+apply:
+- file: badtask.yaml
+  shouldFail: true

test/conformance/kuttl/verifyImages/clusterpolicy/standard/imageExtractors-simple/02-create-task.yaml

@@ -1,14 +1,5 @@
-## Checks that the manifests.yaml file CANNOT be successfully created. If it can, fail the test as this is incorrect.
-
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
-commands:
-- script: |
-    if kubectl apply -f badtask.yaml
-    then 
-      echo "Tested failed. Task was created when it shouldn't have been."
-      exit 1 
-    else 
-      echo "Test succeeded. Task was not created as intended."
-      exit 0
-    fi
+apply:
+- file: badtask.yaml
+  shouldFail: true

test/conformance/kuttl/verifyImages/clusterpolicy/standard/keyed-basic/99-cleanup.yaml

@@ -1,4 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - command: kubectl delete -f 01-manifests.yaml,02-goodpod.yaml --force --wait=true --ignore-not-found=true

test/conformance/kuttl/verifyImages/clusterpolicy/standard/keyed-secret/99-cleanup.yaml

@@ -1,4 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - command: kubectl delete -f 01-manifests.yaml,02-goodpod.yaml --force --wait=true --ignore-not-found=true

test/conformance/kuttl/verifyImages/clusterpolicy/standard/keyless-attestations-multiple-subjects-1/99-cleanup.yaml

@@ -1,4 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - command: kubectl delete -f 01-manifests.yaml,02-pod.yaml --force --wait=true --ignore-not-found=true

test/conformance/kuttl/verifyImages/clusterpolicy/standard/keyless-attestations-multiple-subjects-2/99-cleanup.yaml

@@ -1,4 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - command: kubectl delete -f 01-manifests.yaml,02-pod.yaml --force --wait=true --ignore-not-found=true

test/conformance/kuttl/verifyImages/clusterpolicy/standard/keyless-attestations-multiple-subjects-3/02-pod.yaml

@@ -0,0 +1,5 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+apply:
+- file: pod.yaml
+  shouldFail: true

test/conformance/kuttl/verifyImages/clusterpolicy/standard/keyless-attestations-multiple-subjects-3/02-script.yaml

@@ -1,14 +0,0 @@
-## Checks that the manifests.yaml file CANNOT be successfully created. If it can, fail the test as this is incorrect.
-
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-- script: |
-    if kubectl apply -f pod.yaml
-    then 
-      echo "Tested failed. Resource was allowed."
-      exit 1 
-    else 
-      echo "Test succeeded. Resource was blocked."
-      exit 0
-    fi

test/conformance/kuttl/verifyImages/clusterpolicy/standard/keyless-attestations-multiple-subjects-3/99-cleanup.yaml

@@ -1,4 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - command: kubectl delete -f 01-manifests.yaml --force --wait=true --ignore-not-found=true

test/conformance/kuttl/verifyImages/clusterpolicy/standard/keyless-attestations-multiple-subjects-4/99-cleanup.yaml

@@ -1,4 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - command: kubectl delete -f 01-manifests.yaml,02-pod.yaml --force --wait=true --ignore-not-found=true

test/conformance/kuttl/verifyImages/clusterpolicy/standard/keyless-attestations-multiple-subjects-counts-1/99-cleanup.yaml

@@ -1,4 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - command: kubectl delete -f 01-manifests.yaml,02-pod.yaml --force --wait=true --ignore-not-found=true

test/conformance/kuttl/verifyImages/clusterpolicy/standard/keyless-attestations-multiple-subjects-counts-2/02-pod.yaml

@@ -0,0 +1,5 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+apply:
+- file: pod.yaml
+  shouldFail: true

test/conformance/kuttl/verifyImages/clusterpolicy/standard/keyless-attestations-multiple-subjects-counts-2/02-script.yaml

@@ -1,14 +0,0 @@
-## Checks that the manifests.yaml file CANNOT be successfully created. If it can, fail the test as this is incorrect.
-
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-- script: |
-    if kubectl apply -f pod.yaml
-    then 
-      echo "Tested failed. Resource was allowed."
-      exit 1 
-    else 
-      echo "Test succeeded. Resource was blocked."
-      exit 0
-    fi

test/conformance/kuttl/verifyImages/clusterpolicy/standard/keyless-attestations-multiple-subjects-counts-2/99-cleanup.yaml

@@ -1,4 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - command: kubectl delete -f 01-manifests.yaml --force --wait=true --ignore-not-found=true

test/conformance/kuttl/verifyImages/clusterpolicy/standard/keyless-attestations-multiple-subjects-counts-3/02-pod.yaml

@@ -0,0 +1,5 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+apply:
+- file: pod.yaml
+  shouldFail: true

test/conformance/kuttl/verifyImages/clusterpolicy/standard/keyless-attestations-multiple-subjects-counts-3/02-script.yaml

@@ -1,14 +0,0 @@
-## Checks that the manifests.yaml file CANNOT be successfully created. If it can, fail the test as this is incorrect.
-
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-- script: |
-    if kubectl apply -f pod.yaml
-    then 
-      echo "Tested failed. Resource was allowed."
-      exit 1 
-    else 
-      echo "Test succeeded. Resource was blocked."
-      exit 0
-    fi

test/conformance/kuttl/verifyImages/clusterpolicy/standard/keyless-attestations-multiple-subjects-counts-3/99-cleanup.yaml

@@ -1,4 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - command: kubectl delete -f 01-manifests.yaml --force --wait=true --ignore-not-found=true

test/conformance/kuttl/verifyImages/clusterpolicy/standard/keyless-mutatedigest-verifydigest-required/99-cleanup.yaml

@@ -1,4 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - command: kubectl delete -f 01-manifests.yaml,02-pod.yaml --force --wait=true --ignore-not-found=true

test/conformance/kuttl/verifyImages/clusterpolicy/standard/keyless-nomutatedigest-noverifydigest-norequired/99-cleanup.yaml

@@ -1,4 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - command: kubectl delete -f 01-manifests.yaml,02-pod.yaml --force --wait=true --ignore-not-found=true

test/conformance/kuttl/verifyImages/clusterpolicy/standard/keyless-nomutatedigest-noverifydigest-required/99-cleanup.yaml

@@ -1,4 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - command: kubectl delete -f 01-manifests.yaml,02-pod.yaml --force --wait=true --ignore-not-found=true

test/conformance/kuttl/verifyImages/clusterpolicy/standard/mutateDigest-noverifyDigest-norequired/99-cleanup.yaml

@@ -1,4 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - command: kubectl delete -f 01-manifests.yaml,02-pod.yaml --force --wait=true --ignore-not-found=true

test/conformance/kuttl/verifyImages/clusterpolicy/standard/mutateDigest-noverifyDigest-norequired/errors.yaml

@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: testingsecret
-  namespace: default
-  labels:
-    foo: bar

test/conformance/kuttl/verifyImages/clusterpolicy/standard/mutateDigest-noverifyDigest-norequired/resource.yaml

@@ -1,8 +0,0 @@
-apiVersion: v1
-data:
-  foo: YmFy
-kind: Secret
-metadata:
-  name: testingsecret
-  namespace: default
-type: Opaque

test/conformance/kuttl/verifyImages/clusterpolicy/standard/mutateDigest-noverifyDigest-norequired/script-check-for-error.yaml

@@ -1,14 +0,0 @@
-## Checks that the manifests.yaml file CANNOT be successfully created. If it can, fail the test as this is incorrect.
-
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-- script: |
-    if kubectl apply -f manifests.yaml
-    then 
-      echo "Tested failed. Policy was created when it shouldn't have been."
-      exit 1 
-    else 
-      echo "Test succeeded. Policy was not created as intended."
-      exit 0
-    fi

test/conformance/kuttl/verifyImages/clusterpolicy/standard/noconfigmap-diffimage-success/03-create-bad-pod.yaml

@@ -1,12 +1,5 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
-commands:
-- script: |
-    if kubectl apply -f bad-pod.yaml
-    then 
-      echo "Tested failed. Pod was created when it shouldn't have been."
-      exit 1 
-    else 
-      echo "Test succeeded. Pod was not created as intended."
-      exit 0
-    fi
+apply:
+- file: bad-pod.yaml
+  shouldFail: true

test/conformance/kuttl/verifyImages/clusterpolicy/standard/noconfigmap-diffimage-success/99-cleanup.yaml

@@ -1,4 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - command: kubectl delete -f policy.yaml,good-pod.yaml,pod-with-configmap.yaml,namespace.yaml --force --wait=true --ignore-not-found=true

test/conformance/kuttl/verifyImages/clusterpolicy/standard/nomutateDigest-verifyDigest-norequired/04-create-badpod.yaml

@@ -2,13 +2,6 @@
 
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
-commands:
-- script: |
-    if kubectl apply -f badpod.yaml
-    then 
-      echo "Tested failed. Bad pod was created when it shouldn't have been."
-      exit 1 
-    else 
-      echo "Test succeeded. Bad pod was not created as intended."
-      exit 0
-    fi
+apply:
+- file: badpod.yaml
+  shouldFail: true

test/conformance/kuttl/verifyImages/clusterpolicy/standard/nomutateDigest-verifyDigest-norequired/99-cleanup.yaml

@@ -1,4 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - command: kubectl delete -f 01-manifests.yaml,02-goodpod.yaml --force --wait=true --ignore-not-found=true

test/conformance/kuttl/verifyImages/clusterpolicy/standard/nomutateDigest-verifyDigest-norequired/errors.yaml

@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: testingsecret
-  namespace: default
-  labels:
-    foo: bar