Skip to content

Commit 10f4a19

Browse files
authored
separate kind node version check and use it in PR validation CI (#2052)
Signed-off-by: grokspawn <jordan@nimblewidget.com>
1 parent fca620f commit 10f4a19

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

Makefile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ generate: $(CONTROLLER_GEN) #EXHELP Generate code containing DeepCopy, DeepCopyI
154154
$(CONTROLLER_GEN) --load-build-tags=$(GO_BUILD_TAGS) object:headerFile="hack/boilerplate.go.txt" paths="./..."
155155

156156
.PHONY: verify
157-
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.
157+
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.
158158
git diff --exit-code
159159

160160
# Renders registry+v1 bundles in test/convert
@@ -313,8 +313,7 @@ kind-deploy: manifests
313313
envsubst '$$DEFAULT_CATALOG,$$CERT_MGR_VERSION,$$INSTALL_DEFAULT_CATALOGS,$$MANIFEST' < scripts/install.tpl.sh | bash -s
314314

315315
.PHONY: kind-cluster
316-
kind-cluster: $(KIND) #EXHELP Standup a kind cluster.
317-
env K8S_VERSION=v$(K8S_VERSION) KIND=$(KIND) GOBIN=$(GOBIN) hack/tools/validate_kindest_node.sh
316+
kind-cluster: $(KIND) kind-verify-versions #EXHELP Standup a kind cluster.
318317
-$(KIND) delete cluster --name $(KIND_CLUSTER_NAME)
319318
$(KIND) create cluster --name $(KIND_CLUSTER_NAME) --config ./kind-config.yaml
320319
$(KIND) export kubeconfig --name $(KIND_CLUSTER_NAME)
@@ -323,6 +322,11 @@ kind-cluster: $(KIND) #EXHELP Standup a kind cluster.
323322
kind-clean: $(KIND) #EXHELP Delete the kind cluster.
324323
$(KIND) delete cluster --name $(KIND_CLUSTER_NAME)
325324

325+
.PHONY: kind-verify-versions
326+
kind-verify-versions:
327+
env K8S_VERSION=v$(K8S_VERSION) KIND=$(KIND) GOBIN=$(GOBIN) hack/tools/validate_kindest_node.sh
328+
329+
326330
#SECTION Build
327331

328332
# attempt to generate the VERSION attribute for certificates

0 commit comments

Comments
 (0)