From df267dd8298dc9d18972844273955d76b36a812f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charles-Edouard=20Br=C3=A9t=C3=A9ch=C3=A9?= Date: Thu, 3 Oct 2024 13:56:30 +0200 Subject: [PATCH] chore: use more chainsaw step templates (#11311) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Charles-Edouard Brétéché --- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 9 --------- .../applies-to-delete/chainsaw-test.yaml | 20 +++++++++++++------ .../applies-to-delete/policy-assert.yaml | 9 --------- .../exceptions/conditions/chainsaw-test.yaml | 18 +++++++++++++---- .../events-creation/chainsaw-test.yaml | 20 +++++++++++++------ .../events-creation/policy-assert.yaml | 9 --------- .../exclude-capabilities/chainsaw-test.yaml | 20 +++++++++++++------ .../exclude-capabilities/policy-assert.yaml | 9 --------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 9 --------- .../exclude-host-ports/chainsaw-test.yaml | 20 +++++++++++++------ .../exclude-host-ports/policy-assert.yaml | 9 --------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 9 --------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 9 --------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 9 --------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 9 --------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 9 --------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 9 --------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 9 --------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 9 --------- .../exclude-seccomp/chainsaw-test.yaml | 20 +++++++++++++------ .../exclude-seccomp/policy-assert.yaml | 9 --------- .../exclude-selinux/chainsaw-test.yaml | 20 +++++++++++++------ .../exclude-selinux/policy-assert.yaml | 9 --------- .../exclude-sysctls/chainsaw-test.yaml | 20 +++++++++++++------ .../exclude-sysctls/policy-assert.yaml | 9 --------- .../exclude-volume-types/chainsaw-test.yaml | 20 +++++++++++++------ .../exclude-volume-types/policy-assert.yaml | 9 --------- .../good-bad-conditions/chainsaw-test.yaml | 18 +++++++++++++---- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 9 --------- .../multiple-exceptions/chainsaw-test.yaml | 20 +++++++++++++------ .../multiple-exceptions/policy-assert.yaml | 9 --------- .../only-for-specific-user/chainsaw-test.yaml | 20 +++++++++++++------ .../only-for-specific-user/policy-assert.yaml | 9 --------- .../psa-run-as-non-root/chainsaw-test.yaml | 20 +++++++++++++------ .../psa-run-as-non-root/policy-assert.yaml | 9 --------- .../with-wildcard/chainsaw-test.yaml | 20 +++++++++++++------ .../with-wildcard/policy-assert.yaml | 9 --------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 9 --------- .../block-exec-in-pods/chainsaw-test.yaml | 20 +++++++++++++------ .../block-exec-in-pods/policy-assert.yaml | 10 ---------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 10 ---------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 10 ---------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 10 ---------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 10 ---------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 10 ---------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 10 ---------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 10 ---------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 10 ---------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 10 ---------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 10 ---------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 10 ---------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 10 ---------- .../cpol-with-an-exception/chainsaw-test.yaml | 20 +++++++++++++------ .../cpol-with-an-exception/policy-assert.yaml | 10 ---------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 10 ---------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 12 ----------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 12 ----------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 12 ----------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 12 ----------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 12 ----------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 12 ----------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 12 ----------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 12 ----------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 12 ----------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 12 ----------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 12 ----------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 12 ----------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 12 ----------- .../cpol-multiple-rules/chainsaw-test.yaml | 20 +++++++++++++------ .../cpol-multiple-rules/policy-assert.yaml | 12 ----------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 12 ----------- .../cpol-non-cel-rule/chainsaw-test.yaml | 20 +++++++++++++------ .../cpol-non-cel-rule/policy-assert.yaml | 12 ----------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 12 ----------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 10 ---------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 10 ---------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 10 ---------- .../chainsaw-test.yaml | 20 +++++++++++++------ .../policy-assert.yaml | 10 ---------- 122 files changed, 868 insertions(+), 978 deletions(-) delete mode 100644 test/conformance/chainsaw/exceptions/allows-rejects-creation/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/exceptions/applies-to-delete/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/exceptions/events-creation/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/exceptions/exclude-capabilities/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/exceptions/exclude-ephemeral-containers/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/exceptions/exclude-host-ports/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/exceptions/exclude-host-process-and-host-namespaces/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/exceptions/exclude-hostpath-volume/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/exceptions/exclude-privilege-escalation/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/exceptions/exclude-privileged-containers/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/exceptions/exclude-restricted-capabilities/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/exceptions/exclude-restricted-seccomp/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/exceptions/exclude-running-as-nonroot-user/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/exceptions/exclude-running-as-nonroot/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/exceptions/exclude-seccomp/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/exceptions/exclude-selinux/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/exceptions/exclude-sysctls/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/exceptions/exclude-volume-types/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/exceptions/multiple-exceptions-with-pod-security/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/exceptions/multiple-exceptions/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/exceptions/only-for-specific-user/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/exceptions/psa-run-as-non-root/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/exceptions/with-wildcard/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/block-ephemeral-containers/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/block-exec-in-pods/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-all-match-resource/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-namespace-match-resource/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-resource-match-with-namespace-selector/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-resource-match-with-object-selector/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-resource/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-match-multiple-resources/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-match-resource/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-match-resources-by-names/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-match-all-exclude-one/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-match-kind-with-wildcard/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-match-resource-in-specific-namespace/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-with-an-exception-excluding-namespaces/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-with-an-exception/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-with-two-exceptions/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-multiple-resources-with-namespace-selector/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-multiple-resources-with-object-selector/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-by-names-with-wildcard/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-in-namespaces-with-wildcard/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-with-different-namespace-selectors/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-with-different-object-selectors/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-resources-in-specific-namespace/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-resources-with-namespace-selector/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-resources-with-object-selector/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-user-and-roles/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-match-resource-created-by-user/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-match-resource-using-annotations/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-multiple-all-match-resources/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-multiple-rules/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-multiple-validation-failure-action-overrides/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-non-cel-rule/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-validation-failure-action-overrides-with-namespace/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-and-conditions/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-and-namespace-selector/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-and-object-selector/policy-assert.yaml delete mode 100644 test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-in-specific-namespace/policy-assert.yaml diff --git a/test/conformance/chainsaw/exceptions/allows-rejects-creation/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/allows-rejects-creation/chainsaw-test.yaml index f551c26c59..51dcf965bf 100755 --- a/test/conformance/chainsaw/exceptions/allows-rejects-creation/chainsaw-test.yaml +++ b/test/conformance/chainsaw/exceptions/allows-rejects-creation/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: allows-rejects-creation 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: require-labels - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/exceptions/allows-rejects-creation/policy-assert.yaml b/test/conformance/chainsaw/exceptions/allows-rejects-creation/policy-assert.yaml deleted file mode 100644 index b0bd73c54e..0000000000 --- a/test/conformance/chainsaw/exceptions/allows-rejects-creation/policy-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: require-labels -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready diff --git a/test/conformance/chainsaw/exceptions/applies-to-delete/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/applies-to-delete/chainsaw-test.yaml index d04d29e106..dd22b92212 100755 --- a/test/conformance/chainsaw/exceptions/applies-to-delete/chainsaw-test.yaml +++ b/test/conformance/chainsaw/exceptions/applies-to-delete/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: applies-to-delete 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: psa - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/exceptions/applies-to-delete/policy-assert.yaml b/test/conformance/chainsaw/exceptions/applies-to-delete/policy-assert.yaml deleted file mode 100644 index 06fe76e564..0000000000 --- a/test/conformance/chainsaw/exceptions/applies-to-delete/policy-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: psa -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready diff --git a/test/conformance/chainsaw/exceptions/conditions/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/conditions/chainsaw-test.yaml index 081f0c81ed..f11d6b5090 100755 --- a/test/conformance/chainsaw/exceptions/conditions/chainsaw-test.yaml +++ b/test/conformance/chainsaw/exceptions/conditions/chainsaw-test.yaml @@ -4,10 +4,20 @@ metadata: name: conditions spec: steps: - - name: step-01 - try: - - apply: - file: policy.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: max-containers - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/exceptions/events-creation/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/events-creation/chainsaw-test.yaml index e7fdf9b00c..a82794baac 100755 --- a/test/conformance/chainsaw/exceptions/events-creation/chainsaw-test.yaml +++ b/test/conformance/chainsaw/exceptions/events-creation/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: events-creation 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: disallow-latest-tag-events-creation - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/exceptions/events-creation/policy-assert.yaml b/test/conformance/chainsaw/exceptions/events-creation/policy-assert.yaml deleted file mode 100644 index 94acb8259d..0000000000 --- a/test/conformance/chainsaw/exceptions/events-creation/policy-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: disallow-latest-tag-events-creation -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready diff --git a/test/conformance/chainsaw/exceptions/exclude-capabilities/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/exclude-capabilities/chainsaw-test.yaml index 016614e91a..b323aa3d53 100755 --- a/test/conformance/chainsaw/exceptions/exclude-capabilities/chainsaw-test.yaml +++ b/test/conformance/chainsaw/exceptions/exclude-capabilities/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: exclude-capabilities 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: psa-1 - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/exceptions/exclude-capabilities/policy-assert.yaml b/test/conformance/chainsaw/exceptions/exclude-capabilities/policy-assert.yaml deleted file mode 100644 index d52b6efde4..0000000000 --- a/test/conformance/chainsaw/exceptions/exclude-capabilities/policy-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: psa-1 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready diff --git a/test/conformance/chainsaw/exceptions/exclude-ephemeral-containers/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/exclude-ephemeral-containers/chainsaw-test.yaml index 09ba8ea5db..71524fd28f 100644 --- a/test/conformance/chainsaw/exceptions/exclude-ephemeral-containers/chainsaw-test.yaml +++ b/test/conformance/chainsaw/exceptions/exclude-ephemeral-containers/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: exclude-ephemeral-containers 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: require-run-as-nonroot - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/exceptions/exclude-ephemeral-containers/policy-assert.yaml b/test/conformance/chainsaw/exceptions/exclude-ephemeral-containers/policy-assert.yaml deleted file mode 100644 index a26c765bcd..0000000000 --- a/test/conformance/chainsaw/exceptions/exclude-ephemeral-containers/policy-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: require-run-as-nonroot -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready diff --git a/test/conformance/chainsaw/exceptions/exclude-host-ports/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/exclude-host-ports/chainsaw-test.yaml index bd8db43ce3..d7220ce7c9 100755 --- a/test/conformance/chainsaw/exceptions/exclude-host-ports/chainsaw-test.yaml +++ b/test/conformance/chainsaw/exceptions/exclude-host-ports/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: exclude-host-ports 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: psa-3 - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/exceptions/exclude-host-ports/policy-assert.yaml b/test/conformance/chainsaw/exceptions/exclude-host-ports/policy-assert.yaml deleted file mode 100644 index 43944a468a..0000000000 --- a/test/conformance/chainsaw/exceptions/exclude-host-ports/policy-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: psa-3 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready diff --git a/test/conformance/chainsaw/exceptions/exclude-host-process-and-host-namespaces/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/exclude-host-process-and-host-namespaces/chainsaw-test.yaml index 86b298ce42..80265419c9 100755 --- a/test/conformance/chainsaw/exceptions/exclude-host-process-and-host-namespaces/chainsaw-test.yaml +++ b/test/conformance/chainsaw/exceptions/exclude-host-process-and-host-namespaces/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: exclude-host-process-and-host-namespaces 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: psa-2 - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/exceptions/exclude-host-process-and-host-namespaces/policy-assert.yaml b/test/conformance/chainsaw/exceptions/exclude-host-process-and-host-namespaces/policy-assert.yaml deleted file mode 100644 index 2fa6a45c50..0000000000 --- a/test/conformance/chainsaw/exceptions/exclude-host-process-and-host-namespaces/policy-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: psa-2 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready diff --git a/test/conformance/chainsaw/exceptions/exclude-hostpath-volume/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/exclude-hostpath-volume/chainsaw-test.yaml index 814af4e3fb..c4dbb596fa 100755 --- a/test/conformance/chainsaw/exceptions/exclude-hostpath-volume/chainsaw-test.yaml +++ b/test/conformance/chainsaw/exceptions/exclude-hostpath-volume/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: exclude-hostpath-volume 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: psa - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/exceptions/exclude-hostpath-volume/policy-assert.yaml b/test/conformance/chainsaw/exceptions/exclude-hostpath-volume/policy-assert.yaml deleted file mode 100644 index 06fe76e564..0000000000 --- a/test/conformance/chainsaw/exceptions/exclude-hostpath-volume/policy-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: psa -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready diff --git a/test/conformance/chainsaw/exceptions/exclude-privilege-escalation/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/exclude-privilege-escalation/chainsaw-test.yaml index 777faa17c4..6415923fab 100755 --- a/test/conformance/chainsaw/exceptions/exclude-privilege-escalation/chainsaw-test.yaml +++ b/test/conformance/chainsaw/exceptions/exclude-privilege-escalation/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: exclude-privilege-escalation 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: psa - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/exceptions/exclude-privilege-escalation/policy-assert.yaml b/test/conformance/chainsaw/exceptions/exclude-privilege-escalation/policy-assert.yaml deleted file mode 100644 index 06fe76e564..0000000000 --- a/test/conformance/chainsaw/exceptions/exclude-privilege-escalation/policy-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: psa -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready diff --git a/test/conformance/chainsaw/exceptions/exclude-privileged-containers/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/exclude-privileged-containers/chainsaw-test.yaml index 554ce60c1c..d72058e087 100755 --- a/test/conformance/chainsaw/exceptions/exclude-privileged-containers/chainsaw-test.yaml +++ b/test/conformance/chainsaw/exceptions/exclude-privileged-containers/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: exclude-privileged-containers 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: psa - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/exceptions/exclude-privileged-containers/policy-assert.yaml b/test/conformance/chainsaw/exceptions/exclude-privileged-containers/policy-assert.yaml deleted file mode 100644 index 06fe76e564..0000000000 --- a/test/conformance/chainsaw/exceptions/exclude-privileged-containers/policy-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: psa -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready diff --git a/test/conformance/chainsaw/exceptions/exclude-restricted-capabilities/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/exclude-restricted-capabilities/chainsaw-test.yaml index ca7f6dc760..a54a6f7d6b 100755 --- a/test/conformance/chainsaw/exceptions/exclude-restricted-capabilities/chainsaw-test.yaml +++ b/test/conformance/chainsaw/exceptions/exclude-restricted-capabilities/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: exclude-restricted-capabilities 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: psa - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/exceptions/exclude-restricted-capabilities/policy-assert.yaml b/test/conformance/chainsaw/exceptions/exclude-restricted-capabilities/policy-assert.yaml deleted file mode 100644 index 06fe76e564..0000000000 --- a/test/conformance/chainsaw/exceptions/exclude-restricted-capabilities/policy-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: psa -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready diff --git a/test/conformance/chainsaw/exceptions/exclude-restricted-seccomp/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/exclude-restricted-seccomp/chainsaw-test.yaml index cdba63eb40..04b29c5088 100755 --- a/test/conformance/chainsaw/exceptions/exclude-restricted-seccomp/chainsaw-test.yaml +++ b/test/conformance/chainsaw/exceptions/exclude-restricted-seccomp/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: exclude-restricted-seccomp 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: psa - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/exceptions/exclude-restricted-seccomp/policy-assert.yaml b/test/conformance/chainsaw/exceptions/exclude-restricted-seccomp/policy-assert.yaml deleted file mode 100644 index 06fe76e564..0000000000 --- a/test/conformance/chainsaw/exceptions/exclude-restricted-seccomp/policy-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: psa -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready diff --git a/test/conformance/chainsaw/exceptions/exclude-running-as-nonroot-user/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/exclude-running-as-nonroot-user/chainsaw-test.yaml index 35c3735546..93696aae9b 100755 --- a/test/conformance/chainsaw/exceptions/exclude-running-as-nonroot-user/chainsaw-test.yaml +++ b/test/conformance/chainsaw/exceptions/exclude-running-as-nonroot-user/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: exclude-running-as-nonroot-user 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: psa - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/exceptions/exclude-running-as-nonroot-user/policy-assert.yaml b/test/conformance/chainsaw/exceptions/exclude-running-as-nonroot-user/policy-assert.yaml deleted file mode 100644 index 06fe76e564..0000000000 --- a/test/conformance/chainsaw/exceptions/exclude-running-as-nonroot-user/policy-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: psa -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready diff --git a/test/conformance/chainsaw/exceptions/exclude-running-as-nonroot/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/exclude-running-as-nonroot/chainsaw-test.yaml index cc1d248c4e..1c2bf244a9 100755 --- a/test/conformance/chainsaw/exceptions/exclude-running-as-nonroot/chainsaw-test.yaml +++ b/test/conformance/chainsaw/exceptions/exclude-running-as-nonroot/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: exclude-running-as-nonroot 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: psa - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/exceptions/exclude-running-as-nonroot/policy-assert.yaml b/test/conformance/chainsaw/exceptions/exclude-running-as-nonroot/policy-assert.yaml deleted file mode 100644 index 06fe76e564..0000000000 --- a/test/conformance/chainsaw/exceptions/exclude-running-as-nonroot/policy-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: psa -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready diff --git a/test/conformance/chainsaw/exceptions/exclude-seccomp/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/exclude-seccomp/chainsaw-test.yaml index 6fb32d9d55..58828baab9 100755 --- a/test/conformance/chainsaw/exceptions/exclude-seccomp/chainsaw-test.yaml +++ b/test/conformance/chainsaw/exceptions/exclude-seccomp/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: exclude-seccomp 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: psa - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/exceptions/exclude-seccomp/policy-assert.yaml b/test/conformance/chainsaw/exceptions/exclude-seccomp/policy-assert.yaml deleted file mode 100644 index 06fe76e564..0000000000 --- a/test/conformance/chainsaw/exceptions/exclude-seccomp/policy-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: psa -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready diff --git a/test/conformance/chainsaw/exceptions/exclude-selinux/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/exclude-selinux/chainsaw-test.yaml index db2c3710f6..c9d47e589e 100755 --- a/test/conformance/chainsaw/exceptions/exclude-selinux/chainsaw-test.yaml +++ b/test/conformance/chainsaw/exceptions/exclude-selinux/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: exclude-selinux 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: psa - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/exceptions/exclude-selinux/policy-assert.yaml b/test/conformance/chainsaw/exceptions/exclude-selinux/policy-assert.yaml deleted file mode 100644 index 06fe76e564..0000000000 --- a/test/conformance/chainsaw/exceptions/exclude-selinux/policy-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: psa -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready diff --git a/test/conformance/chainsaw/exceptions/exclude-sysctls/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/exclude-sysctls/chainsaw-test.yaml index 9c595d72be..6abf1e6087 100755 --- a/test/conformance/chainsaw/exceptions/exclude-sysctls/chainsaw-test.yaml +++ b/test/conformance/chainsaw/exceptions/exclude-sysctls/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: exclude-sysctls 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: psa - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/exceptions/exclude-sysctls/policy-assert.yaml b/test/conformance/chainsaw/exceptions/exclude-sysctls/policy-assert.yaml deleted file mode 100644 index 06fe76e564..0000000000 --- a/test/conformance/chainsaw/exceptions/exclude-sysctls/policy-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: psa -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready diff --git a/test/conformance/chainsaw/exceptions/exclude-volume-types/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/exclude-volume-types/chainsaw-test.yaml index e1eebc5654..771fca8947 100755 --- a/test/conformance/chainsaw/exceptions/exclude-volume-types/chainsaw-test.yaml +++ b/test/conformance/chainsaw/exceptions/exclude-volume-types/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: exclude-volume-types 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: psa - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/exceptions/exclude-volume-types/policy-assert.yaml b/test/conformance/chainsaw/exceptions/exclude-volume-types/policy-assert.yaml deleted file mode 100644 index 06fe76e564..0000000000 --- a/test/conformance/chainsaw/exceptions/exclude-volume-types/policy-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: psa -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready diff --git a/test/conformance/chainsaw/exceptions/good-bad-conditions/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/good-bad-conditions/chainsaw-test.yaml index 95ecc27fb2..e3a4f228a7 100755 --- a/test/conformance/chainsaw/exceptions/good-bad-conditions/chainsaw-test.yaml +++ b/test/conformance/chainsaw/exceptions/good-bad-conditions/chainsaw-test.yaml @@ -4,10 +4,20 @@ metadata: name: conditions spec: steps: - - name: step-01 - try: - - apply: - file: policy.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: max-containers - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/exceptions/multiple-exceptions-with-pod-security/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/multiple-exceptions-with-pod-security/chainsaw-test.yaml index becd58873c..dd440a919e 100755 --- a/test/conformance/chainsaw/exceptions/multiple-exceptions-with-pod-security/chainsaw-test.yaml +++ b/test/conformance/chainsaw/exceptions/multiple-exceptions-with-pod-security/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: multiple-exceptions-with-pod-security 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: psp-baseline - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/exceptions/multiple-exceptions-with-pod-security/policy-assert.yaml b/test/conformance/chainsaw/exceptions/multiple-exceptions-with-pod-security/policy-assert.yaml deleted file mode 100644 index 21bb1a0623..0000000000 --- a/test/conformance/chainsaw/exceptions/multiple-exceptions-with-pod-security/policy-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: psp-baseline -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready diff --git a/test/conformance/chainsaw/exceptions/multiple-exceptions/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/multiple-exceptions/chainsaw-test.yaml index b08effd585..a5e61cc606 100755 --- a/test/conformance/chainsaw/exceptions/multiple-exceptions/chainsaw-test.yaml +++ b/test/conformance/chainsaw/exceptions/multiple-exceptions/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: multiple-exceptions 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: psp-baseline - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/exceptions/multiple-exceptions/policy-assert.yaml b/test/conformance/chainsaw/exceptions/multiple-exceptions/policy-assert.yaml deleted file mode 100644 index 21bb1a0623..0000000000 --- a/test/conformance/chainsaw/exceptions/multiple-exceptions/policy-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: psp-baseline -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready diff --git a/test/conformance/chainsaw/exceptions/only-for-specific-user/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/only-for-specific-user/chainsaw-test.yaml index a9b9115926..86c4cf966c 100755 --- a/test/conformance/chainsaw/exceptions/only-for-specific-user/chainsaw-test.yaml +++ b/test/conformance/chainsaw/exceptions/only-for-specific-user/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: only-for-specific-user 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: require-labels - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/exceptions/only-for-specific-user/policy-assert.yaml b/test/conformance/chainsaw/exceptions/only-for-specific-user/policy-assert.yaml deleted file mode 100644 index b0bd73c54e..0000000000 --- a/test/conformance/chainsaw/exceptions/only-for-specific-user/policy-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: require-labels -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready diff --git a/test/conformance/chainsaw/exceptions/psa-run-as-non-root/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/psa-run-as-non-root/chainsaw-test.yaml index 83b4b7e55c..c791f4fd5d 100755 --- a/test/conformance/chainsaw/exceptions/psa-run-as-non-root/chainsaw-test.yaml +++ b/test/conformance/chainsaw/exceptions/psa-run-as-non-root/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: psa-run-as-non-root 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: psp-restricted-limited - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/exceptions/psa-run-as-non-root/policy-assert.yaml b/test/conformance/chainsaw/exceptions/psa-run-as-non-root/policy-assert.yaml deleted file mode 100644 index e5855a5d4f..0000000000 --- a/test/conformance/chainsaw/exceptions/psa-run-as-non-root/policy-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: psp-restricted-limited -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready diff --git a/test/conformance/chainsaw/exceptions/with-wildcard/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/with-wildcard/chainsaw-test.yaml index af1cb8fc20..304a1b8cb3 100755 --- a/test/conformance/chainsaw/exceptions/with-wildcard/chainsaw-test.yaml +++ b/test/conformance/chainsaw/exceptions/with-wildcard/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: with-wildcard 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: require-labels - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/exceptions/with-wildcard/policy-assert.yaml b/test/conformance/chainsaw/exceptions/with-wildcard/policy-assert.yaml deleted file mode 100644 index b0bd73c54e..0000000000 --- a/test/conformance/chainsaw/exceptions/with-wildcard/policy-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: require-labels -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/block-ephemeral-containers/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/block-ephemeral-containers/chainsaw-test.yaml index 19cfe5eef0..c0169b4478 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/block-ephemeral-containers/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/block-ephemeral-containers/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: block-ephemeral-containers 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: block-ephemeral-containers - name: step-02 try: - assert: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/block-ephemeral-containers/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/block-ephemeral-containers/policy-assert.yaml deleted file mode 100644 index 5338ced9b6..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/block-ephemeral-containers/policy-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: block-ephemeral-containers -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/block-exec-in-pods/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/block-exec-in-pods/chainsaw-test.yaml index 5f063c7eb0..65eacd1fb7 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/block-exec-in-pods/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/block-exec-in-pods/chainsaw-test.yaml @@ -12,12 +12,20 @@ spec: try: - script: content: kubectl run my-pod --image nginx -n pci - - 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: deny-exec-by-namespace-name - name: step-04 try: - assert: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/block-exec-in-pods/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/block-exec-in-pods/policy-assert.yaml deleted file mode 100644 index b8c57dccac..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/block-exec-in-pods/policy-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: deny-exec-by-namespace-name -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-all-match-resource/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-all-match-resource/chainsaw-test.yaml index 20f6cabb1d..e6959d4477 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-all-match-resource/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-all-match-resource/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-all-match-resource 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: disallow-host-path-t9 - name: step-02 try: - assert: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-all-match-resource/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-all-match-resource/policy-assert.yaml deleted file mode 100644 index fccfb6ff13..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-all-match-resource/policy-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: disallow-host-path-t9 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-namespace-match-resource/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-namespace-match-resource/chainsaw-test.yaml index 36665f7672..fdab6c8329 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-namespace-match-resource/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-namespace-match-resource/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-any-exclude-namespace-match-resource 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: disallow-host-path-t16 - name: step-02 try: - assert: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-namespace-match-resource/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-namespace-match-resource/policy-assert.yaml deleted file mode 100644 index 9fa3bfcebc..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-namespace-match-resource/policy-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: disallow-host-path-t16 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-resource-match-with-namespace-selector/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-resource-match-with-namespace-selector/chainsaw-test.yaml index 0d93b79a0b..530544e8b4 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-resource-match-with-namespace-selector/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-resource-match-with-namespace-selector/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-any-exclude-resource-match-with-namespace-selector 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: disallow-host-path-t14 - name: step-02 try: - assert: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-resource-match-with-namespace-selector/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-resource-match-with-namespace-selector/policy-assert.yaml deleted file mode 100644 index ae26488559..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-resource-match-with-namespace-selector/policy-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: disallow-host-path-t14 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-resource-match-with-object-selector/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-resource-match-with-object-selector/chainsaw-test.yaml index aea211c2b8..4ec561a890 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-resource-match-with-object-selector/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-resource-match-with-object-selector/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-any-exclude-resource-match-with-object-selector 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: disallow-host-path-t15 - name: step-02 try: - assert: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-resource-match-with-object-selector/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-resource-match-with-object-selector/policy-assert.yaml deleted file mode 100644 index ef00059ee3..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-resource-match-with-object-selector/policy-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: disallow-host-path-t15 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-resource/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-resource/chainsaw-test.yaml index da0652f3dc..9b248cd51b 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-resource/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-resource/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-any-exclude-resource 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: disallow-host-path-t13 - name: step-02 try: - assert: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-resource/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-resource/policy-assert.yaml deleted file mode 100644 index a1336840e0..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-exclude-resource/policy-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: disallow-host-path-t13 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-match-multiple-resources/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-match-multiple-resources/chainsaw-test.yaml index 1e3ab8b9e9..c5d1b8acf8 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-match-multiple-resources/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-match-multiple-resources/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-any-match-multiple-resources 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: disallow-host-path-t8 - name: step-02 try: - assert: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-match-multiple-resources/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-match-multiple-resources/policy-assert.yaml deleted file mode 100644 index 9c88b7a2cf..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-match-multiple-resources/policy-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: disallow-host-path-t8 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-match-resource/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-match-resource/chainsaw-test.yaml index 33d74f4946..83c3c5100b 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-match-resource/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-match-resource/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-any-match-resource 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: disallow-host-path-t7 - name: step-02 try: - assert: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-match-resource/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-match-resource/policy-assert.yaml deleted file mode 100644 index 77b0a34dbd..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-match-resource/policy-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: disallow-host-path-t7 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-match-resources-by-names/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-match-resources-by-names/chainsaw-test.yaml index 5f19a22fb6..3e7df5e42f 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-match-resources-by-names/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-match-resources-by-names/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-any-match-resources-by-names 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: check-label-app-4 - name: step-02 try: - assert: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-match-resources-by-names/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-match-resources-by-names/policy-assert.yaml deleted file mode 100644 index 84f521fe9a..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-any-match-resources-by-names/policy-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: check-label-app-4 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-match-all-exclude-one/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-match-all-exclude-one/chainsaw-test.yaml index 25b07af635..500ba1ba28 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-match-all-exclude-one/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-match-all-exclude-one/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-match-all-exclude-one 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: check-label-app5 - name: step-02 try: - assert: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-match-all-exclude-one/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-match-all-exclude-one/policy-assert.yaml deleted file mode 100644 index 1832ab5a1d..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-match-all-exclude-one/policy-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: check-label-app5 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-match-kind-with-wildcard/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-match-kind-with-wildcard/chainsaw-test.yaml index c542217917..9d047c7ba6 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-match-kind-with-wildcard/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-match-kind-with-wildcard/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-match-kind-with-wildcard 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: check-label-app4 - name: step-02 try: - assert: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-match-kind-with-wildcard/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-match-kind-with-wildcard/policy-assert.yaml deleted file mode 100644 index 6f9a1a79ab..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-match-kind-with-wildcard/policy-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: check-label-app4 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-match-resource-in-specific-namespace/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-match-resource-in-specific-namespace/chainsaw-test.yaml index f4d0bf124f..36975fd013 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-match-resource-in-specific-namespace/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-match-resource-in-specific-namespace/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-match-resource-in-specific-namespace 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: disallow-host-path-t4 - name: step-02 try: - assert: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-match-resource-in-specific-namespace/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-match-resource-in-specific-namespace/policy-assert.yaml deleted file mode 100644 index d53165009e..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-match-resource-in-specific-namespace/policy-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: disallow-host-path-t4 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-with-an-exception-excluding-namespaces/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-with-an-exception-excluding-namespaces/chainsaw-test.yaml index 9ef97baa25..ff98e23045 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-with-an-exception-excluding-namespaces/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-with-an-exception-excluding-namespaces/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-with-an-exception-excluding-namespaces 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: disallow-host-path - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-with-an-exception-excluding-namespaces/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-with-an-exception-excluding-namespaces/policy-assert.yaml deleted file mode 100644 index a94129f63c..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-with-an-exception-excluding-namespaces/policy-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: disallow-host-path -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-with-an-exception/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-with-an-exception/chainsaw-test.yaml index 2aa94dc569..6dd0201f6e 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-with-an-exception/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-with-an-exception/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-with-an-exception 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: disallow-host-path - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-with-an-exception/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-with-an-exception/policy-assert.yaml deleted file mode 100644 index a94129f63c..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-with-an-exception/policy-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: disallow-host-path -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-with-two-exceptions/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-with-two-exceptions/chainsaw-test.yaml index 64e9813339..e9d1e02ca2 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-with-two-exceptions/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-with-two-exceptions/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-with-two-exceptions 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: disallow-host-path - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-with-two-exceptions/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-with-two-exceptions/policy-assert.yaml deleted file mode 100644 index a94129f63c..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/generate/cpol-with-two-exceptions/policy-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: disallow-host-path -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-multiple-resources-with-namespace-selector/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-multiple-resources-with-namespace-selector/chainsaw-test.yaml index a5f505f8f5..1c729109a1 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-multiple-resources-with-namespace-selector/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-multiple-resources-with-namespace-selector/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-any-match-multiple-resources-with-namespace-selector 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: disallow-host-path-t12 - name: step-02 try: - error: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-multiple-resources-with-namespace-selector/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-multiple-resources-with-namespace-selector/policy-assert.yaml deleted file mode 100644 index 323d6ee9f6..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-multiple-resources-with-namespace-selector/policy-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: disallow-host-path-t12 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - validatingadmissionpolicy: - generated: false - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-multiple-resources-with-object-selector/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-multiple-resources-with-object-selector/chainsaw-test.yaml index c4af4924e2..3f1d19ad72 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-multiple-resources-with-object-selector/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-multiple-resources-with-object-selector/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-any-match-multiple-resources-with-object-selector 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: disallow-host-path-t13 - name: step-02 try: - error: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-multiple-resources-with-object-selector/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-multiple-resources-with-object-selector/policy-assert.yaml deleted file mode 100644 index d2744f406f..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-multiple-resources-with-object-selector/policy-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: disallow-host-path-t13 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - validatingadmissionpolicy: - generated: false - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-by-names-with-wildcard/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-by-names-with-wildcard/chainsaw-test.yaml index 412b228b4f..0071dc8a0d 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-by-names-with-wildcard/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-by-names-with-wildcard/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-any-match-resources-by-names-with-wildcard 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: check-label-app-3 - name: step-02 try: - error: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-by-names-with-wildcard/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-by-names-with-wildcard/policy-assert.yaml deleted file mode 100644 index 08d8e3b4f1..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-by-names-with-wildcard/policy-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: check-label-app-3 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - validatingadmissionpolicy: - generated: false - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-in-namespaces-with-wildcard/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-in-namespaces-with-wildcard/chainsaw-test.yaml index 965efdf609..ba9d9aabd5 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-in-namespaces-with-wildcard/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-in-namespaces-with-wildcard/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-any-match-resources-in-namespaces-with-wildcard 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: check-label-app-5 - name: step-02 try: - error: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-in-namespaces-with-wildcard/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-in-namespaces-with-wildcard/policy-assert.yaml deleted file mode 100644 index 3835a186ef..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-in-namespaces-with-wildcard/policy-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: check-label-app-5 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - validatingadmissionpolicy: - generated: false - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-with-different-namespace-selectors/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-with-different-namespace-selectors/chainsaw-test.yaml index 1f3fadb2e1..9e65db163d 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-with-different-namespace-selectors/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-with-different-namespace-selectors/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-any-match-resources-with-different-namespace-selectors 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: disallow-host-path-t1 - name: step-02 try: - error: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-with-different-namespace-selectors/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-with-different-namespace-selectors/policy-assert.yaml deleted file mode 100644 index c9d17aa00e..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-with-different-namespace-selectors/policy-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: disallow-host-path-t1 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - validatingadmissionpolicy: - generated: false - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-with-different-object-selectors/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-with-different-object-selectors/chainsaw-test.yaml index 4941a04ccb..6b774125b4 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-with-different-object-selectors/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-with-different-object-selectors/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-any-match-resources-with-different-object-selectors 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: disallow-host-path-t2 - name: step-02 try: - error: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-with-different-object-selectors/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-with-different-object-selectors/policy-assert.yaml deleted file mode 100644 index 98b1754f99..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-any-match-resources-with-different-object-selectors/policy-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: disallow-host-path-t2 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - validatingadmissionpolicy: - generated: false - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-resources-in-specific-namespace/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-resources-in-specific-namespace/chainsaw-test.yaml index 72fc7cc93f..2a4b0a21e1 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-resources-in-specific-namespace/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-resources-in-specific-namespace/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-exclude-resources-in-specific-namespace 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: disallow-host-path-t17 - name: step-02 try: - error: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-resources-in-specific-namespace/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-resources-in-specific-namespace/policy-assert.yaml deleted file mode 100644 index 7532997b0a..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-resources-in-specific-namespace/policy-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: disallow-host-path-t17 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - validatingadmissionpolicy: - generated: false - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-resources-with-namespace-selector/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-resources-with-namespace-selector/chainsaw-test.yaml index 364fc60c35..d8f5a816df 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-resources-with-namespace-selector/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-resources-with-namespace-selector/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-exclude-resources-with-namespace-selector 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: disallow-host-path-t10 - name: step-02 try: - error: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-resources-with-namespace-selector/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-resources-with-namespace-selector/policy-assert.yaml deleted file mode 100644 index 1ab5a9ae42..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-resources-with-namespace-selector/policy-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: disallow-host-path-t10 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - validatingadmissionpolicy: - generated: false - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-resources-with-object-selector/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-resources-with-object-selector/chainsaw-test.yaml index 88f6a3b253..0817ed6445 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-resources-with-object-selector/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-resources-with-object-selector/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-exclude-resources-with-object-selector 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: check-label-app2 - name: step-02 try: - error: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-resources-with-object-selector/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-resources-with-object-selector/policy-assert.yaml deleted file mode 100644 index d9fd0b2ed9..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-resources-with-object-selector/policy-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: check-label-app2 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - validatingadmissionpolicy: - generated: false - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-user-and-roles/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-user-and-roles/chainsaw-test.yaml index 601f0e39c9..46b649ef56 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-user-and-roles/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-user-and-roles/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-exclude-user-and-roles 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: check-label-app1 - name: step-02 try: - error: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-user-and-roles/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-user-and-roles/policy-assert.yaml deleted file mode 100644 index 648f5587c5..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-exclude-user-and-roles/policy-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: check-label-app1 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - validatingadmissionpolicy: - generated: false - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-match-resource-created-by-user/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-match-resource-created-by-user/chainsaw-test.yaml index f76d16e1cb..29c9dd371c 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-match-resource-created-by-user/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-match-resource-created-by-user/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-match-resource-created-by-user 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: disallow-host-path-t3 - name: step-02 try: - error: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-match-resource-created-by-user/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-match-resource-created-by-user/policy-assert.yaml deleted file mode 100644 index d3f9a92d87..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-match-resource-created-by-user/policy-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: disallow-host-path-t3 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - validatingadmissionpolicy: - generated: false - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-match-resource-using-annotations/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-match-resource-using-annotations/chainsaw-test.yaml index 14c8988cce..9d41b393f2 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-match-resource-using-annotations/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-match-resource-using-annotations/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-match-resource-using-annotations 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: disallow-host-path-t5 - name: step-02 try: - error: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-match-resource-using-annotations/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-match-resource-using-annotations/policy-assert.yaml deleted file mode 100644 index c3d69e0267..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-match-resource-using-annotations/policy-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: disallow-host-path-t5 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - validatingadmissionpolicy: - generated: false - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-multiple-all-match-resources/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-multiple-all-match-resources/chainsaw-test.yaml index 4b0b308083..c48dfe3e19 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-multiple-all-match-resources/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-multiple-all-match-resources/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-multiple-all-match-resources 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: disallow-host-path-t6 - name: step-02 try: - error: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-multiple-all-match-resources/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-multiple-all-match-resources/policy-assert.yaml deleted file mode 100644 index 7c73691cf1..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-multiple-all-match-resources/policy-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: disallow-host-path-t6 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - validatingadmissionpolicy: - generated: false - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-multiple-rules/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-multiple-rules/chainsaw-test.yaml index a49937f5a1..937f9c6282 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-multiple-rules/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-multiple-rules/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-multiple-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: disallow-latest-tag - name: step-02 try: - error: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-multiple-rules/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-multiple-rules/policy-assert.yaml deleted file mode 100644 index df4ca39630..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-multiple-rules/policy-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: disallow-latest-tag -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - validatingadmissionpolicy: - generated: false - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-multiple-validation-failure-action-overrides/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-multiple-validation-failure-action-overrides/chainsaw-test.yaml index a43fcf24cd..33bbe954b8 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-multiple-validation-failure-action-overrides/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-multiple-validation-failure-action-overrides/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-multiple-validation-failure-action-overrides 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: check-label-app - name: step-02 try: - error: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-multiple-validation-failure-action-overrides/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-multiple-validation-failure-action-overrides/policy-assert.yaml deleted file mode 100644 index 23b9b4f439..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-multiple-validation-failure-action-overrides/policy-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: check-label-app -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - validatingadmissionpolicy: - generated: false - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-non-cel-rule/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-non-cel-rule/chainsaw-test.yaml index 72b57cbea7..29e97707b1 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-non-cel-rule/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-non-cel-rule/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-non-cel-rule 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: require-ns-purpose-label - name: step-02 try: - error: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-non-cel-rule/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-non-cel-rule/policy-assert.yaml deleted file mode 100644 index 44abe1bb6c..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-non-cel-rule/policy-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: require-ns-purpose-label -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - validatingadmissionpolicy: - generated: false - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-validation-failure-action-overrides-with-namespace/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-validation-failure-action-overrides-with-namespace/chainsaw-test.yaml index a1cfc0c5ac..d7904967da 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-validation-failure-action-overrides-with-namespace/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-validation-failure-action-overrides-with-namespace/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-validation-failure-action-overrides-with-namespace 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: check-label-app1 - name: step-02 try: - error: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-validation-failure-action-overrides-with-namespace/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-validation-failure-action-overrides-with-namespace/policy-assert.yaml deleted file mode 100644 index 648f5587c5..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-validation-failure-action-overrides-with-namespace/policy-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: check-label-app1 -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - validatingadmissionpolicy: - generated: false - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-and-conditions/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-and-conditions/chainsaw-test.yaml index 2a533fa18c..98209d0685 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-and-conditions/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-and-conditions/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-with-exceptions-and-conditions 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: disallow-host-path - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-and-conditions/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-and-conditions/policy-assert.yaml deleted file mode 100644 index a94129f63c..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-and-conditions/policy-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: disallow-host-path -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-and-namespace-selector/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-and-namespace-selector/chainsaw-test.yaml index 034cdfe904..8f3174c295 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-and-namespace-selector/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-and-namespace-selector/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-with-exception-and-namesapce-selector 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: disallow-host-path - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-and-namespace-selector/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-and-namespace-selector/policy-assert.yaml deleted file mode 100644 index a94129f63c..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-and-namespace-selector/policy-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: disallow-host-path -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-and-object-selector/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-and-object-selector/chainsaw-test.yaml index 5fe37764ff..f917470c58 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-and-object-selector/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-and-object-selector/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-with-exception-and-object-selector 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: disallow-host-path - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-and-object-selector/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-and-object-selector/policy-assert.yaml deleted file mode 100644 index a94129f63c..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-and-object-selector/policy-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: disallow-host-path -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - \ No newline at end of file diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-in-specific-namespace/chainsaw-test.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-in-specific-namespace/chainsaw-test.yaml index b153378a65..b0323cf5b6 100755 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-in-specific-namespace/chainsaw-test.yaml +++ b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-in-specific-namespace/chainsaw-test.yaml @@ -4,12 +4,20 @@ metadata: name: cpol-with-exception-in-specific-namespace 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: disallow-host-path - name: step-02 try: - apply: diff --git a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-in-specific-namespace/policy-assert.yaml b/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-in-specific-namespace/policy-assert.yaml deleted file mode 100644 index a94129f63c..0000000000 --- a/test/conformance/chainsaw/generate-validating-admission-policy/clusterpolicy/standard/skip-generate/cpol-with-exception-in-specific-namespace/policy-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kyverno.io/v1 -kind: ClusterPolicy -metadata: - name: disallow-host-path -status: - conditions: - - reason: Succeeded - status: "True" - type: Ready - \ No newline at end of file