feat: use more chainsaw test templates (#11285)

* feat: use more chainsaw test templates

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

* fix

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

---------

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

test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-fail-generation/chainsaw-test.yaml

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

test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-fail-generation/policy-assert.yaml

@@ -1,10 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: rbac-policy
-spec: {}
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-generation/chainsaw-test.yaml

@@ -10,12 +10,20 @@ spec:
         content: kubectl patch configmap kyverno -p '{"data":{"generateSuccessEvents":"true"}}' -n kyverno
     - assert:
         file: kyverno-configmap-assert.yaml
-  - name: step-02
+  - name: create policy
-    try:
+    use:
-    - apply:
+      template: ../../../_step-templates/create-policy.yaml
-        file: policy.yaml
+      with:
-    - assert:
+        bindings:
-        file: policy-assert.yaml
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: zk-kafka-address
   - name: step-03
     try:
     - apply:

test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-generation/policy-assert.yaml

@@ -1,10 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: zk-kafka-address
-spec: {}
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-mutation/chainsaw-test.yaml

@@ -10,12 +10,20 @@ spec:
         content: kubectl patch configmap kyverno -p '{"data":{"generateSuccessEvents":"true"}}' -n kyverno
     - assert:
         file: kyverno-configmap-assert.yaml
-  - name: step-02
+  - name: create policy
-    try:
+    use:
-    - apply:
+      template: ../../../_step-templates/create-policy.yaml
-        file: policy.yaml
+      with:
-    - assert:
+        bindings:
-        file: policy-assert.yaml
+        - 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-03
     try:
     - apply:

test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-mutation/policy-assert.yaml

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

test/conformance/chainsaw/events/clusterpolicy/message-exceeds-1024-characters/chainsaw-test.yaml

@@ -4,12 +4,20 @@ metadata:
   name: message-exceeds-1024-characters
 spec:
   steps:
-  - name: step-01
+  - name: create policy
-    try:
+    use:
-    - apply:
+      template: ../../../_step-templates/create-policy.yaml
-        file: policy.yaml
+      with:
-    - assert:
+        bindings:
-        file: policy-assert.yaml
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: podsecurity-subrule-restricted
   - name: step-02
     try:
     - apply:

test/conformance/chainsaw/events/clusterpolicy/message-exceeds-1024-characters/policy-assert.yaml

@@ -1,10 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: podsecurity-subrule-restricted
-spec: {}
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/events/clusterpolicy/no-events-upon-skip-generation/chainsaw-test.yaml

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

test/conformance/chainsaw/events/clusterpolicy/no-events-upon-skip-generation/policy-assert.yaml

@@ -1,10 +0,0 @@
-apiVersion: kyverno.io/v1
-kind: ClusterPolicy
-metadata:
-  name: default
-spec: {}
-status:
-  conditions:
-  - reason: Succeeded
-    status: "True"
-    type: Ready

test/conformance/chainsaw/events/policy/policy-applied-deprecated/chainsaw-test.yaml

@@ -10,12 +10,20 @@ spec:
         content: kubectl patch configmap kyverno -p '{"data":{"generateSuccessEvents":"true"}}' -n kyverno
     - assert:
         file: kyverno-configmap-assert.yaml
-  - name: step-02
+  - name: create policy
-    try:
+    use:
-    - apply:
+      template: ../../../_step-templates/create-policy.yaml
-        file: policy.yaml
+      with:
-    - assert:
+        bindings:
-        file: policy-assert.yaml
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../_step-templates/policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: require-labels
   - name: step-03
     try:
     - apply:

test/conformance/chainsaw/events/policy/policy-applied-deprecated/policy-assert.yaml

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

test/conformance/chainsaw/events/policy/policy-applied/chainsaw-test.yaml

@@ -10,12 +10,20 @@ spec:
         content: kubectl patch configmap kyverno -p '{"data":{"generateSuccessEvents":"true"}}' -n kyverno
     - assert:
         file: kyverno-configmap-assert.yaml
-  - name: step-02
+  - name: create policy
-    try:
+    use:
-    - apply:
+      template: ../../../_step-templates/create-policy.yaml
-        file: policy.yaml
+      with:
-    - assert:
+        bindings:
-        file: policy-assert.yaml
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../_step-templates/policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: require-labels
   - name: step-03
     try:
     - apply:

test/conformance/chainsaw/events/policy/policy-applied/policy-assert.yaml

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

test/conformance/chainsaw/events/policy/policy-violation-deprecated/chainsaw-test.yaml

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

test/conformance/chainsaw/events/policy/policy-violation-deprecated/policy-assert.yaml

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

test/conformance/chainsaw/events/policy/policy-violation/chainsaw-test.yaml

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

test/conformance/chainsaw/events/policy/policy-violation/policy-assert.yaml

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

test/conformance/chainsaw/force-failure-policy-ignore/cluster-policy/fail-deprecated/chainsaw-test.yaml

@@ -4,12 +4,27 @@ metadata:
   name: fail
 spec:
   steps:
-  - name: step-01
+  - name: create policy
-    try:
+    use:
-    - apply:
+      template: ../../../_step-templates/create-policy.yaml
-        file: policy.yaml
+      with:
-    - assert:
+        bindings:
-        file: policy-assert.yaml
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: require-labels
+  - name: wait policy ready
+    use:
+      template: ../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: add-labels
   - name: step-02
     try:
     - assert:

test/conformance/chainsaw/force-failure-policy-ignore/cluster-policy/fail-deprecated/policy-assert.yaml

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

test/conformance/chainsaw/force-failure-policy-ignore/cluster-policy/fail/chainsaw-test.yaml

@@ -4,12 +4,27 @@ metadata:
   name: fail
 spec:
   steps:
-  - name: step-01
+  - name: create policy
-    try:
+    use:
-    - apply:
+      template: ../../../_step-templates/create-policy.yaml
-        file: policy.yaml
+      with:
-    - assert:
+        bindings:
-        file: policy-assert.yaml
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: require-labels
+  - name: wait policy ready
+    use:
+      template: ../../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: add-labels
   - name: step-02
     try:
     - assert:

test/conformance/chainsaw/force-failure-policy-ignore/cluster-policy/fail/policy-assert.yaml

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

test/conformance/chainsaw/rbac/mutate-policy-with-clusterrole/chainsaw-test.yaml

@@ -8,9 +8,17 @@ spec:
     try:
     - apply:
         file: clusterrole.yaml
-  - name: step-02
+  - name: create policy
-    try:
+    use:
-    - apply:
+      template: ../../_step-templates/create-policy.yaml
-        file: policy.yaml
+      with:
-    - assert:
+        bindings:
-        file: policy-assert.yaml
+        - name: file
+          value: policy.yaml
+  - name: wait policy ready
+    use:
+      template: ../../_step-templates/cluster-policy-ready.yaml
+      with:
+        bindings:
+        - name: name
+          value: policy-reload-on-secret-update

test/conformance/chainsaw/rbac/mutate-policy-with-clusterrole/policy-assert.yaml

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

test/conformance/chainsaw/rbac/mutate-policy-with-clusterrole/policy.yaml

@@ -1,4 +1,3 @@
----
 apiVersion: kyverno.io/v1
 kind: ClusterPolicy
 metadata: