diff --git a/test/conformance/chainsaw/deferred/dependencies/01-apply-manifests.yaml b/test/conformance/chainsaw/deferred/dependencies/01-apply-manifests.yaml deleted file mode 100644 index f2e49110e6..0000000000 --- a/test/conformance/chainsaw/deferred/dependencies/01-apply-manifests.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: apply-manifests -spec: - timeouts: {} - try: - - apply: - file: manifests.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/deferred/dependencies/02-testcase.yaml b/test/conformance/chainsaw/deferred/dependencies/02-testcase.yaml deleted file mode 100644 index 57f059f183..0000000000 --- a/test/conformance/chainsaw/deferred/dependencies/02-testcase.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: testcase -spec: - timeouts: {} - try: - - apply: - expect: - - check: - ($error != null): true - file: deploy.yaml diff --git a/test/conformance/chainsaw/deferred/dependencies/chainsaw-test.yaml b/test/conformance/chainsaw/deferred/dependencies/chainsaw-test.yaml new file mode 100755 index 0000000000..6fdd52dc67 --- /dev/null +++ b/test/conformance/chainsaw/deferred/dependencies/chainsaw-test.yaml @@ -0,0 +1,20 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: dependencies +spec: + steps: + - name: step-01 + try: + - apply: + file: manifests.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + expect: + - check: + ($error != null): true + file: deploy.yaml diff --git a/test/conformance/chainsaw/deferred/foreach/01-apply.yaml b/test/conformance/chainsaw/deferred/foreach/01-apply.yaml deleted file mode 100644 index 4139676ba0..0000000000 --- a/test/conformance/chainsaw/deferred/foreach/01-apply.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: apply -spec: - timeouts: {} - try: - - apply: - file: manifests.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/deferred/foreach/02-testcase.yaml b/test/conformance/chainsaw/deferred/foreach/02-testcase.yaml deleted file mode 100644 index cea6dfeb35..0000000000 --- a/test/conformance/chainsaw/deferred/foreach/02-testcase.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: testcase -spec: - timeouts: {} - try: - - apply: - file: cm.yaml - - assert: - file: cm-assert.yaml diff --git a/test/conformance/chainsaw/deferred/foreach/chainsaw-test.yaml b/test/conformance/chainsaw/deferred/foreach/chainsaw-test.yaml new file mode 100755 index 0000000000..bae06935a8 --- /dev/null +++ b/test/conformance/chainsaw/deferred/foreach/chainsaw-test.yaml @@ -0,0 +1,19 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: foreach +spec: + steps: + - name: step-01 + try: + - apply: + file: manifests.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + file: cm.yaml + - assert: + file: cm-assert.yaml diff --git a/test/conformance/chainsaw/deferred/recursive/01-policy.yaml b/test/conformance/chainsaw/deferred/recursive/01-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/deferred/recursive/01-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/deferred/recursive/02-resource.yaml b/test/conformance/chainsaw/deferred/recursive/02-resource.yaml deleted file mode 100644 index 07a73f22a0..0000000000 --- a/test/conformance/chainsaw/deferred/recursive/02-resource.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: resource -spec: - timeouts: {} - try: - - apply: - file: resource.yaml - - assert: - file: resource-assert.yaml diff --git a/test/conformance/chainsaw/deferred/recursive/chainsaw-test.yaml b/test/conformance/chainsaw/deferred/recursive/chainsaw-test.yaml new file mode 100755 index 0000000000..f66ee5021f --- /dev/null +++ b/test/conformance/chainsaw/deferred/recursive/chainsaw-test.yaml @@ -0,0 +1,19 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: recursive +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + file: resource.yaml + - assert: + file: resource-assert.yaml diff --git a/test/conformance/chainsaw/deferred/resolve-overriden-variable/01-policy.yaml b/test/conformance/chainsaw/deferred/resolve-overriden-variable/01-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/deferred/resolve-overriden-variable/01-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/deferred/resolve-overriden-variable/02-resource.yaml b/test/conformance/chainsaw/deferred/resolve-overriden-variable/02-resource.yaml deleted file mode 100644 index 07a73f22a0..0000000000 --- a/test/conformance/chainsaw/deferred/resolve-overriden-variable/02-resource.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: resource -spec: - timeouts: {} - try: - - apply: - file: resource.yaml - - assert: - file: resource-assert.yaml diff --git a/test/conformance/chainsaw/deferred/resolve-overriden-variable/chainsaw-test.yaml b/test/conformance/chainsaw/deferred/resolve-overriden-variable/chainsaw-test.yaml new file mode 100755 index 0000000000..ff651969a7 --- /dev/null +++ b/test/conformance/chainsaw/deferred/resolve-overriden-variable/chainsaw-test.yaml @@ -0,0 +1,19 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: resolve-overriden-variable +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + file: resource.yaml + - assert: + file: resource-assert.yaml diff --git a/test/conformance/chainsaw/deferred/two-rules/01-policy.yaml b/test/conformance/chainsaw/deferred/two-rules/01-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/deferred/two-rules/01-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/deferred/two-rules/02-resource.yaml b/test/conformance/chainsaw/deferred/two-rules/02-resource.yaml deleted file mode 100644 index 07a73f22a0..0000000000 --- a/test/conformance/chainsaw/deferred/two-rules/02-resource.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: resource -spec: - timeouts: {} - try: - - apply: - file: resource.yaml - - assert: - file: resource-assert.yaml diff --git a/test/conformance/chainsaw/deferred/two-rules/chainsaw-test.yaml b/test/conformance/chainsaw/deferred/two-rules/chainsaw-test.yaml new file mode 100755 index 0000000000..7c1bd21dbc --- /dev/null +++ b/test/conformance/chainsaw/deferred/two-rules/chainsaw-test.yaml @@ -0,0 +1,19 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: two-rules +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + file: resource.yaml + - assert: + file: resource-assert.yaml diff --git a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-fail-generation/01-crd.yaml b/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-fail-generation/01-crd.yaml deleted file mode 100644 index 36684ade76..0000000000 --- a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-fail-generation/01-crd.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: crd -spec: - timeouts: {} - try: - - apply: - file: crd.yaml - - assert: - file: crd-assert.yaml diff --git a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-fail-generation/02-policy.yaml b/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-fail-generation/02-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-fail-generation/02-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-fail-generation/03-resource.yaml b/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-fail-generation/03-resource.yaml deleted file mode 100644 index e750d48225..0000000000 --- a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-fail-generation/03-resource.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: resource -spec: - timeouts: {} - try: - - apply: - file: resource.yaml diff --git a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-fail-generation/04-sleep.yaml b/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-fail-generation/04-sleep.yaml deleted file mode 100644 index 2cb97b9e36..0000000000 --- a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-fail-generation/04-sleep.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: sleep -spec: - timeouts: {} - try: - - sleep: - duration: 3s diff --git a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-fail-generation/05-event.yaml b/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-fail-generation/05-event.yaml deleted file mode 100644 index f6a5c68a63..0000000000 --- a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-fail-generation/05-event.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: event -spec: - timeouts: {} - try: - - assert: - file: event.yaml diff --git a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-fail-generation/chainsaw-test.yaml b/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-fail-generation/chainsaw-test.yaml new file mode 100755 index 0000000000..b4dd6ab0eb --- /dev/null +++ b/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-fail-generation/chainsaw-test.yaml @@ -0,0 +1,31 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: generate-events-upon-fail-generation +spec: + steps: + - name: step-01 + try: + - apply: + file: crd.yaml + - assert: + file: crd-assert.yaml + - name: step-02 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-03 + try: + - apply: + file: resource.yaml + - name: step-04 + try: + - sleep: + duration: 3s + - name: step-05 + try: + - assert: + file: event.yaml diff --git a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-generation/01-policy.yaml b/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-generation/01-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-generation/01-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-generation/02-resource.yaml b/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-generation/02-resource.yaml deleted file mode 100644 index e750d48225..0000000000 --- a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-generation/02-resource.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: resource -spec: - timeouts: {} - try: - - apply: - file: resource.yaml diff --git a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-generation/03-sleep.yaml b/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-generation/03-sleep.yaml deleted file mode 100644 index 2cb97b9e36..0000000000 --- a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-generation/03-sleep.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: sleep -spec: - timeouts: {} - try: - - sleep: - duration: 3s diff --git a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-generation/04-event.yaml b/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-generation/04-event.yaml deleted file mode 100644 index f386e0fef6..0000000000 --- a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-generation/04-event.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: event -spec: - timeouts: {} - try: - - assert: - file: policy-event.yaml - - assert: - file: resource-event.yaml diff --git a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-generation/chainsaw-test.yaml b/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-generation/chainsaw-test.yaml new file mode 100755 index 0000000000..b29cf6bf7d --- /dev/null +++ b/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-generation/chainsaw-test.yaml @@ -0,0 +1,27 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: generate-events-upon-successful-generation +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + file: resource.yaml + - name: step-03 + try: + - sleep: + duration: 3s + - name: step-04 + try: + - assert: + file: policy-event.yaml + - assert: + file: resource-event.yaml diff --git a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-mutation/01-policy.yaml b/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-mutation/01-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-mutation/01-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-mutation/02-resource.yaml b/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-mutation/02-resource.yaml deleted file mode 100644 index e750d48225..0000000000 --- a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-mutation/02-resource.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: resource -spec: - timeouts: {} - try: - - apply: - file: resource.yaml diff --git a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-mutation/03-event.yaml b/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-mutation/03-event.yaml deleted file mode 100644 index 02b3d923aa..0000000000 --- a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-mutation/03-event.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: event -spec: - timeouts: {} - try: - - assert: - file: event-assert.yaml diff --git a/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-mutation/chainsaw-test.yaml b/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-mutation/chainsaw-test.yaml new file mode 100755 index 0000000000..2cf6e0046a --- /dev/null +++ b/test/conformance/chainsaw/events/clusterpolicy/generate-events-upon-successful-mutation/chainsaw-test.yaml @@ -0,0 +1,21 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: generate-events-upon-successful-mutation +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + file: resource.yaml + - name: step-03 + try: + - assert: + file: event-assert.yaml diff --git a/test/conformance/chainsaw/events/clusterpolicy/no-events-upon-skip-generation/01-policy.yaml b/test/conformance/chainsaw/events/clusterpolicy/no-events-upon-skip-generation/01-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/events/clusterpolicy/no-events-upon-skip-generation/01-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/events/clusterpolicy/no-events-upon-skip-generation/02-resource.yaml b/test/conformance/chainsaw/events/clusterpolicy/no-events-upon-skip-generation/02-resource.yaml deleted file mode 100644 index e750d48225..0000000000 --- a/test/conformance/chainsaw/events/clusterpolicy/no-events-upon-skip-generation/02-resource.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: resource -spec: - timeouts: {} - try: - - apply: - file: resource.yaml diff --git a/test/conformance/chainsaw/events/clusterpolicy/no-events-upon-skip-generation/03-event.yaml b/test/conformance/chainsaw/events/clusterpolicy/no-events-upon-skip-generation/03-event.yaml deleted file mode 100644 index 2455e58391..0000000000 --- a/test/conformance/chainsaw/events/clusterpolicy/no-events-upon-skip-generation/03-event.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: event -spec: - timeouts: {} - try: - - error: - file: event.yaml diff --git a/test/conformance/chainsaw/events/clusterpolicy/no-events-upon-skip-generation/chainsaw-test.yaml b/test/conformance/chainsaw/events/clusterpolicy/no-events-upon-skip-generation/chainsaw-test.yaml new file mode 100755 index 0000000000..80dc4f830f --- /dev/null +++ b/test/conformance/chainsaw/events/clusterpolicy/no-events-upon-skip-generation/chainsaw-test.yaml @@ -0,0 +1,21 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: no-events-upon-skip-generation +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + file: resource.yaml + - name: step-03 + try: + - error: + file: event.yaml diff --git a/test/conformance/chainsaw/events/policy/policy-applied/01-policy.yaml b/test/conformance/chainsaw/events/policy/policy-applied/01-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/events/policy/policy-applied/01-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/events/policy/policy-applied/02-resource.yaml b/test/conformance/chainsaw/events/policy/policy-applied/02-resource.yaml deleted file mode 100644 index e750d48225..0000000000 --- a/test/conformance/chainsaw/events/policy/policy-applied/02-resource.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: resource -spec: - timeouts: {} - try: - - apply: - file: resource.yaml diff --git a/test/conformance/chainsaw/events/policy/policy-applied/03-event.yaml b/test/conformance/chainsaw/events/policy/policy-applied/03-event.yaml deleted file mode 100644 index 02b3d923aa..0000000000 --- a/test/conformance/chainsaw/events/policy/policy-applied/03-event.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: event -spec: - timeouts: {} - try: - - assert: - file: event-assert.yaml diff --git a/test/conformance/chainsaw/events/policy/policy-applied/chainsaw-test.yaml b/test/conformance/chainsaw/events/policy/policy-applied/chainsaw-test.yaml new file mode 100755 index 0000000000..1ddc8e2f45 --- /dev/null +++ b/test/conformance/chainsaw/events/policy/policy-applied/chainsaw-test.yaml @@ -0,0 +1,21 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: policy-applied +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + file: resource.yaml + - name: step-03 + try: + - assert: + file: event-assert.yaml diff --git a/test/conformance/chainsaw/events/policy/policy-violation/01-policy.yaml b/test/conformance/chainsaw/events/policy/policy-violation/01-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/events/policy/policy-violation/01-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/events/policy/policy-violation/02-resource.yaml b/test/conformance/chainsaw/events/policy/policy-violation/02-resource.yaml deleted file mode 100644 index c90b1ac26d..0000000000 --- a/test/conformance/chainsaw/events/policy/policy-violation/02-resource.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: resource -spec: - timeouts: {} - try: - - apply: - expect: - - check: - ($error != null): true - file: resource.yaml diff --git a/test/conformance/chainsaw/events/policy/policy-violation/03-event.yaml b/test/conformance/chainsaw/events/policy/policy-violation/03-event.yaml deleted file mode 100644 index 02b3d923aa..0000000000 --- a/test/conformance/chainsaw/events/policy/policy-violation/03-event.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: event -spec: - timeouts: {} - try: - - assert: - file: event-assert.yaml diff --git a/test/conformance/chainsaw/events/policy/policy-violation/chainsaw-test.yaml b/test/conformance/chainsaw/events/policy/policy-violation/chainsaw-test.yaml new file mode 100755 index 0000000000..e1131f9b3e --- /dev/null +++ b/test/conformance/chainsaw/events/policy/policy-violation/chainsaw-test.yaml @@ -0,0 +1,24 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: policy-violation +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + expect: + - check: + ($error != null): true + file: resource.yaml + - name: step-03 + try: + - assert: + file: event-assert.yaml diff --git a/test/conformance/chainsaw/exceptions/allows-rejects-creation/01-policy.yaml b/test/conformance/chainsaw/exceptions/allows-rejects-creation/01-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/exceptions/allows-rejects-creation/01-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/exceptions/allows-rejects-creation/02-exception.yaml b/test/conformance/chainsaw/exceptions/allows-rejects-creation/02-exception.yaml deleted file mode 100644 index b5b31d4d2a..0000000000 --- a/test/conformance/chainsaw/exceptions/allows-rejects-creation/02-exception.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: exception -spec: - timeouts: {} - try: - - apply: - file: exception.yaml diff --git a/test/conformance/chainsaw/exceptions/allows-rejects-creation/03-configmap.yaml b/test/conformance/chainsaw/exceptions/allows-rejects-creation/03-configmap.yaml deleted file mode 100644 index 134374a3c7..0000000000 --- a/test/conformance/chainsaw/exceptions/allows-rejects-creation/03-configmap.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: configmap -spec: - timeouts: {} - try: - - apply: - file: configmap-allowed.yaml - - apply: - expect: - - check: - ($error != null): true - file: configmap-rejected.yaml - - assert: - file: configmap-allowed.yaml - - error: - file: configmap-rejected.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 new file mode 100755 index 0000000000..ac4502aeef --- /dev/null +++ b/test/conformance/chainsaw/exceptions/allows-rejects-creation/chainsaw-test.yaml @@ -0,0 +1,30 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: allows-rejects-creation +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + file: exception.yaml + - name: step-03 + try: + - apply: + file: configmap-allowed.yaml + - apply: + expect: + - check: + ($error != null): true + file: configmap-rejected.yaml + - assert: + file: configmap-allowed.yaml + - error: + file: configmap-rejected.yaml diff --git a/test/conformance/chainsaw/exceptions/applies-to-delete/01-policy.yaml b/test/conformance/chainsaw/exceptions/applies-to-delete/01-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/exceptions/applies-to-delete/01-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/exceptions/applies-to-delete/02-exception.yaml b/test/conformance/chainsaw/exceptions/applies-to-delete/02-exception.yaml deleted file mode 100644 index b5b31d4d2a..0000000000 --- a/test/conformance/chainsaw/exceptions/applies-to-delete/02-exception.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: exception -spec: - timeouts: {} - try: - - apply: - file: exception.yaml diff --git a/test/conformance/chainsaw/exceptions/applies-to-delete/03-namespace.yaml b/test/conformance/chainsaw/exceptions/applies-to-delete/03-namespace.yaml deleted file mode 100644 index 7f65c69636..0000000000 --- a/test/conformance/chainsaw/exceptions/applies-to-delete/03-namespace.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: namespace -spec: - timeouts: {} - try: - - apply: - file: namespace.yaml diff --git a/test/conformance/chainsaw/exceptions/applies-to-delete/04-deployment.yaml b/test/conformance/chainsaw/exceptions/applies-to-delete/04-deployment.yaml deleted file mode 100644 index 1d2a82aee4..0000000000 --- a/test/conformance/chainsaw/exceptions/applies-to-delete/04-deployment.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: deployment -spec: - timeouts: {} - try: - - apply: - file: deployment.yaml diff --git a/test/conformance/chainsaw/exceptions/applies-to-delete/05-delete.yaml b/test/conformance/chainsaw/exceptions/applies-to-delete/05-delete.yaml deleted file mode 100644 index bb2c056c57..0000000000 --- a/test/conformance/chainsaw/exceptions/applies-to-delete/05-delete.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: delete -spec: - timeouts: {} - try: - - delete: - ref: - apiVersion: apps/v1 - kind: Deployment - name: test-dpl1 - namespace: reza-dev diff --git a/test/conformance/chainsaw/exceptions/applies-to-delete/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/applies-to-delete/chainsaw-test.yaml new file mode 100755 index 0000000000..6785801f9e --- /dev/null +++ b/test/conformance/chainsaw/exceptions/applies-to-delete/chainsaw-test.yaml @@ -0,0 +1,33 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: applies-to-delete +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + file: exception.yaml + - name: step-03 + try: + - apply: + file: namespace.yaml + - name: step-04 + try: + - apply: + file: deployment.yaml + - name: step-05 + try: + - delete: + ref: + apiVersion: apps/v1 + kind: Deployment + name: test-dpl1 + namespace: reza-dev diff --git a/test/conformance/chainsaw/exceptions/background-mode/standard/01-exception.yaml b/test/conformance/chainsaw/exceptions/background-mode/standard/01-exception.yaml deleted file mode 100644 index ddace9363c..0000000000 --- a/test/conformance/chainsaw/exceptions/background-mode/standard/01-exception.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: exception -spec: - timeouts: {} - try: - - apply: - file: exception-allowed.yaml - - apply: - expect: - - check: - ($error != null): true - file: exception-rejected.yaml - - assert: - file: exception-allowed.yaml - - error: - file: exception-rejected.yaml diff --git a/test/conformance/chainsaw/exceptions/background-mode/standard/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/background-mode/standard/chainsaw-test.yaml new file mode 100755 index 0000000000..5e5e0e9ae1 --- /dev/null +++ b/test/conformance/chainsaw/exceptions/background-mode/standard/chainsaw-test.yaml @@ -0,0 +1,20 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: standard +spec: + steps: + - name: step-01 + try: + - apply: + file: exception-allowed.yaml + - apply: + expect: + - check: + ($error != null): true + file: exception-rejected.yaml + - assert: + file: exception-allowed.yaml + - error: + file: exception-rejected.yaml diff --git a/test/conformance/chainsaw/exceptions/conditions/01-policy.yaml b/test/conformance/chainsaw/exceptions/conditions/01-policy.yaml deleted file mode 100644 index cdc294f3da..0000000000 --- a/test/conformance/chainsaw/exceptions/conditions/01-policy.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml diff --git a/test/conformance/chainsaw/exceptions/conditions/02-exception.yaml b/test/conformance/chainsaw/exceptions/conditions/02-exception.yaml deleted file mode 100644 index b5b31d4d2a..0000000000 --- a/test/conformance/chainsaw/exceptions/conditions/02-exception.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: exception -spec: - timeouts: {} - try: - - apply: - file: exception.yaml diff --git a/test/conformance/chainsaw/exceptions/conditions/03-deployment.yaml b/test/conformance/chainsaw/exceptions/conditions/03-deployment.yaml deleted file mode 100644 index 5f93bdb125..0000000000 --- a/test/conformance/chainsaw/exceptions/conditions/03-deployment.yaml +++ /dev/null @@ -1,19 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: deployment -spec: - timeouts: {} - try: - - apply: - file: good-deployment.yaml - - apply: - expect: - - check: - ($error != null): true - file: bad-deployment.yaml - finally: - - sleep: - duration: 5s diff --git a/test/conformance/chainsaw/exceptions/conditions/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/conditions/chainsaw-test.yaml new file mode 100755 index 0000000000..70dbd5b672 --- /dev/null +++ b/test/conformance/chainsaw/exceptions/conditions/chainsaw-test.yaml @@ -0,0 +1,27 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: conditions +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - name: step-02 + try: + - apply: + file: exception.yaml + - finally: + - sleep: + duration: 5s + name: step-03 + try: + - apply: + file: good-deployment.yaml + - apply: + expect: + - check: + ($error != null): true + file: bad-deployment.yaml diff --git a/test/conformance/chainsaw/exceptions/events-creation/01-policy.yaml b/test/conformance/chainsaw/exceptions/events-creation/01-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/exceptions/events-creation/01-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/exceptions/events-creation/02-exception.yaml b/test/conformance/chainsaw/exceptions/events-creation/02-exception.yaml deleted file mode 100644 index ac9893ec40..0000000000 --- a/test/conformance/chainsaw/exceptions/events-creation/02-exception.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: policy-exception-events-creation-polex-ns ---- -apiVersion: kyverno.io/v2beta1 -kind: PolicyException -metadata: - name: policy-exception-allow-latest - namespace: policy-exception-events-creation-polex-ns -spec: - exceptions: - - policyName: disallow-latest-tag-events-creation - ruleNames: - - validate-image-tag - match: - any: - - resources: - namespaces: - - policy-exception-events-creation-ns diff --git a/test/conformance/chainsaw/exceptions/events-creation/04-sleep.yaml b/test/conformance/chainsaw/exceptions/events-creation/04-sleep.yaml deleted file mode 100644 index 2cb97b9e36..0000000000 --- a/test/conformance/chainsaw/exceptions/events-creation/04-sleep.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: sleep -spec: - timeouts: {} - try: - - sleep: - duration: 3s diff --git a/test/conformance/chainsaw/exceptions/events-creation/chainsaw-step-02-apply-1.yaml b/test/conformance/chainsaw/exceptions/events-creation/chainsaw-step-02-apply-1.yaml new file mode 100755 index 0000000000..841d1286c2 --- /dev/null +++ b/test/conformance/chainsaw/exceptions/events-creation/chainsaw-step-02-apply-1.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: policy-exception-events-creation-polex-ns diff --git a/test/conformance/chainsaw/exceptions/events-creation/chainsaw-step-02-apply-2.yaml b/test/conformance/chainsaw/exceptions/events-creation/chainsaw-step-02-apply-2.yaml new file mode 100755 index 0000000000..31e9e32f1d --- /dev/null +++ b/test/conformance/chainsaw/exceptions/events-creation/chainsaw-step-02-apply-2.yaml @@ -0,0 +1,15 @@ +apiVersion: kyverno.io/v2beta1 +kind: PolicyException +metadata: + name: policy-exception-allow-latest + namespace: policy-exception-events-creation-polex-ns +spec: + exceptions: + - policyName: disallow-latest-tag-events-creation + ruleNames: + - validate-image-tag + match: + any: + - resources: + namespaces: + - policy-exception-events-creation-ns diff --git a/test/conformance/chainsaw/exceptions/events-creation/chainsaw-step-03-apply-1.yaml b/test/conformance/chainsaw/exceptions/events-creation/chainsaw-step-03-apply-1.yaml new file mode 100755 index 0000000000..a62011c565 --- /dev/null +++ b/test/conformance/chainsaw/exceptions/events-creation/chainsaw-step-03-apply-1.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: policy-exception-events-creation-ns diff --git a/test/conformance/chainsaw/exceptions/events-creation/03-manifests.yaml b/test/conformance/chainsaw/exceptions/events-creation/chainsaw-step-03-apply-2.yaml old mode 100644 new mode 100755 similarity index 66% rename from test/conformance/chainsaw/exceptions/events-creation/03-manifests.yaml rename to test/conformance/chainsaw/exceptions/events-creation/chainsaw-step-03-apply-2.yaml index 8fc90f127d..4ff23410bb --- a/test/conformance/chainsaw/exceptions/events-creation/03-manifests.yaml +++ b/test/conformance/chainsaw/exceptions/events-creation/chainsaw-step-03-apply-2.yaml @@ -1,9 +1,4 @@ apiVersion: v1 -kind: Namespace -metadata: - name: policy-exception-events-creation-ns ---- -apiVersion: v1 kind: Pod metadata: name: policy-exception-events-creation-pod @@ -12,4 +7,3 @@ spec: containers: - image: nginx name: nginx - diff --git a/test/conformance/chainsaw/exceptions/events-creation/05-assert.yaml b/test/conformance/chainsaw/exceptions/events-creation/chainsaw-step-05-assert-1.yaml old mode 100644 new mode 100755 similarity index 57% rename from test/conformance/chainsaw/exceptions/events-creation/05-assert.yaml rename to test/conformance/chainsaw/exceptions/events-creation/chainsaw-step-05-assert-1.yaml index 6b27b1d1fd..feaafeeb93 --- a/test/conformance/chainsaw/exceptions/events-creation/05-assert.yaml +++ b/test/conformance/chainsaw/exceptions/events-creation/chainsaw-step-05-assert-1.yaml @@ -10,15 +10,3 @@ metadata: reason: PolicySkipped reportingComponent: kyverno-admission type: Normal ---- -apiVersion: v1 -involvedObject: - apiVersion: kyverno.io/v1 - kind: ClusterPolicy - name: disallow-latest-tag-events-creation -kind: Event -metadata: - namespace: default -reason: PolicySkipped -reportingComponent: kyverno-admission -type: Normal diff --git a/test/conformance/chainsaw/exceptions/events-creation/chainsaw-step-05-assert-2.yaml b/test/conformance/chainsaw/exceptions/events-creation/chainsaw-step-05-assert-2.yaml new file mode 100755 index 0000000000..80e264bb8a --- /dev/null +++ b/test/conformance/chainsaw/exceptions/events-creation/chainsaw-step-05-assert-2.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +involvedObject: + apiVersion: kyverno.io/v1 + kind: ClusterPolicy + name: disallow-latest-tag-events-creation +kind: Event +metadata: + namespace: default +reason: PolicySkipped +reportingComponent: kyverno-admission +type: Normal diff --git a/test/conformance/chainsaw/exceptions/events-creation/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/events-creation/chainsaw-test.yaml new file mode 100755 index 0000000000..506fc59553 --- /dev/null +++ b/test/conformance/chainsaw/exceptions/events-creation/chainsaw-test.yaml @@ -0,0 +1,35 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: events-creation +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + file: chainsaw-step-02-apply-1.yaml + - apply: + file: chainsaw-step-02-apply-2.yaml + - name: step-03 + try: + - apply: + file: chainsaw-step-03-apply-1.yaml + - apply: + file: chainsaw-step-03-apply-2.yaml + - name: step-04 + try: + - sleep: + duration: 3s + - name: step-05 + try: + - assert: + file: chainsaw-step-05-assert-1.yaml + - assert: + file: chainsaw-step-05-assert-2.yaml diff --git a/test/conformance/chainsaw/exceptions/only-for-specific-user/01-policy.yaml b/test/conformance/chainsaw/exceptions/only-for-specific-user/01-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/exceptions/only-for-specific-user/01-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/exceptions/only-for-specific-user/02-exception.yaml b/test/conformance/chainsaw/exceptions/only-for-specific-user/02-exception.yaml deleted file mode 100644 index b5b31d4d2a..0000000000 --- a/test/conformance/chainsaw/exceptions/only-for-specific-user/02-exception.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: exception -spec: - timeouts: {} - try: - - apply: - file: exception.yaml diff --git a/test/conformance/chainsaw/exceptions/only-for-specific-user/03-configmap.yaml b/test/conformance/chainsaw/exceptions/only-for-specific-user/03-configmap.yaml deleted file mode 100644 index 0f2db9adfe..0000000000 --- a/test/conformance/chainsaw/exceptions/only-for-specific-user/03-configmap.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: configmap -spec: - timeouts: {} - try: - - apply: - expect: - - check: - ($error != null): true - file: configmap.yaml 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 new file mode 100755 index 0000000000..bc6b9ad2dd --- /dev/null +++ b/test/conformance/chainsaw/exceptions/only-for-specific-user/chainsaw-test.yaml @@ -0,0 +1,24 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: only-for-specific-user +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + file: exception.yaml + - name: step-03 + try: + - apply: + expect: + - check: + ($error != null): true + file: configmap.yaml diff --git a/test/conformance/chainsaw/exceptions/with-wildcard/01-policy.yaml b/test/conformance/chainsaw/exceptions/with-wildcard/01-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/exceptions/with-wildcard/01-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/exceptions/with-wildcard/02-exception.yaml b/test/conformance/chainsaw/exceptions/with-wildcard/02-exception.yaml deleted file mode 100644 index b5b31d4d2a..0000000000 --- a/test/conformance/chainsaw/exceptions/with-wildcard/02-exception.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: exception -spec: - timeouts: {} - try: - - apply: - file: exception.yaml diff --git a/test/conformance/chainsaw/exceptions/with-wildcard/03-configmap.yaml b/test/conformance/chainsaw/exceptions/with-wildcard/03-configmap.yaml deleted file mode 100644 index 134374a3c7..0000000000 --- a/test/conformance/chainsaw/exceptions/with-wildcard/03-configmap.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: configmap -spec: - timeouts: {} - try: - - apply: - file: configmap-allowed.yaml - - apply: - expect: - - check: - ($error != null): true - file: configmap-rejected.yaml - - assert: - file: configmap-allowed.yaml - - error: - file: configmap-rejected.yaml diff --git a/test/conformance/chainsaw/exceptions/with-wildcard/chainsaw-test.yaml b/test/conformance/chainsaw/exceptions/with-wildcard/chainsaw-test.yaml new file mode 100755 index 0000000000..051482e8f5 --- /dev/null +++ b/test/conformance/chainsaw/exceptions/with-wildcard/chainsaw-test.yaml @@ -0,0 +1,30 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: with-wildcard +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + file: exception.yaml + - name: step-03 + try: + - apply: + file: configmap-allowed.yaml + - apply: + expect: + - check: + ($error != null): true + file: configmap-rejected.yaml + - assert: + file: configmap-allowed.yaml + - error: + file: configmap-rejected.yaml diff --git a/test/conformance/chainsaw/filter/exclude/sa/no-wildcard/01-policy.yaml b/test/conformance/chainsaw/filter/exclude/sa/no-wildcard/01-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/filter/exclude/sa/no-wildcard/01-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/filter/exclude/sa/no-wildcard/02-resource.yaml b/test/conformance/chainsaw/filter/exclude/sa/no-wildcard/02-resource.yaml deleted file mode 100644 index c90b1ac26d..0000000000 --- a/test/conformance/chainsaw/filter/exclude/sa/no-wildcard/02-resource.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: resource -spec: - timeouts: {} - try: - - apply: - expect: - - check: - ($error != null): true - file: resource.yaml diff --git a/test/conformance/chainsaw/filter/exclude/sa/no-wildcard/chainsaw-test.yaml b/test/conformance/chainsaw/filter/exclude/sa/no-wildcard/chainsaw-test.yaml new file mode 100755 index 0000000000..398e76b125 --- /dev/null +++ b/test/conformance/chainsaw/filter/exclude/sa/no-wildcard/chainsaw-test.yaml @@ -0,0 +1,20 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: no-wildcard +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + expect: + - check: + ($error != null): true + file: resource.yaml diff --git a/test/conformance/chainsaw/filter/exclude/sa/wildcard/01-policy.yaml b/test/conformance/chainsaw/filter/exclude/sa/wildcard/01-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/filter/exclude/sa/wildcard/01-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/filter/exclude/sa/wildcard/02-resource.yaml b/test/conformance/chainsaw/filter/exclude/sa/wildcard/02-resource.yaml deleted file mode 100644 index c90b1ac26d..0000000000 --- a/test/conformance/chainsaw/filter/exclude/sa/wildcard/02-resource.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: resource -spec: - timeouts: {} - try: - - apply: - expect: - - check: - ($error != null): true - file: resource.yaml diff --git a/test/conformance/chainsaw/filter/exclude/sa/wildcard/chainsaw-test.yaml b/test/conformance/chainsaw/filter/exclude/sa/wildcard/chainsaw-test.yaml new file mode 100755 index 0000000000..46706d5a97 --- /dev/null +++ b/test/conformance/chainsaw/filter/exclude/sa/wildcard/chainsaw-test.yaml @@ -0,0 +1,20 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: wildcard +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + expect: + - check: + ($error != null): true + file: resource.yaml diff --git a/test/conformance/chainsaw/filter/exclude/user/no-wildcard/block/01-policy.yaml b/test/conformance/chainsaw/filter/exclude/user/no-wildcard/block/01-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/filter/exclude/user/no-wildcard/block/01-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/filter/exclude/user/no-wildcard/block/02-resource.yaml b/test/conformance/chainsaw/filter/exclude/user/no-wildcard/block/02-resource.yaml deleted file mode 100644 index c90b1ac26d..0000000000 --- a/test/conformance/chainsaw/filter/exclude/user/no-wildcard/block/02-resource.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: resource -spec: - timeouts: {} - try: - - apply: - expect: - - check: - ($error != null): true - file: resource.yaml diff --git a/test/conformance/chainsaw/filter/exclude/user/no-wildcard/block/chainsaw-test.yaml b/test/conformance/chainsaw/filter/exclude/user/no-wildcard/block/chainsaw-test.yaml new file mode 100755 index 0000000000..4321e8648d --- /dev/null +++ b/test/conformance/chainsaw/filter/exclude/user/no-wildcard/block/chainsaw-test.yaml @@ -0,0 +1,20 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: block +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + expect: + - check: + ($error != null): true + file: resource.yaml diff --git a/test/conformance/chainsaw/filter/exclude/user/no-wildcard/pass/01-policy.yaml b/test/conformance/chainsaw/filter/exclude/user/no-wildcard/pass/01-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/filter/exclude/user/no-wildcard/pass/01-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/filter/exclude/user/no-wildcard/pass/02-resource.yaml b/test/conformance/chainsaw/filter/exclude/user/no-wildcard/pass/02-resource.yaml deleted file mode 100644 index e750d48225..0000000000 --- a/test/conformance/chainsaw/filter/exclude/user/no-wildcard/pass/02-resource.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: resource -spec: - timeouts: {} - try: - - apply: - file: resource.yaml diff --git a/test/conformance/chainsaw/filter/exclude/user/no-wildcard/pass/chainsaw-test.yaml b/test/conformance/chainsaw/filter/exclude/user/no-wildcard/pass/chainsaw-test.yaml new file mode 100755 index 0000000000..3161043875 --- /dev/null +++ b/test/conformance/chainsaw/filter/exclude/user/no-wildcard/pass/chainsaw-test.yaml @@ -0,0 +1,17 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: pass +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + file: resource.yaml diff --git a/test/conformance/chainsaw/filter/exclude/user/wildcard/block/01-policy.yaml b/test/conformance/chainsaw/filter/exclude/user/wildcard/block/01-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/filter/exclude/user/wildcard/block/01-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/filter/exclude/user/wildcard/block/02-resource.yaml b/test/conformance/chainsaw/filter/exclude/user/wildcard/block/02-resource.yaml deleted file mode 100644 index c90b1ac26d..0000000000 --- a/test/conformance/chainsaw/filter/exclude/user/wildcard/block/02-resource.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: resource -spec: - timeouts: {} - try: - - apply: - expect: - - check: - ($error != null): true - file: resource.yaml diff --git a/test/conformance/chainsaw/filter/exclude/user/wildcard/block/chainsaw-test.yaml b/test/conformance/chainsaw/filter/exclude/user/wildcard/block/chainsaw-test.yaml new file mode 100755 index 0000000000..4321e8648d --- /dev/null +++ b/test/conformance/chainsaw/filter/exclude/user/wildcard/block/chainsaw-test.yaml @@ -0,0 +1,20 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: block +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + expect: + - check: + ($error != null): true + file: resource.yaml diff --git a/test/conformance/chainsaw/filter/exclude/user/wildcard/pass/01-policy.yaml b/test/conformance/chainsaw/filter/exclude/user/wildcard/pass/01-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/filter/exclude/user/wildcard/pass/01-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/filter/exclude/user/wildcard/pass/02-resource.yaml b/test/conformance/chainsaw/filter/exclude/user/wildcard/pass/02-resource.yaml deleted file mode 100644 index e750d48225..0000000000 --- a/test/conformance/chainsaw/filter/exclude/user/wildcard/pass/02-resource.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: resource -spec: - timeouts: {} - try: - - apply: - file: resource.yaml diff --git a/test/conformance/chainsaw/filter/exclude/user/wildcard/pass/chainsaw-test.yaml b/test/conformance/chainsaw/filter/exclude/user/wildcard/pass/chainsaw-test.yaml new file mode 100755 index 0000000000..3161043875 --- /dev/null +++ b/test/conformance/chainsaw/filter/exclude/user/wildcard/pass/chainsaw-test.yaml @@ -0,0 +1,17 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: pass +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + file: resource.yaml diff --git a/test/conformance/chainsaw/filter/match/sa/no-wildcard/01-policy.yaml b/test/conformance/chainsaw/filter/match/sa/no-wildcard/01-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/filter/match/sa/no-wildcard/01-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/filter/match/sa/no-wildcard/02-resource.yaml b/test/conformance/chainsaw/filter/match/sa/no-wildcard/02-resource.yaml deleted file mode 100644 index e750d48225..0000000000 --- a/test/conformance/chainsaw/filter/match/sa/no-wildcard/02-resource.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: resource -spec: - timeouts: {} - try: - - apply: - file: resource.yaml diff --git a/test/conformance/chainsaw/filter/match/sa/no-wildcard/chainsaw-test.yaml b/test/conformance/chainsaw/filter/match/sa/no-wildcard/chainsaw-test.yaml new file mode 100755 index 0000000000..9dfa3a15f8 --- /dev/null +++ b/test/conformance/chainsaw/filter/match/sa/no-wildcard/chainsaw-test.yaml @@ -0,0 +1,17 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: no-wildcard +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + file: resource.yaml diff --git a/test/conformance/chainsaw/filter/match/sa/wildcard/01-policy.yaml b/test/conformance/chainsaw/filter/match/sa/wildcard/01-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/filter/match/sa/wildcard/01-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/filter/match/sa/wildcard/02-resource.yaml b/test/conformance/chainsaw/filter/match/sa/wildcard/02-resource.yaml deleted file mode 100644 index e750d48225..0000000000 --- a/test/conformance/chainsaw/filter/match/sa/wildcard/02-resource.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: resource -spec: - timeouts: {} - try: - - apply: - file: resource.yaml diff --git a/test/conformance/chainsaw/filter/match/sa/wildcard/chainsaw-test.yaml b/test/conformance/chainsaw/filter/match/sa/wildcard/chainsaw-test.yaml new file mode 100755 index 0000000000..4b3043cc47 --- /dev/null +++ b/test/conformance/chainsaw/filter/match/sa/wildcard/chainsaw-test.yaml @@ -0,0 +1,17 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: wildcard +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + file: resource.yaml diff --git a/test/conformance/chainsaw/filter/match/user/no-wildcard/block/01-policy.yaml b/test/conformance/chainsaw/filter/match/user/no-wildcard/block/01-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/filter/match/user/no-wildcard/block/01-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/filter/match/user/no-wildcard/block/02-resource.yaml b/test/conformance/chainsaw/filter/match/user/no-wildcard/block/02-resource.yaml deleted file mode 100644 index c90b1ac26d..0000000000 --- a/test/conformance/chainsaw/filter/match/user/no-wildcard/block/02-resource.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: resource -spec: - timeouts: {} - try: - - apply: - expect: - - check: - ($error != null): true - file: resource.yaml diff --git a/test/conformance/chainsaw/filter/match/user/no-wildcard/block/chainsaw-test.yaml b/test/conformance/chainsaw/filter/match/user/no-wildcard/block/chainsaw-test.yaml new file mode 100755 index 0000000000..4321e8648d --- /dev/null +++ b/test/conformance/chainsaw/filter/match/user/no-wildcard/block/chainsaw-test.yaml @@ -0,0 +1,20 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: block +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + expect: + - check: + ($error != null): true + file: resource.yaml diff --git a/test/conformance/chainsaw/filter/match/user/no-wildcard/pass/01-policy.yaml b/test/conformance/chainsaw/filter/match/user/no-wildcard/pass/01-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/filter/match/user/no-wildcard/pass/01-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/filter/match/user/no-wildcard/pass/02-resource.yaml b/test/conformance/chainsaw/filter/match/user/no-wildcard/pass/02-resource.yaml deleted file mode 100644 index e750d48225..0000000000 --- a/test/conformance/chainsaw/filter/match/user/no-wildcard/pass/02-resource.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: resource -spec: - timeouts: {} - try: - - apply: - file: resource.yaml diff --git a/test/conformance/chainsaw/filter/match/user/no-wildcard/pass/chainsaw-test.yaml b/test/conformance/chainsaw/filter/match/user/no-wildcard/pass/chainsaw-test.yaml new file mode 100755 index 0000000000..3161043875 --- /dev/null +++ b/test/conformance/chainsaw/filter/match/user/no-wildcard/pass/chainsaw-test.yaml @@ -0,0 +1,17 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: pass +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + file: resource.yaml diff --git a/test/conformance/chainsaw/filter/match/user/wildcard/block/01-policy.yaml b/test/conformance/chainsaw/filter/match/user/wildcard/block/01-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/filter/match/user/wildcard/block/01-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/filter/match/user/wildcard/block/02-resource.yaml b/test/conformance/chainsaw/filter/match/user/wildcard/block/02-resource.yaml deleted file mode 100644 index c90b1ac26d..0000000000 --- a/test/conformance/chainsaw/filter/match/user/wildcard/block/02-resource.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: resource -spec: - timeouts: {} - try: - - apply: - expect: - - check: - ($error != null): true - file: resource.yaml diff --git a/test/conformance/chainsaw/filter/match/user/wildcard/block/chainsaw-test.yaml b/test/conformance/chainsaw/filter/match/user/wildcard/block/chainsaw-test.yaml new file mode 100755 index 0000000000..4321e8648d --- /dev/null +++ b/test/conformance/chainsaw/filter/match/user/wildcard/block/chainsaw-test.yaml @@ -0,0 +1,20 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: block +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + expect: + - check: + ($error != null): true + file: resource.yaml diff --git a/test/conformance/chainsaw/filter/match/user/wildcard/pass/01-policy.yaml b/test/conformance/chainsaw/filter/match/user/wildcard/pass/01-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/filter/match/user/wildcard/pass/01-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/filter/match/user/wildcard/pass/02-resource.yaml b/test/conformance/chainsaw/filter/match/user/wildcard/pass/02-resource.yaml deleted file mode 100644 index e750d48225..0000000000 --- a/test/conformance/chainsaw/filter/match/user/wildcard/pass/02-resource.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: resource -spec: - timeouts: {} - try: - - apply: - file: resource.yaml diff --git a/test/conformance/chainsaw/filter/match/user/wildcard/pass/chainsaw-test.yaml b/test/conformance/chainsaw/filter/match/user/wildcard/pass/chainsaw-test.yaml new file mode 100755 index 0000000000..3161043875 --- /dev/null +++ b/test/conformance/chainsaw/filter/match/user/wildcard/pass/chainsaw-test.yaml @@ -0,0 +1,17 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: pass +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + file: resource.yaml diff --git a/test/conformance/chainsaw/flags/standard/emit-events/01-admission-controller-apply.yaml b/test/conformance/chainsaw/flags/standard/emit-events/01-admission-controller-apply.yaml deleted file mode 100644 index d5654449dc..0000000000 --- a/test/conformance/chainsaw/flags/standard/emit-events/01-admission-controller-apply.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: admission-controller-apply -spec: - timeouts: {} - try: - - apply: - file: admission-controller.yaml - - assert: - file: admission-controller-assert.yaml diff --git a/test/conformance/chainsaw/flags/standard/emit-events/02-policy.yaml b/test/conformance/chainsaw/flags/standard/emit-events/02-policy.yaml deleted file mode 100644 index 6134698445..0000000000 --- a/test/conformance/chainsaw/flags/standard/emit-events/02-policy.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: policy -spec: - timeouts: {} - try: - - apply: - file: policy.yaml - - assert: - file: policy-assert.yaml diff --git a/test/conformance/chainsaw/flags/standard/emit-events/03-resource.yaml b/test/conformance/chainsaw/flags/standard/emit-events/03-resource.yaml deleted file mode 100644 index dda9e3c8fa..0000000000 --- a/test/conformance/chainsaw/flags/standard/emit-events/03-resource.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: resource -spec: - timeouts: {} - try: - - apply: - file: resource.yaml - - apply: - expect: - - check: - ($error != null): true - file: resource-fail.yaml diff --git a/test/conformance/chainsaw/flags/standard/emit-events/04-event.yaml b/test/conformance/chainsaw/flags/standard/emit-events/04-event.yaml deleted file mode 100644 index 963b7a95c2..0000000000 --- a/test/conformance/chainsaw/flags/standard/emit-events/04-event.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: event -spec: - timeouts: {} - try: - - apply: - file: event-assert.yaml diff --git a/test/conformance/chainsaw/flags/standard/emit-events/05-script.yaml b/test/conformance/chainsaw/flags/standard/emit-events/05-script.yaml deleted file mode 100644 index aa4434224c..0000000000 --- a/test/conformance/chainsaw/flags/standard/emit-events/05-script.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -apiVersion: chainsaw.kyverno.io/v1alpha1 -kind: TestStep -metadata: - creationTimestamp: null - name: script -spec: - timeouts: {} - try: - - script: - content: "if kubectl logs deployment/kyverno-admission-controller -n kyverno - | grep \"reason=\\\"PolicyViolation\\\"\" \nthen \n echo \"Test succeeded. - PolicyViolation event was not created.\"\n exit 0\nelse \n echo \"Tested - failed. PolicyViolation event should have been created.\"\n exit 1\nfi\n" diff --git a/test/conformance/chainsaw/flags/standard/emit-events/chainsaw-test.yaml b/test/conformance/chainsaw/flags/standard/emit-events/chainsaw-test.yaml new file mode 100755 index 0000000000..0c382eccc7 --- /dev/null +++ b/test/conformance/chainsaw/flags/standard/emit-events/chainsaw-test.yaml @@ -0,0 +1,39 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: emit-events +spec: + steps: + - name: step-01 + try: + - apply: + file: admission-controller.yaml + - assert: + file: admission-controller-assert.yaml + - name: step-02 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-03 + try: + - apply: + file: resource.yaml + - apply: + expect: + - check: + ($error != null): true + file: resource-fail.yaml + - name: step-04 + try: + - apply: + file: event-assert.yaml + - name: step-05 + try: + - script: + content: "if kubectl logs deployment/kyverno-admission-controller -n kyverno + | grep \"reason=\\\"PolicyViolation\\\"\" \nthen \n echo \"Test succeeded. + PolicyViolation event was not created.\"\n exit 0\nelse \n echo \"Tested + failed. PolicyViolation event should have been created.\"\n exit 1\nfi\n"