From b2f8677909cffdb7ea70ec03b01498d72ee1a825 Mon Sep 17 00:00:00 2001 From: Mariam Fahmy Date: Tue, 29 Aug 2023 15:19:46 +0300 Subject: [PATCH] fix kuttl test (#8156) Signed-off-by: Mariam Fahmy --- .../cel/parameter-resources/clusterscoped/03-sleep.yaml | 4 ++++ .../clusterscoped/{03-policy.yaml => 04-policy.yaml} | 0 .../clusterscoped/{04-ns.yaml => 05-ns.yaml} | 0 .../cel/parameter-resources/clusterscoped/crd-assert.yaml | 8 +++++++- .../match-clusterscoped-resource/crd-assert.yaml | 8 +++++++- .../namespaced/set-paramref-namespace/crd-assert.yaml | 8 +++++++- .../namespaced/unset-paramref-namespace/crd-assert.yaml | 8 +++++++- 7 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/clusterscoped/03-sleep.yaml rename test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/clusterscoped/{03-policy.yaml => 04-policy.yaml} (100%) rename test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/clusterscoped/{04-ns.yaml => 05-ns.yaml} (100%) diff --git a/test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/clusterscoped/03-sleep.yaml b/test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/clusterscoped/03-sleep.yaml new file mode 100644 index 0000000000..2b5a014e64 --- /dev/null +++ b/test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/clusterscoped/03-sleep.yaml @@ -0,0 +1,4 @@ +apiVersion: kuttl.dev/v1beta1 +kind: TestStep +commands: + - command: sleep 4 diff --git a/test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/clusterscoped/03-policy.yaml b/test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/clusterscoped/04-policy.yaml similarity index 100% rename from test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/clusterscoped/03-policy.yaml rename to test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/clusterscoped/04-policy.yaml diff --git a/test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/clusterscoped/04-ns.yaml b/test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/clusterscoped/05-ns.yaml similarity index 100% rename from test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/clusterscoped/04-ns.yaml rename to test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/clusterscoped/05-ns.yaml diff --git a/test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/clusterscoped/crd-assert.yaml b/test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/clusterscoped/crd-assert.yaml index aa0900310e..e21ee264bf 100644 --- a/test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/clusterscoped/crd-assert.yaml +++ b/test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/clusterscoped/crd-assert.yaml @@ -1,4 +1,10 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: namespaceconstraints.rules.example.com \ No newline at end of file + name: namespaceconstraints.rules.example.com +status: + acceptedNames: + kind: NamespaceConstraint + plural: namespaceconstraints + storedVersions: + - v1 \ No newline at end of file diff --git a/test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/namespaced/match-clusterscoped-resource/crd-assert.yaml b/test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/namespaced/match-clusterscoped-resource/crd-assert.yaml index 88ad3ee9b4..7c08e10e7e 100644 --- a/test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/namespaced/match-clusterscoped-resource/crd-assert.yaml +++ b/test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/namespaced/match-clusterscoped-resource/crd-assert.yaml @@ -1,4 +1,10 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: nameconstraints.rules.example.com \ No newline at end of file + name: nameconstraints.rules.example.com +status: + acceptedNames: + kind: NameConstraint + plural: nameconstraints + storedVersions: + - v1 \ No newline at end of file diff --git a/test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/namespaced/set-paramref-namespace/crd-assert.yaml b/test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/namespaced/set-paramref-namespace/crd-assert.yaml index 8a52042686..cf7b13cc9f 100644 --- a/test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/namespaced/set-paramref-namespace/crd-assert.yaml +++ b/test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/namespaced/set-paramref-namespace/crd-assert.yaml @@ -1,4 +1,10 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: replicalimits.rules.example.com \ No newline at end of file + name: replicalimits.rules.example.com +status: + acceptedNames: + kind: ReplicaLimit + plural: replicalimits + storedVersions: + - v1 \ No newline at end of file diff --git a/test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/namespaced/unset-paramref-namespace/crd-assert.yaml b/test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/namespaced/unset-paramref-namespace/crd-assert.yaml index 8a52042686..cf7b13cc9f 100644 --- a/test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/namespaced/unset-paramref-namespace/crd-assert.yaml +++ b/test/conformance/kuttl/validate/clusterpolicy/standard/cel/parameter-resources/namespaced/unset-paramref-namespace/crd-assert.yaml @@ -1,4 +1,10 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: replicalimits.rules.example.com \ No newline at end of file + name: replicalimits.rules.example.com +status: + acceptedNames: + kind: ReplicaLimit + plural: replicalimits + storedVersions: + - v1 \ No newline at end of file