chore: use more chainsaw step templates (#11324)

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

test/conformance/chainsaw/_step-templates/update-policy.yaml

@@ -0,0 +1,8 @@
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: StepTemplate
+metadata:
+  name: update-policy
+spec:
+  try:
+  - update:
+      file: ($file)

test/conformance/chainsaw/generate/clusterpolicy/cornercases/clone-list-sync-same-trigger-source-delete-source/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v2beta1
-kind: ClusterPolicy
-metadata:
-  name: clone-list-sync-same-trigger-source-cpol
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/cornercases/clone-list-sync-same-trigger-source-delete-source/chainsaw-test.yaml

@@ -12,10 +12,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: clone-list-sync-same-trigger-source-cpol
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/cornercases/clone-list-sync-same-trigger-source-update-source/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v2beta1
-kind: ClusterPolicy
-metadata:
-  name: clone-list-sync-same-trigger-source-update-source-cpol
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/cornercases/clone-list-sync-same-trigger-source-update-source/chainsaw-test.yaml

@@ -14,10 +14,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: clone-list-sync-same-trigger-source-update-source-cpol
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/cornercases/clone-role-and-rolebinding/chainsaw-step-01-assert-1-1.yaml

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

test/conformance/chainsaw/generate/clusterpolicy/cornercases/clone-role-and-rolebinding/chainsaw-test.yaml

@@ -12,10 +12,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: gen-clone-role-policy
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/cornercases/clone-source-managed-by-label-helm/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v2beta1
-kind: ClusterPolicy
-metadata:
-  name: sync-image-pull-secrets
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/cornercases/clone-source-managed-by-label-helm/chainsaw-test.yaml

@@ -10,10 +10,20 @@ spec:
         file: permissions.yaml
     - 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: sync-image-pull-secrets
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/cornercases/clone-source-name-exceeds-63-characters/chainsaw-step-01-assert-1-1.yaml

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

test/conformance/chainsaw/generate/clusterpolicy/cornercases/clone-source-name-exceeds-63-characters/chainsaw-test.yaml

@@ -10,10 +10,20 @@ spec:
         file: permissions.yaml
     - 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: generate-secret
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/cornercases/clone-sync-same-trigger-source-delete-source/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v2beta1
-kind: ClusterPolicy
-metadata:
-  name: clone-sync-same-trigger-source-cpol
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/cornercases/clone-sync-same-trigger-source-delete-source/chainsaw-test.yaml

@@ -12,10 +12,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: clone-sync-same-trigger-source-cpol
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/cornercases/clone-sync-same-trigger-source-update-source/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v2beta1
-kind: ClusterPolicy
-metadata:
-  name: clone-sync-same-trigger-source-update-source-cpol
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/cornercases/clone-sync-same-trigger-source-update-source/chainsaw-test.yaml

@@ -14,10 +14,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: clone-sync-same-trigger-source-update-source-cpol
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-clone-create-on-trigger-deletion/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v2beta1
-kind: ClusterPolicy
-metadata:
-  name: cpol-clone-create-on-trigger-deletion
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-clone-create-on-trigger-deletion/chainsaw-test.yaml

@@ -14,10 +14,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: cpol-clone-create-on-trigger-deletion
   - name: step-02
     try:
     - delete:

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-clone-delete-ownerreferences-across-namespaces-deprecated/chainsaw-test.yaml

@@ -8,10 +8,20 @@ spec:
     try:
     - apply:
         file: permissions.yaml
-    - 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: cpol-clone-delete-ownerreferences-across-namespaces
   - name: step-02
     try:
     - script:

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-clone-delete-ownerreferences-across-namespaces-deprecated/policy-ready.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: cpol-clone-delete-ownerreferences-across-namespaces
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-clone-delete-ownerreferences-across-namespaces/chainsaw-test.yaml

@@ -8,10 +8,20 @@ spec:
     try:
     - apply:
         file: permissions.yaml
-    - 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: cpol-clone-delete-ownerreferences-across-namespaces
   - name: step-02
     try:
     - script:

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-clone-delete-ownerreferences-across-namespaces/policy-ready.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: cpol-clone-delete-ownerreferences-across-namespaces
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-clone-sync-create-source-after-policy/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v2beta1
-kind: ClusterPolicy
-metadata:
-  name: cpol-clone-sync-create-source-after-policy
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-clone-sync-create-source-after-policy/chainsaw-test.yaml

@@ -8,12 +8,23 @@ spec:
     try:
     - apply:
         file: permissions.yaml
-    - 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: cpol-clone-sync-create-source-after-policy
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-clone-sync-reinstall-policy-deprecated/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v2beta1
-kind: ClusterPolicy
-metadata:
-  name: cpol-clone-sync-reinstall-policy
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-clone-sync-reinstall-policy-deprecated/chainsaw-test.yaml

@@ -12,10 +12,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: cpol-clone-sync-reinstall-policy
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-clone-sync-reinstall-policy/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v2beta1
-kind: ClusterPolicy
-metadata:
-  name: cpol-clone-sync-reinstall-policy
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-clone-sync-reinstall-policy/chainsaw-test.yaml

@@ -12,10 +12,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: cpol-clone-sync-reinstall-policy
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-clone-sync-single-source-multiple-triggers-targets-deprecated/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v2beta1
-kind: ClusterPolicy
-metadata:
-  name: cpol-clone-sync-single-source-multiple-targets
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-clone-sync-single-source-multiple-triggers-targets-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: cpol-clone-sync-single-source-multiple-targets
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-clone-sync-single-source-multiple-triggers-targets/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v2beta1
-kind: ClusterPolicy
-metadata:
-  name: cpol-clone-sync-single-source-multiple-targets
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-clone-sync-single-source-multiple-triggers-targets/chainsaw-test.yaml

@@ -12,10 +12,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: cpol-clone-sync-single-source-multiple-targets
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-clone-sync-single-trigger-source-multiple-targets/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v2beta1
-kind: ClusterPolicy
-metadata:
-  name: cpol-clone-sync-single-trigger-source-multiple-targets-1
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-clone-sync-single-trigger-source-multiple-targets/chainsaw-step-01-assert-1-2.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v2beta1
-kind: ClusterPolicy
-metadata:
-  name: cpol-clone-sync-single-trigger-source-multiple-targets-2
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-clone-sync-single-trigger-source-multiple-targets/chainsaw-test.yaml

@@ -12,14 +12,34 @@ 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
-    - apply:
-        file: chainsaw-step-01-apply-1-4.yaml
-    - assert:
-        file: chainsaw-step-01-assert-1-1.yaml
-    - assert:
-        file: chainsaw-step-01-assert-1-2.yaml
+  - name: create policy
+    use:
+      template: ../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy-1.yaml
+  - name: create policy
+    use:
+      template: ../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy-2.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: cpol-clone-sync-single-trigger-source-multiple-targets-1
+  - name: wait policy ready
+    use:
+      template: ../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: cpol-clone-sync-single-trigger-source-multiple-targets-2
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-data-create-on-trigger-deletion/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v2beta1
-kind: ClusterPolicy
-metadata:
-  name: cpol-create-on-trigger-deletion
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-data-create-on-trigger-deletion/chainsaw-test.yaml

@@ -12,10 +12,22 @@ 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: cpol-create-on-trigger-deletion
+  - name: step-01
+    try:
     - assert:
         file: chainsaw-step-01-assert-1-2.yaml
   - name: step-02

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-data-sync-create-upon-generated-resource/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: cpol-data-sync-create-upon-generated-resource
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-data-sync-create-upon-generated-resource/chainsaw-test.yaml

@@ -8,10 +8,20 @@ spec:
     try:
     - apply:
         file: permissions.yaml
-    - 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: manifests.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: cpol-data-sync-create-upon-generated-resource
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-data-sync-create-upon-generated-resource/manifests.yaml

@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/component: background-controller
     app.kubernetes.io/instance: kyverno
     app.kubernetes.io/part-of: kyverno
-  name: kyverno:background-controller:additional
+  name: kyverno:background-controller:additional-2
 rules:
 - apiGroups:
   - ""

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-data-sync-no-creation-upon-generated-resource/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: cpol-data-sync-no-creation-upon-generated-resource
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-data-sync-no-creation-upon-generated-resource/chainsaw-test.yaml

@@ -8,10 +8,20 @@ spec:
     try:
     - apply:
         file: permissions.yaml
-    - 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: manifests.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: cpol-data-sync-no-creation-upon-generated-resource
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-data-sync-no-creation-upon-generated-resource/manifests.yaml

@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/component: background-controller
     app.kubernetes.io/instance: kyverno
     app.kubernetes.io/part-of: kyverno
-  name: kyverno:background-controller:additional
+  name: kyverno:background-controller:additional-2
 rules:
 - apiGroups:
   - ""

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-data-sync-remove-list-element/chainsaw-test.yaml

@@ -4,12 +4,20 @@ metadata:
   name: cpol-data-sync-remove-list-element
 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: cpol-data-sync-remove-list-element-cpol
   - name: step-02
     try:
     - apply:
@@ -22,8 +30,13 @@ spec:
     try:
     - apply:
         file: policy-remove-egress.yaml
-    - assert:
-        file: policy-ready.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: cpol-data-sync-remove-list-element-cpol
   - name: step-05
     try:
     - sleep:

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-data-sync-remove-list-element/policy-ready.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: cpol-data-sync-remove-list-element-cpol
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-data-sync-to-nosync-delete-rule-deprecated/chainsaw-test.yaml

@@ -8,10 +8,20 @@ spec:
     try:
     - apply:
         file: permissions.yaml
-    - 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: cpol-data-sync-to-nosync-delete-rule
   - name: step-02
     try:
     - apply:
@@ -30,8 +40,13 @@ spec:
     try:
     - apply:
         file: delete-rule.yaml
-    - assert:
-        file: policy-ready.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: cpol-data-sync-to-nosync-delete-rule
   - name: step-06
     try:
     - sleep:

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-data-sync-to-nosync-delete-rule-deprecated/policy-ready.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: cpol-data-sync-to-nosync-delete-rule
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-data-sync-to-nosync-delete-rule/chainsaw-test.yaml

@@ -8,10 +8,20 @@ spec:
     try:
     - apply:
         file: permissions.yaml
-    - 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: cpol-data-sync-to-nosync-delete-rule
   - name: step-02
     try:
     - apply:
@@ -30,8 +40,13 @@ spec:
     try:
     - apply:
         file: delete-rule.yaml
-    - assert:
-        file: policy-ready.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: cpol-data-sync-to-nosync-delete-rule
   - name: step-06
     try:
     - sleep:

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-data-sync-to-nosync-delete-rule/policy-ready.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: cpol-data-sync-to-nosync-delete-rule
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-data-trigger-not-present/chainsaw-test.yaml

@@ -17,12 +17,20 @@ spec:
     try:
     - apply:
         file: rbac.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: cpol-data-trigger-not-present
   - name: step-04
     try:
     - script:

test/conformance/chainsaw/generate/clusterpolicy/cornercases/cpol-data-trigger-not-present/policy-ready.yaml

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

test/conformance/chainsaw/generate/clusterpolicy/cornercases/data-role-and-rolebinding/chainsaw-step-01-assert-1-1.yaml

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

test/conformance/chainsaw/generate/clusterpolicy/cornercases/data-role-and-rolebinding/chainsaw-test.yaml

@@ -8,10 +8,20 @@ spec:
     try:
     - apply:
         file: permissions.yaml
-    - 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: gen-role-policy
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/cornercases/generate-event-upon-edit/chainsaw-step-02-assert-1-2.yaml

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

test/conformance/chainsaw/generate/clusterpolicy/cornercases/generate-event-upon-edit/chainsaw-test.yaml

@@ -10,14 +10,23 @@ spec:
         file: chainsaw-step-01-apply-1-1.yaml
     - apply:
         file: chainsaw-step-01-apply-1-2.yaml
-  - name: step-02
-    try:
-    - apply:
-        file: chainsaw-step-02-apply-1-1.yaml
+  - name: create policy
+    use:
+      template: ../../../../_step-templates/create-policy.yaml
+      with:
+        bindings:
+        - name: file
+          value: policy.yaml
+  - try:
     - assert:
         file: chainsaw-step-02-assert-1-1.yaml
-    - assert:
-        file: chainsaw-step-02-assert-1-2.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: generate-event-upon-edit
   - name: step-03
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/cornercases/pod-restart-on-cm-update-deprecated/chainsaw-test.yaml

@@ -10,12 +10,20 @@ spec:
         file: manifests.yaml
     - apply:
         file: cluster-role.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: generate-cm-for-kube-state-metrics-crds
   - name: step-03
     try:
     - script:

test/conformance/chainsaw/generate/clusterpolicy/cornercases/pod-restart-on-cm-update-deprecated/policy-ready.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: generate-cm-for-kube-state-metrics-crds
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/cornercases/pod-restart-on-cm-update/chainsaw-test.yaml

@@ -10,12 +10,20 @@ spec:
         file: manifests.yaml
     - apply:
         file: cluster-role.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: generate-cm-for-kube-state-metrics-crds
   - name: step-03
     try:
     - script:

test/conformance/chainsaw/generate/clusterpolicy/cornercases/pod-restart-on-cm-update/policy-ready.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: generate-cm-for-kube-state-metrics-crds
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/cornercases/trigger-resource-name-exceeds-63-characters/chainsaw-step-01-assert-1-1.yaml

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

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

@@ -4,12 +4,20 @@ metadata:
   name: trigger-resource-name-exceeds-63-characters
 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: generate-network-policy
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/standard/clone/multiple/sync/basic-create/chainsaw-test.yaml

@@ -10,10 +10,20 @@ spec:
         file: permissions.yaml
     - apply:
         file: manifests.yaml
-    - apply:
-        file: policy.yaml
-    - assert:
-        file: cluster-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: clone-multiple-basic-create-policy
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/standard/clone/multiple/sync/basic-create/cluster-policy-ready.yaml

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

test/conformance/chainsaw/generate/clusterpolicy/standard/clone/nosync/cpol-clone-nosync-create/chainsaw-step-01-assert-1-1.yaml

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

test/conformance/chainsaw/generate/clusterpolicy/standard/clone/nosync/cpol-clone-nosync-create/chainsaw-test.yaml

@@ -8,12 +8,23 @@ spec:
     try:
     - apply:
         file: permissions.yaml
-    - 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: cpol-nosync-clone
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/standard/clone/nosync/cpol-clone-nosync-delete-downstream/chainsaw-step-01-assert-1-1.yaml

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

test/conformance/chainsaw/generate/clusterpolicy/standard/clone/nosync/cpol-clone-nosync-delete-downstream/chainsaw-test.yaml

@@ -8,12 +8,23 @@ spec:
     try:
     - apply:
         file: permissions.yaml
-    - 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: cpol-nosync-clone
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/standard/clone/nosync/cpol-clone-nosync-delete-policy/chainsaw-test.yaml

@@ -4,12 +4,20 @@ metadata:
   name: cpol-clone-nosync-delete-policy
 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: cpol-nosync-clone-delete-policy
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/standard/clone/nosync/cpol-clone-nosync-delete-policy/policy-ready.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v2beta1
-kind: ClusterPolicy
-metadata:
-  name: cpol-nosync-clone-delete-policy
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/standard/clone/nosync/cpol-clone-nosync-delete-rule/chainsaw-test.yaml

@@ -8,10 +8,20 @@ spec:
     try:
     - apply:
         file: permissions.yaml
-    - 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: cpol-nosync-clone
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/standard/clone/nosync/cpol-clone-nosync-delete-rule/policy-ready.yaml

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

test/conformance/chainsaw/generate/clusterpolicy/standard/clone/nosync/cpol-clone-nosync-delete-source/chainsaw-test.yaml

@@ -8,10 +8,20 @@ spec:
     try:
     - apply:
         file: permissions.yaml
-    - 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: cpol-clone-nosync-delete-source
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/standard/clone/nosync/cpol-clone-nosync-delete-source/policy-ready.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v2beta1
-kind: ClusterPolicy
-metadata:
-  name: cpol-clone-nosync-delete-source
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/standard/clone/nosync/cpol-clone-nosync-delete-trigger/chainsaw-step-01-assert-1-1.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v2beta1
-kind: ClusterPolicy
-metadata:
-  name: cpol-clone-nosync-delete-trigger-policy
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/standard/clone/nosync/cpol-clone-nosync-delete-trigger/chainsaw-test.yaml

@@ -12,10 +12,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: cpol-clone-nosync-delete-trigger-policy
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/standard/clone/nosync/cpol-clone-nosync-modify-downstream/chainsaw-test.yaml

@@ -8,10 +8,20 @@ spec:
     try:
     - apply:
         file: permissions.yaml
-    - 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: cpol-clone-nosync-modify-downstream
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/standard/clone/nosync/cpol-clone-nosync-modify-downstream/policy-ready.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v2beta1
-kind: ClusterPolicy
-metadata:
-  name: cpol-clone-nosync-modify-downstream
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/generate/clusterpolicy/standard/clone/nosync/cpol-clone-nosync-modify-source/chainsaw-test.yaml

@@ -8,10 +8,20 @@ spec:
     try:
     - apply:
         file: permissions.yaml
-    - 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: cpol-nosync-clone-modify-source
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/generate/clusterpolicy/standard/clone/nosync/cpol-clone-nosync-modify-source/policy-ready.yaml

@@ -1,9 +0,0 @@
-apiVersion: kyverno.io/v2beta1
-kind: ClusterPolicy
-metadata:
-  name: cpol-nosync-clone-modify-source
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready