From 601541c1470551ec90cd8e4db02202767cc33d51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charles-Edouard=20Br=C3=A9t=C3=A9ch=C3=A9?= Date: Wed, 28 Dec 2022 06:40:07 +0100 Subject: [PATCH] chore: switch to kyverno/kuttl (#5504) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: swith to kyverno/kuttl Signed-off-by: Charles-Edouard Brétéché * fix Signed-off-by: Charles-Edouard Brétéché * fix Signed-off-by: Charles-Edouard Brétéché * pin version Signed-off-by: Charles-Edouard Brétéché * fix Signed-off-by: Charles-Edouard Brétéché Signed-off-by: Charles-Edouard Brétéché Signed-off-by: Charles-Edouard Brétéché Co-authored-by: Sambhav Kothari --- Makefile | 4 +-- .../01-assert.yaml | 0 .../01-manifests.yaml | 0 .../02-assert.yaml | 0 .../02-secret.yaml | 0 .../03-delete.yaml | 0 .../05-errors.yaml | 0 .../99-cleanup.yaml | 0 .../BEST_PRACTICES.md | 0 .../README.md | 0 .../commands/04-sleep.yaml | 0 .../commands/99-cleanup.yaml | 0 .../scaffold/01-policy.yaml | 0 .../scaffold/02-resource.yaml | 0 .../scaffold/README.md | 0 .../scaffold/errors.yaml | 0 .../scaffold/ns.yaml | 0 .../scaffold/policy-ready.yaml | 0 .../scaffold/policy.yaml | 0 .../scaffold/resource-mutated.yaml | 0 .../scaffold/resource.yaml | 0 .../scaffold/script-check-for-error.yaml | 0 .../scripts/01-script-check-for-error.yaml | 0 .../scripts/02-script-check-for-output.yaml | 0 test/conformance/kuttl/kuttl-test.yaml | 36 ++----------------- 25 files changed, 5 insertions(+), 35 deletions(-) rename test/conformance/kuttl/{aaa_template_resources => _aaa_template_resources}/01-assert.yaml (100%) rename test/conformance/kuttl/{aaa_template_resources => _aaa_template_resources}/01-manifests.yaml (100%) rename test/conformance/kuttl/{aaa_template_resources => _aaa_template_resources}/02-assert.yaml (100%) rename test/conformance/kuttl/{aaa_template_resources => _aaa_template_resources}/02-secret.yaml (100%) rename test/conformance/kuttl/{aaa_template_resources => _aaa_template_resources}/03-delete.yaml (100%) rename test/conformance/kuttl/{aaa_template_resources => _aaa_template_resources}/05-errors.yaml (100%) rename test/conformance/kuttl/{aaa_template_resources => _aaa_template_resources}/99-cleanup.yaml (100%) rename test/conformance/kuttl/{aaa_template_resources => _aaa_template_resources}/BEST_PRACTICES.md (100%) rename test/conformance/kuttl/{aaa_template_resources => _aaa_template_resources}/README.md (100%) rename test/conformance/kuttl/{aaa_template_resources => _aaa_template_resources}/commands/04-sleep.yaml (100%) rename test/conformance/kuttl/{aaa_template_resources => _aaa_template_resources}/commands/99-cleanup.yaml (100%) rename test/conformance/kuttl/{aaa_template_resources => _aaa_template_resources}/scaffold/01-policy.yaml (100%) rename test/conformance/kuttl/{aaa_template_resources => _aaa_template_resources}/scaffold/02-resource.yaml (100%) rename test/conformance/kuttl/{aaa_template_resources => _aaa_template_resources}/scaffold/README.md (100%) rename test/conformance/kuttl/{aaa_template_resources => _aaa_template_resources}/scaffold/errors.yaml (100%) rename test/conformance/kuttl/{aaa_template_resources => _aaa_template_resources}/scaffold/ns.yaml (100%) rename test/conformance/kuttl/{aaa_template_resources => _aaa_template_resources}/scaffold/policy-ready.yaml (100%) rename test/conformance/kuttl/{aaa_template_resources => _aaa_template_resources}/scaffold/policy.yaml (100%) rename test/conformance/kuttl/{aaa_template_resources => _aaa_template_resources}/scaffold/resource-mutated.yaml (100%) rename test/conformance/kuttl/{aaa_template_resources => _aaa_template_resources}/scaffold/resource.yaml (100%) rename test/conformance/kuttl/{aaa_template_resources => _aaa_template_resources}/scaffold/script-check-for-error.yaml (100%) rename test/conformance/kuttl/{aaa_template_resources => _aaa_template_resources}/scripts/01-script-check-for-error.yaml (100%) rename test/conformance/kuttl/{aaa_template_resources => _aaa_template_resources}/scripts/02-script-check-for-output.yaml (100%) diff --git a/Makefile b/Makefile index 6458dc84d5..abe34a924a 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ HELM_DOCS_VERSION := v1.11.0 KO := $(TOOLS_DIR)/ko KO_VERSION := main #e93dbee8540f28c45ec9a2b8aec5ef8e43123966 KUTTL := $(TOOLS_DIR)/kubectl-kuttl -KUTTL_VERSION := v0.14.0 +KUTTL_VERSION := v0.0.0-20221129212128-ae4a56e607a7 TOOLS := $(KIND) $(CONTROLLER_GEN) $(CLIENT_GEN) $(LISTER_GEN) $(INFORMER_GEN) $(OPENAPI_GEN) $(GEN_CRD_API_REFERENCE_DOCS) $(GO_ACC) $(GOIMPORTS) $(HELM) $(HELM_DOCS) $(KO) $(KUTTL) ifeq ($(GOOS), darwin) SED := gsed @@ -117,7 +117,7 @@ $(KO): $(KUTTL): @echo Install kuttl... >&2 - @GOBIN=$(TOOLS_DIR) go install github.com/kudobuilder/kuttl/cmd/kubectl-kuttl@$(KUTTL_VERSION) + @GOBIN=$(TOOLS_DIR) go install github.com/kyverno/kuttl/cmd/kubectl-kuttl@$(KUTTL_VERSION) .PHONY: install-tools install-tools: $(TOOLS) ## Install tools diff --git a/test/conformance/kuttl/aaa_template_resources/01-assert.yaml b/test/conformance/kuttl/_aaa_template_resources/01-assert.yaml similarity index 100% rename from test/conformance/kuttl/aaa_template_resources/01-assert.yaml rename to test/conformance/kuttl/_aaa_template_resources/01-assert.yaml diff --git a/test/conformance/kuttl/aaa_template_resources/01-manifests.yaml b/test/conformance/kuttl/_aaa_template_resources/01-manifests.yaml similarity index 100% rename from test/conformance/kuttl/aaa_template_resources/01-manifests.yaml rename to test/conformance/kuttl/_aaa_template_resources/01-manifests.yaml diff --git a/test/conformance/kuttl/aaa_template_resources/02-assert.yaml b/test/conformance/kuttl/_aaa_template_resources/02-assert.yaml similarity index 100% rename from test/conformance/kuttl/aaa_template_resources/02-assert.yaml rename to test/conformance/kuttl/_aaa_template_resources/02-assert.yaml diff --git a/test/conformance/kuttl/aaa_template_resources/02-secret.yaml b/test/conformance/kuttl/_aaa_template_resources/02-secret.yaml similarity index 100% rename from test/conformance/kuttl/aaa_template_resources/02-secret.yaml rename to test/conformance/kuttl/_aaa_template_resources/02-secret.yaml diff --git a/test/conformance/kuttl/aaa_template_resources/03-delete.yaml b/test/conformance/kuttl/_aaa_template_resources/03-delete.yaml similarity index 100% rename from test/conformance/kuttl/aaa_template_resources/03-delete.yaml rename to test/conformance/kuttl/_aaa_template_resources/03-delete.yaml diff --git a/test/conformance/kuttl/aaa_template_resources/05-errors.yaml b/test/conformance/kuttl/_aaa_template_resources/05-errors.yaml similarity index 100% rename from test/conformance/kuttl/aaa_template_resources/05-errors.yaml rename to test/conformance/kuttl/_aaa_template_resources/05-errors.yaml diff --git a/test/conformance/kuttl/aaa_template_resources/99-cleanup.yaml b/test/conformance/kuttl/_aaa_template_resources/99-cleanup.yaml similarity index 100% rename from test/conformance/kuttl/aaa_template_resources/99-cleanup.yaml rename to test/conformance/kuttl/_aaa_template_resources/99-cleanup.yaml diff --git a/test/conformance/kuttl/aaa_template_resources/BEST_PRACTICES.md b/test/conformance/kuttl/_aaa_template_resources/BEST_PRACTICES.md similarity index 100% rename from test/conformance/kuttl/aaa_template_resources/BEST_PRACTICES.md rename to test/conformance/kuttl/_aaa_template_resources/BEST_PRACTICES.md diff --git a/test/conformance/kuttl/aaa_template_resources/README.md b/test/conformance/kuttl/_aaa_template_resources/README.md similarity index 100% rename from test/conformance/kuttl/aaa_template_resources/README.md rename to test/conformance/kuttl/_aaa_template_resources/README.md diff --git a/test/conformance/kuttl/aaa_template_resources/commands/04-sleep.yaml b/test/conformance/kuttl/_aaa_template_resources/commands/04-sleep.yaml similarity index 100% rename from test/conformance/kuttl/aaa_template_resources/commands/04-sleep.yaml rename to test/conformance/kuttl/_aaa_template_resources/commands/04-sleep.yaml diff --git a/test/conformance/kuttl/aaa_template_resources/commands/99-cleanup.yaml b/test/conformance/kuttl/_aaa_template_resources/commands/99-cleanup.yaml similarity index 100% rename from test/conformance/kuttl/aaa_template_resources/commands/99-cleanup.yaml rename to test/conformance/kuttl/_aaa_template_resources/commands/99-cleanup.yaml diff --git a/test/conformance/kuttl/aaa_template_resources/scaffold/01-policy.yaml b/test/conformance/kuttl/_aaa_template_resources/scaffold/01-policy.yaml similarity index 100% rename from test/conformance/kuttl/aaa_template_resources/scaffold/01-policy.yaml rename to test/conformance/kuttl/_aaa_template_resources/scaffold/01-policy.yaml diff --git a/test/conformance/kuttl/aaa_template_resources/scaffold/02-resource.yaml b/test/conformance/kuttl/_aaa_template_resources/scaffold/02-resource.yaml similarity index 100% rename from test/conformance/kuttl/aaa_template_resources/scaffold/02-resource.yaml rename to test/conformance/kuttl/_aaa_template_resources/scaffold/02-resource.yaml diff --git a/test/conformance/kuttl/aaa_template_resources/scaffold/README.md b/test/conformance/kuttl/_aaa_template_resources/scaffold/README.md similarity index 100% rename from test/conformance/kuttl/aaa_template_resources/scaffold/README.md rename to test/conformance/kuttl/_aaa_template_resources/scaffold/README.md diff --git a/test/conformance/kuttl/aaa_template_resources/scaffold/errors.yaml b/test/conformance/kuttl/_aaa_template_resources/scaffold/errors.yaml similarity index 100% rename from test/conformance/kuttl/aaa_template_resources/scaffold/errors.yaml rename to test/conformance/kuttl/_aaa_template_resources/scaffold/errors.yaml diff --git a/test/conformance/kuttl/aaa_template_resources/scaffold/ns.yaml b/test/conformance/kuttl/_aaa_template_resources/scaffold/ns.yaml similarity index 100% rename from test/conformance/kuttl/aaa_template_resources/scaffold/ns.yaml rename to test/conformance/kuttl/_aaa_template_resources/scaffold/ns.yaml diff --git a/test/conformance/kuttl/aaa_template_resources/scaffold/policy-ready.yaml b/test/conformance/kuttl/_aaa_template_resources/scaffold/policy-ready.yaml similarity index 100% rename from test/conformance/kuttl/aaa_template_resources/scaffold/policy-ready.yaml rename to test/conformance/kuttl/_aaa_template_resources/scaffold/policy-ready.yaml diff --git a/test/conformance/kuttl/aaa_template_resources/scaffold/policy.yaml b/test/conformance/kuttl/_aaa_template_resources/scaffold/policy.yaml similarity index 100% rename from test/conformance/kuttl/aaa_template_resources/scaffold/policy.yaml rename to test/conformance/kuttl/_aaa_template_resources/scaffold/policy.yaml diff --git a/test/conformance/kuttl/aaa_template_resources/scaffold/resource-mutated.yaml b/test/conformance/kuttl/_aaa_template_resources/scaffold/resource-mutated.yaml similarity index 100% rename from test/conformance/kuttl/aaa_template_resources/scaffold/resource-mutated.yaml rename to test/conformance/kuttl/_aaa_template_resources/scaffold/resource-mutated.yaml diff --git a/test/conformance/kuttl/aaa_template_resources/scaffold/resource.yaml b/test/conformance/kuttl/_aaa_template_resources/scaffold/resource.yaml similarity index 100% rename from test/conformance/kuttl/aaa_template_resources/scaffold/resource.yaml rename to test/conformance/kuttl/_aaa_template_resources/scaffold/resource.yaml diff --git a/test/conformance/kuttl/aaa_template_resources/scaffold/script-check-for-error.yaml b/test/conformance/kuttl/_aaa_template_resources/scaffold/script-check-for-error.yaml similarity index 100% rename from test/conformance/kuttl/aaa_template_resources/scaffold/script-check-for-error.yaml rename to test/conformance/kuttl/_aaa_template_resources/scaffold/script-check-for-error.yaml diff --git a/test/conformance/kuttl/aaa_template_resources/scripts/01-script-check-for-error.yaml b/test/conformance/kuttl/_aaa_template_resources/scripts/01-script-check-for-error.yaml similarity index 100% rename from test/conformance/kuttl/aaa_template_resources/scripts/01-script-check-for-error.yaml rename to test/conformance/kuttl/_aaa_template_resources/scripts/01-script-check-for-error.yaml diff --git a/test/conformance/kuttl/aaa_template_resources/scripts/02-script-check-for-output.yaml b/test/conformance/kuttl/_aaa_template_resources/scripts/02-script-check-for-output.yaml similarity index 100% rename from test/conformance/kuttl/aaa_template_resources/scripts/02-script-check-for-output.yaml rename to test/conformance/kuttl/_aaa_template_resources/scripts/02-script-check-for-output.yaml diff --git a/test/conformance/kuttl/kuttl-test.yaml b/test/conformance/kuttl/kuttl-test.yaml index f322e903ad..6d7c0ba9c3 100644 --- a/test/conformance/kuttl/kuttl-test.yaml +++ b/test/conformance/kuttl/kuttl-test.yaml @@ -1,39 +1,9 @@ apiVersion: kuttl.dev/v1beta1 kind: TestSuite testDirs: -# Autogen tests -- ./test/conformance/kuttl/autogen -# Generate tests -- ./test/conformance/kuttl/generate/clusterpolicy/standard/clone/nosync -- ./test/conformance/kuttl/generate/clusterpolicy/standard/clone/sync -- ./test/conformance/kuttl/generate/clusterpolicy/standard/data/sync -- ./test/conformance/kuttl/generate/clusterpolicy/standard/data/nosync -- ./test/conformance/kuttl/generate/policy/standard/clone/nosync -- ./test/conformance/kuttl/generate/policy/standard/clone/sync -- ./test/conformance/kuttl/generate/policy/standard/data/sync -# - ./test/conformance/kuttl/generate/policy/standard/data/nosync -- ./test/conformance/kuttl/generate/clusterpolicy/cornercases -# Mutate tests -- ./test/conformance/kuttl/mutate/e2e -- ./test/conformance/kuttl/mutate/clusterpolicy/standard -- ./test/conformance/kuttl/mutate/clusterpolicy/standard/existing -- ./test/conformance/kuttl/mutate/clusterpolicy/cornercases -# Validate tests -- ./test/conformance/kuttl/validate/clusterpolicy/standard/audit -- ./test/conformance/kuttl/validate/clusterpolicy/standard/enforce -- ./test/conformance/kuttl/validate/clusterpolicy/standard/wildcard -- ./test/conformance/kuttl/validate/clusterpolicy/cornercases -- ./test/conformance/kuttl/validate/cleanuppolicy -- ./test/conformance/kuttl/validate/e2e -# Verify image tests -- ./test/conformance/kuttl/verifyImages/clusterpolicy/standard -# Report tests -- ./test/conformance/kuttl/reports/admission -- ./test/conformance/kuttl/reports/background -# RBAC -- ./test/conformance/kuttl/rbac -# Webhooks -- ./test/conformance/kuttl/webhooks +- ./test/conformance/kuttl startKIND: false # timeout: 15 parallel: 1 +fullName: true +skipTestRegex: '_.+'