From 30eded2a73ef76624b5e9dc315c26db93991a5c9 Mon Sep 17 00:00:00 2001 From: grokspawn Date: Thu, 26 Jun 2025 08:50:18 -0500 Subject: [PATCH] separate kind node version check and use it in PR validation CI Signed-off-by: grokspawn --- Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a5ed4245f..72443a498 100644 --- a/Makefile +++ b/Makefile @@ -154,7 +154,7 @@ generate: $(CONTROLLER_GEN) #EXHELP Generate code containing DeepCopy, DeepCopyI $(CONTROLLER_GEN) --load-build-tags=$(GO_BUILD_TAGS) object:headerFile="hack/boilerplate.go.txt" paths="./..." .PHONY: verify -verify: k8s-pin fmt generate manifests crd-ref-docs generate-test-data #HELP Verify all generated code is up-to-date. Runs k8s-pin instead of just tidy. +verify: k8s-pin kind-verify-versions fmt generate manifests crd-ref-docs generate-test-data #HELP Verify all generated code is up-to-date. Runs k8s-pin instead of just tidy. git diff --exit-code # Renders registry+v1 bundles in test/convert @@ -313,8 +313,7 @@ kind-deploy: manifests envsubst '$$DEFAULT_CATALOG,$$CERT_MGR_VERSION,$$INSTALL_DEFAULT_CATALOGS,$$MANIFEST' < scripts/install.tpl.sh | bash -s .PHONY: kind-cluster -kind-cluster: $(KIND) #EXHELP Standup a kind cluster. - env K8S_VERSION=v$(K8S_VERSION) KIND=$(KIND) GOBIN=$(GOBIN) hack/tools/validate_kindest_node.sh +kind-cluster: $(KIND) kind-verify-versions #EXHELP Standup a kind cluster. -$(KIND) delete cluster --name $(KIND_CLUSTER_NAME) $(KIND) create cluster --name $(KIND_CLUSTER_NAME) --config ./kind-config.yaml $(KIND) export kubeconfig --name $(KIND_CLUSTER_NAME) @@ -323,6 +322,11 @@ kind-cluster: $(KIND) #EXHELP Standup a kind cluster. kind-clean: $(KIND) #EXHELP Delete the kind cluster. $(KIND) delete cluster --name $(KIND_CLUSTER_NAME) +.PHONY: kind-verify-versions +kind-verify-versions: + env K8S_VERSION=v$(K8S_VERSION) KIND=$(KIND) GOBIN=$(GOBIN) hack/tools/validate_kindest_node.sh + + #SECTION Build # attempt to generate the VERSION attribute for certificates