update makefile

Signed-off-by: Per Goncalves da Silva <[email protected]>

Author: Per Goncalves da Silva

Makefile

@@ -39,12 +39,16 @@ else
 ARCH := amd64
 endif
 
+# Track the minor version of kubernetes we are building against by looking at the client-go dependency version
+# For example, a client-go version of v0.28.5 will map to kube version 1.28
+KUBE_MINOR ?= $(shell go list -m k8s.io/client-go | cut -d" " -f2 | sed 's/^v0\.\([[:digit:]]\{1,\}\)\.[[:digit:]]\{1,\}$$/1.\1/')
+
+# Unit test against the latest available version for the minor version of kubernetes we are building against e.g. 1.30.x
+ENVTEST_KUBE_VERSION ?= $(KUBE_MINOR).x
+
+# Not guaranteed to have patch releases available and node image tags are full versions (i.e v1.28.0 - not v1.28, v1.29, etc.)
+KIND_NODE_VERSION ?= $(KUBE_MINOR).0
 KIND_CLUSTER_NAME ?= kind-olmv0
-# Not guaranteed to have patch releases available and node image tags are full versions (i.e v1.28.0 - no v1.28, v1.29, etc.)
-# The KIND_NODE_VERSION is set by getting the version of the k8s.io/client-go dependency from the go.mod
-# and sets major version to "1" and the patch version to "0". For example, a client-go version of v0.28.5
-# will map to a KIND_NODE_VERSION of 1.28.0
-KIND_NODE_VERSION := $(shell go list -m k8s.io/client-go | cut -d" " -f2 | sed 's/^v0\.\([[:digit:]]\{1,\}\)\.[[:digit:]]\{1,\}$$/1.\1.0/')
 KIND_CLUSTER_IMAGE := kindest/node:v$(KIND_NODE_VERSION)
 
 # Phony prerequisite for targets that rely on the go build cache to determine staleness.
@@ -55,12 +59,6 @@ KIND_CLUSTER_IMAGE := kindest/node:v$(KIND_NODE_VERSION)
 .PHONY: FORCE
 FORCE:
 
-.PHONY: setup-envtest
-setup-envtest:
-ifeq (, $(shell which setup-envtest))
-	go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
-endif
-
 .PHONY: vet
 vet:
 	go vet $(MOD_FLAGS) ./...
@@ -69,8 +67,8 @@ all: test build
 
 test: clean cover.out
 .PHONY: unit
-KUBEBUILDER_ASSETS ?= $(shell setup-envtest use -p path $(KIND_NODE_VERSION))
-unit: setup-envtest
+KUBEBUILDER_ASSETS ?= $(shell $(SETUP_ENVTEST) use -p path $(ENVTEST_KUBE_VERSION))
+unit:
 	@echo "Running unit tests with kubebuilder assets at $(KUBEBUILDER_ASSETS)"
 	@echo "Running kube version: $(shell ${KUBEBUILDER_ASSETS}/kubectl version)"
 	KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS) go test $(MOD_FLAGS) $(SPECIFIC_UNIT_TEST) -tags "json1" -race -count=1 ./pkg/... ./test/e2e/split/...