chore: use more chainsaw step templates (#11313) (#11316)

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

test/conformance/chainsaw/mutate/cascading/first-rule-is-foreach/chainsaw-test.yaml

@@ -4,12 +4,20 @@ metadata:
   name: first-rule-is-foreach
 spec:
   steps:
-  - name: step-01
-    try:
-    - apply:
-        file: policy.yaml
-    - assert:
-        file: policy-assert.yaml
+  - name: create policy
+    use:
+      template: ../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: mutate-chain
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/mutate/cascading/first-rule-is-foreach/policy-assert.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: mutate-chain
-status:
-  conditions:
-  - reason: Succeeded
-    status: 'True'
-    type: Ready

test/conformance/chainsaw/mutate/cascading/no-foreach/chainsaw-test.yaml

@@ -4,12 +4,20 @@ metadata:
   name: no-foreach
 spec:
   steps:
-  - name: step-01
-    try:
-    - apply:
-        file: policy.yaml
-    - assert:
-        file: policy-assert.yaml
+  - name: create policy
+    use:
+      template: ../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: mutate-chain
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/mutate/cascading/no-foreach/policy-assert.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: mutate-chain
-status:
-  conditions:
-  - reason: Succeeded
-    status: 'True'
-    type: Ready

test/conformance/chainsaw/mutate/cascading/two-foreach-rules/chainsaw-test.yaml

@@ -4,12 +4,20 @@ metadata:
   name: two-foreach-rules
 spec:
   steps:
-  - name: step-01
-    try:
-    - apply:
-        file: policy.yaml
-    - assert:
-        file: policy-assert.yaml
+  - name: create policy
+    use:
+      template: ../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: mutate-chain
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/mutate/cascading/two-foreach-rules/policy-assert.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: mutate-chain
-status:
-  conditions:
-  - reason: Succeeded
-    status: 'True'
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/cornercases/cascading-mutation/chainsaw-test.yaml

@@ -4,12 +4,20 @@ metadata:
   name: cascading-mutation
 spec:
   steps:
-  - name: step-01
-    try:
-    - apply:
-        file: policy.yaml
-    - assert:
-        file: policy-ready.yaml
+  - name: create policy
+    use:
+      template: ../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: database-protection
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/mutate/clusterpolicy/cornercases/cascading-mutation/policy-ready.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: database-protection
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/cornercases/defaulting-namespace-labels/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: propagate-cost-labels-from-namespace
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/cornercases/defaulting-namespace-labels/chainsaw-test.yaml

@@ -4,12 +4,20 @@ metadata:
   name: defaulting-namespace-labels
 spec:
   steps:
-  - name: step-01
-    try:
-    - apply:
-        file: chainsaw-step-01-apply-1-1.yaml
-    - assert:
-        file: chainsaw-step-01-assert-1-1.yaml
+  - name: create policy
+    use:
+      template: ../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: propagate-cost-labels-from-namespace
   - name: step-02
     try:
     - script:
@@ -23,7 +31,7 @@ spec:
   - name: step-04
     try:
     - apply:
-        file: chainsaw-step-04-apply-1-1.yaml
+        file: policy-update.yaml
   - name: step-05
     try:
     - apply:

test/conformance/chainsaw/mutate/clusterpolicy/cornercases/jmespath-with-special-chars/chainsaw-test.yaml

@@ -4,12 +4,20 @@ metadata:
   name: jmespath-with-special-chars
 spec:
   steps:
-  - name: step-00
-    try:
-    - apply:
-        file: policy.yaml
-    - assert:
-        file: policy-assert.yaml
+  - name: create policy
+    use:
+      template: ../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: jmespath-with-special-chars-demo
   - name: step-01
     try:
     - apply:

test/conformance/chainsaw/mutate/clusterpolicy/cornercases/jmespath-with-special-chars/policy-assert.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: jmespath-with-special-chars-demo
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/cornercases/mutate-using-default-context/chainsaw-test.yaml

@@ -4,12 +4,20 @@ metadata:
   name: mutate-using-default-context
 spec:
   steps:
-  - name: step-00
-    try:
-    - apply:
-        file: policy.yaml
-    - assert:
-        file: policy-assert.yaml
+  - name: create policy
+    use:
+      template: ../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: pod-add-labels
   - name: step-01
     try:
     - apply:

test/conformance/chainsaw/mutate/clusterpolicy/cornercases/mutate-using-default-context/policy-assert.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: pod-add-labels
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/cornercases/mutate-with-404-api-call/chainsaw-test.yaml

@@ -4,12 +4,20 @@ metadata:
   name: mutate-with-404-api-call
 spec:
   steps:
-  - name: step-01
-    try:
-    - apply:
-        file: policy.yaml
-    - assert:
-        file: policy-assert.yaml
+  - name: create policy
+    use:
+      template: ../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: mutate-404-api-call
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/mutate/clusterpolicy/cornercases/mutate-with-404-api-call/policy-assert.yaml

@@ -1,4 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: mutate-404-api-call

test/conformance/chainsaw/mutate/clusterpolicy/cornercases/trigger-name-exceeds-63-characters/chainsaw-test.yaml

@@ -16,12 +16,20 @@ spec:
         file: configmap.yaml
     - assert:
         file: configmap-assert.yaml
-  - name: step-03
-    try:
-    - apply:
-        file: policy.yaml
-    - assert:
-        file: policy-assert.yaml
+  - name: create policy
+    use:
+      template: ../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: trigger-deployment-restarts
   - name: step-04
     try:
     - apply:

test/conformance/chainsaw/mutate/clusterpolicy/cornercases/trigger-name-exceeds-63-characters/policy-assert.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: trigger-deployment-restarts
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/cornercases/variables-mutate-existing-deprecated/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: reload
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/cornercases/variables-mutate-existing-deprecated/chainsaw-test.yaml

@@ -4,12 +4,20 @@ metadata:
   name: variables-mutate-existing
 spec:
   steps:
-  - name: step-01
-    try:
-    - apply:
-        file: chainsaw-step-01-apply-1-1.yaml
-    - assert:
-        file: chainsaw-step-01-assert-1-1.yaml
+  - name: create policy
+    use:
+      template: ../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: reload
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/mutate/clusterpolicy/cornercases/variables-mutate-existing/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: reload
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/cornercases/variables-mutate-existing/chainsaw-test.yaml

@@ -4,12 +4,20 @@ metadata:
   name: variables-mutate-existing
 spec:
   steps:
-  - name: step-01
-    try:
-    - apply:
-        file: chainsaw-step-01-apply-1-1.yaml
-    - assert:
-        file: chainsaw-step-01-assert-1-1.yaml
+  - name: create policy
+    use:
+      template: ../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: reload
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/mutate/clusterpolicy/standard/basic-check-output/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: add-labels
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/basic-check-output/chainsaw-test.yaml

@@ -4,12 +4,20 @@ metadata:
   name: basic-check-output
 spec:
   steps:
-  - name: step-01
-    try:
-    - apply:
-        file: chainsaw-step-01-apply-1-1.yaml
-    - assert:
-        file: chainsaw-step-01-assert-1-1.yaml
+  - name: create policy
+    use:
+      template: ../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: add-labels
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/background-false(deprecated)/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: add-privileged-existing-namespaces
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/background-false(deprecated)/chainsaw-test.yaml

@@ -8,10 +8,20 @@ spec:
     try:
     - apply:
         file: chainsaw-step-01-apply-1-1.yaml
-    - apply:
-        file: chainsaw-step-01-apply-1-2.yaml
-    - assert:
-        file: chainsaw-step-01-assert-1-1.yaml
+  - name: create policy
+    use:
+      template: ../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: add-privileged-existing-namespaces
   - name: step-03
     try:
     - assert:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/background-false/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: add-privileged-existing-namespaces
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/background-false/chainsaw-test.yaml

@@ -8,10 +8,20 @@ spec:
     try:
     - apply:
         file: chainsaw-step-01-apply-1-1.yaml
-    - apply:
-        file: chainsaw-step-01-apply-1-2.yaml
-    - assert:
-        file: chainsaw-step-01-assert-1-1.yaml
+  - name: create policy
+    use:
+      template: ../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: add-privileged-existing-namespaces
   - name: step-03
     try:
     - assert:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/basic-create(deprecated)/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: mutate-existing-secret
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/basic-create(deprecated)/chainsaw-test.yaml

@@ -10,10 +10,20 @@ spec:
         file: chainsaw-step-01-apply-1-1.yaml
     - apply:
         file: chainsaw-step-01-apply-1-2.yaml
-    - apply:
-        file: chainsaw-step-01-apply-1-3.yaml
-    - assert:
-        file: chainsaw-step-01-assert-1-1.yaml
+  - name: create policy
+    use:
+      template: ../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: mutate-existing-secret
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/basic-create-patchesJson6902(deprecated)/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: test-post-mutation
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/basic-create-patchesJson6902(deprecated)/chainsaw-test.yaml

@@ -10,10 +10,20 @@ spec:
         file: chainsaw-step-01-apply-1-1.yaml
     - apply:
         file: chainsaw-step-01-apply-1-2.yaml
-    - apply:
-        file: chainsaw-step-01-apply-1-3.yaml
-    - assert:
-        file: chainsaw-step-01-assert-1-1.yaml
+  - name: create policy
+    use:
+      template: ../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: test-post-mutation
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/basic-create-patchesJson6902/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: test-post-mutation
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/basic-create-patchesJson6902/chainsaw-test.yaml

@@ -10,10 +10,20 @@ spec:
         file: chainsaw-step-01-apply-1-1.yaml
     - apply:
         file: chainsaw-step-01-apply-1-2.yaml
-    - apply:
-        file: chainsaw-step-01-apply-1-3.yaml
-    - assert:
-        file: chainsaw-step-01-assert-1-1.yaml
+  - name: create policy
+    use:
+      template: ../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: test-post-mutation
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/basic-create/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: mutate-existing-secret
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/basic-create/chainsaw-test.yaml

@@ -10,10 +10,20 @@ spec:
         file: chainsaw-step-01-apply-1-1.yaml
     - apply:
         file: chainsaw-step-01-apply-1-2.yaml
-    - apply:
-        file: chainsaw-step-01-apply-1-3.yaml
-    - assert:
-        file: chainsaw-step-01-assert-1-1.yaml
+  - name: create policy
+    use:
+      template: ../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: mutate-existing-secret
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/basic-delete(deprecated)/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: test-post-mutation-delete-trigger
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/basic-delete(deprecated)/chainsaw-test.yaml

@@ -12,10 +12,20 @@ spec:
         file: chainsaw-step-01-apply-1-2.yaml
     - apply:
         file: chainsaw-step-01-apply-1-3.yaml
-    - apply:
-        file: chainsaw-step-01-apply-1-4.yaml
-    - assert:
-        file: chainsaw-step-01-assert-1-1.yaml
+  - name: create policy
+    use:
+      template: ../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: test-post-mutation-delete-trigger
   - name: step-02
     try:
     - delete:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/basic-delete/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: test-post-mutation-delete-trigger
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/basic-delete/chainsaw-test.yaml

@@ -12,10 +12,20 @@ spec:
         file: chainsaw-step-01-apply-1-2.yaml
     - apply:
         file: chainsaw-step-01-apply-1-3.yaml
-    - apply:
-        file: chainsaw-step-01-apply-1-4.yaml
-    - assert:
-        file: chainsaw-step-01-assert-1-1.yaml
+  - name: create policy
+    use:
+      template: ../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: test-post-mutation-delete-trigger
   - name: step-02
     try:
     - delete:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/basic-update(deprecated)/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: mutate-existing-secret
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/basic-update(deprecated)/chainsaw-test.yaml

@@ -12,10 +12,20 @@ spec:
         file: chainsaw-step-01-apply-1-2.yaml
     - apply:
         file: chainsaw-step-01-apply-1-3.yaml
-    - apply:
-        file: chainsaw-step-01-apply-1-4.yaml
-    - assert:
-        file: chainsaw-step-01-assert-1-1.yaml
+  - name: create policy
+    use:
+      template: ../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: mutate-existing-secret
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/basic-update/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: mutate-existing-secret
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/basic-update/chainsaw-test.yaml

@@ -12,10 +12,20 @@ spec:
         file: chainsaw-step-01-apply-1-2.yaml
     - apply:
         file: chainsaw-step-01-apply-1-3.yaml
-    - apply:
-        file: chainsaw-step-01-apply-1-4.yaml
-    - assert:
-        file: chainsaw-step-01-assert-1-1.yaml
+  - name: create policy
+    use:
+      template: ../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: mutate-existing-secret
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/delete-trigger-namespace(deprecated)/chainsaw-test.yaml

@@ -12,12 +12,20 @@ spec:
     try:
     - apply:
         file: secret.yaml
-  - name: step-03
-    try:
-    - apply:
-        file: policy.yaml
-    - assert:
-        file: policy-ready.yaml
+  - name: create policy
+    use:
+      template: ../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: mutate-existing-secret
   - name: step-04
     try:
     - apply:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/delete-trigger-namespace(deprecated)/policy-ready.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: mutate-existing-secret
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/delete-trigger-namespace/chainsaw-test.yaml

@@ -12,12 +12,20 @@ spec:
     try:
     - apply:
         file: secret.yaml
-  - name: step-03
-    try:
-    - apply:
-        file: policy.yaml
-    - assert:
-        file: policy-ready.yaml
+  - name: create policy
+    use:
+      template: ../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: mutate-existing-secret
   - name: step-04
     try:
     - apply:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/delete-trigger-namespace/policy-ready.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: mutate-existing-secret
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/descending-patchJson6902/chainsaw-test.yaml

@@ -4,14 +4,20 @@ metadata:
   name: descending-patchjson
 spec:
   steps:
-  - name: step-01
-    try:
-    - apply:
-        file: policy.yaml
-  - name: step-01-assert
-    try:
-    - assert:
-        file: policy-assert.yaml
+  - name: create policy
+    use:
+      template: ../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: descending-jsonpatch
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/descending-patchJson6902/policy-assert.yaml

@@ -1,5 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: descending-jsonpatch
-

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/multiple-rules-match-exclude(deprecated)/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: cpol-multiple-rules-match-exclude
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/multiple-rules-match-exclude(deprecated)/chainsaw-test.yaml

@@ -14,10 +14,20 @@ spec:
         file: chainsaw-step-01-apply-1-3.yaml
     - apply:
         file: chainsaw-step-01-apply-1-4.yaml
-    - apply:
-        file: chainsaw-step-01-apply-1-5.yaml
-    - assert:
-        file: chainsaw-step-01-assert-1-1.yaml
+  - name: create policy
+    use:
+      template: ../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: cpol-multiple-rules-match-exclude
   - name: step-02
     try:
     - command:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/multiple-rules-match-exclude/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: cpol-multiple-rules-match-exclude
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/multiple-rules-match-exclude/chainsaw-test.yaml

@@ -14,10 +14,20 @@ spec:
         file: chainsaw-step-01-apply-1-3.yaml
     - apply:
         file: chainsaw-step-01-apply-1-4.yaml
-    - apply:
-        file: chainsaw-step-01-apply-1-5.yaml
-    - assert:
-        file: chainsaw-step-01-assert-1-1.yaml
+  - name: create policy
+    use:
+      template: ../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: cpol-multiple-rules-match-exclude
   - name: step-02
     try:
     - command:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/multiple-trigger-resources(deprecated)/chainsaw-test.yaml

@@ -16,12 +16,20 @@ spec:
     try:
     - apply:
         file: pod.yaml
-  - name: step-04
-    try:
-    - apply:
-        file: policy.yaml
-    - assert:
-        file: policy-ready.yaml
+  - name: create policy
+    use:
+      template: ../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: org-label-inheritance-existing-1
   - name: step-05
     try:
     - assert:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/multiple-trigger-resources(deprecated)/policy-ready.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: org-label-inheritance-existing-1
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/multiple-trigger-resources/chainsaw-test.yaml

@@ -16,12 +16,20 @@ spec:
     try:
     - apply:
         file: pod.yaml
-  - name: step-04
-    try:
-    - apply:
-        file: policy.yaml
-    - assert:
-        file: policy-ready.yaml
+  - name: create policy
+    use:
+      template: ../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: org-label-inheritance-existing-1
   - name: step-05
     try:
     - assert:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/multiple-trigger-resources/policy-ready.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: org-label-inheritance-existing-1
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/mutate-existing-node-status/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: advertise-resource
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/mutate-existing-node-status/chainsaw-test.yaml

@@ -4,14 +4,23 @@ metadata:
   name: mutate-existing-node-status
 spec:
   steps:
-  - name: step-01
-    try:
-    - apply:
-        file: chainsaw-step-01-apply-1-1.yaml
+  - name: create policy
+    use:
+      template: ../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - try:
     - apply:
         file: chainsaw-step-01-apply-1-2.yaml
-    - assert:
-        file: chainsaw-step-01-assert-1-1.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: advertise-resource
   - name: step-02
     try:
     - script:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/mutate-pod-on-binding-request/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: mutate-pod-on-binding-request
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/mutate-pod-on-binding-request/chainsaw-test.yaml

@@ -8,12 +8,24 @@ spec:
     try:
     - apply:
         file: chainsaw-step-01-apply-1-1.yaml
-    - apply:
-        file: chainsaw-step-01-apply-1-2.yaml
+  - name: create policy
+    use:
+      template: ../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - try:
     - apply:
         file: chainsaw-step-01-apply-1-3.yaml
-    - assert:
-        file: chainsaw-step-01-assert-1-1.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: mutate-pod-on-binding-request
+  - try:
     - assert:
         file: chainsaw-step-01-assert-1-2.yaml
   - name: step-02

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/namespaceselector(deprecated)/chainsaw-test.yaml

@@ -4,12 +4,20 @@ metadata:
   name: namespaceselector
 spec:
   steps:
-  - name: step-01
-    try:
-    - apply:
-        file: policy.yaml
-    - assert:
-        file: policy-assert.yaml
+  - name: create policy
+    use:
+      template: ../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: org-label-inheritance-existing-standard
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/namespaceselector(deprecated)/policy-assert.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: org-label-inheritance-existing-standard
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/namespaceselector/chainsaw-test.yaml

@@ -4,12 +4,20 @@ metadata:
   name: namespaceselector
 spec:
   steps:
-  - name: step-01
-    try:
-    - apply:
-        file: policy.yaml
-    - assert:
-        file: policy-assert.yaml
+  - name: create policy
+    use:
+      template: ../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: org-label-inheritance-existing-standard
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/namespaceselector/policy-assert.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: org-label-inheritance-existing-standard
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/onpolicyupdate/basic-create-policy(deprecated)/chainsaw-step-02-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: test-post-mutation-create-policy
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/onpolicyupdate/basic-create-policy(deprecated)/chainsaw-test.yaml

@@ -12,12 +12,20 @@ spec:
         file: chainsaw-step-01-apply-1-2.yaml
     - apply:
         file: chainsaw-step-01-apply-1-3.yaml
-  - name: step-02
-    try:
-    - apply:
-        file: chainsaw-step-02-apply-1-1.yaml
-    - assert:
-        file: chainsaw-step-02-assert-1-1.yaml
+  - name: create policy
+    use:
+      template: ../../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: test-post-mutation-create-policy
   - name: step-03
     try:
     - assert:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/onpolicyupdate/basic-create-policy/chainsaw-step-02-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: test-post-mutation-create-policy
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/onpolicyupdate/basic-create-policy/chainsaw-test.yaml

@@ -12,12 +12,20 @@ spec:
         file: chainsaw-step-01-apply-1-2.yaml
     - apply:
         file: chainsaw-step-01-apply-1-3.yaml
-  - name: step-02
-    try:
-    - apply:
-        file: chainsaw-step-02-apply-1-1.yaml
-    - assert:
-        file: chainsaw-step-02-assert-1-1.yaml
+  - name: create policy
+    use:
+      template: ../../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: test-post-mutation-create-policy
   - name: step-03
     try:
     - assert:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/onpolicyupdate/different-configurations-for-mutate-existing/chainsaw-test.yaml

@@ -12,12 +12,20 @@ spec:
         file: configmaps.yaml
     - apply:
         file: secrets.yaml
-  - name: step-02
-    try:
-    - apply:
-        file: policy.yaml
-    - assert:
-        file: policy-ready.yaml
+  - name: create policy
+    use:
+      template: ../../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: test-post-mutation-create-policy
   - name: step-03
     try:
     - assert:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/onpolicyupdate/different-configurations-for-mutate-existing/policy-ready.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: test-post-mutation-create-policy
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/onpolicyupdate/different-mutate-existing-values/chainsaw-test.yaml

@@ -12,12 +12,20 @@ spec:
         file: configmaps.yaml
     - apply:
         file: secrets.yaml
-  - name: step-02
-    try:
-    - apply:
-        file: policy.yaml
-    - assert:
-        file: policy-ready.yaml
+  - name: create policy
+    use:
+      template: ../../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: test-post-mutation-create-policy
   - name: step-03
     try:
     - assert:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/onpolicyupdate/different-mutate-existing-values/policy-ready.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: test-post-mutation-create-policy
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/onpolicyupdate/namespaceselector(deprecated)/chainsaw-test.yaml

@@ -18,12 +18,20 @@ spec:
         file: chainsaw-step-01-assert-1-2.yaml
     - assert:
         file: chainsaw-step-01-assert-1-3.yaml
-  - name: step-02
-    try:
-    - apply:
-        file: policy.yaml
-    - assert:
-        file: policy-assert.yaml
+  - name: create policy
+    use:
+      template: ../../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: org-label-inheritance-existing
   - name: step-04
     try:
     - assert:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/onpolicyupdate/namespaceselector(deprecated)/policy-assert.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: org-label-inheritance-existing
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/onpolicyupdate/namespaceselector/chainsaw-test.yaml

@@ -18,12 +18,20 @@ spec:
         file: chainsaw-step-01-assert-1-2.yaml
     - assert:
         file: chainsaw-step-01-assert-1-3.yaml
-  - name: step-02
-    try:
-    - apply:
-        file: policy.yaml
-    - assert:
-        file: policy-assert.yaml
+  - name: create policy
+    use:
+      template: ../../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: org-label-inheritance-existing
   - name: step-04
     try:
     - assert:

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/onpolicyupdate/namespaceselector/policy-assert.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: org-label-inheritance-existing
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/mutate/clusterpolicy/standard/existing/preconditions(deprecated)/chainsaw-test.yaml

@@ -8,12 +8,20 @@ spec:
     try:
     - apply:
         file: resources.yaml
-  - name: step-02
-    try:
-    - apply:
-        file: policy.yaml
-    - assert:
-        file: policy-ready.yaml
+  - name: create policy
+    use:
+      template: ../../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: test
   - name: step-03
     try:
     - assert: