From 68b509a1fb2526d6037ca37d87cc400b2f65f86b Mon Sep 17 00:00:00 2001
From: Eric Horwath <70013998+erichorwath@users.noreply.github.com>
Date: Tue, 25 Mar 2025 18:10:13 +0100
Subject: [PATCH 1/2] pin envtest version to fix pipeline

Once we have upgraded to Go 1.24, then we can upgrade to envtest latest release-0.20.

See also: https://github.com/kubernetes-sigs/controller-runtime/pull/3181
---
 Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index b7e56208..1a81e3a1 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,9 @@
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.25.0
+ENVTEST_K8S_VERSION = 1.31.0
+# ENVTEST_VERSION refers to https://github.com/kubernetes-sigs/controller-runtime/tree/main/tools/setup-envtest
+ENVTEST_VERSION = release-0.19
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -184,7 +186,7 @@ $(GOLINT): $(LOCALBIN)
 .PHONY: envtest
 envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
 $(ENVTEST): $(LOCALBIN)
-	test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
+	test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@$(ENVTEST_VERSION)
 	ENVTESTDIR=$$($(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path) ;\
 	chmod -R u+w $$ENVTESTDIR ;\
 	rm -f $(LOCALBIN)/k8s/current ;\

From c21e14e05cf206b4d441bd08cc01670bbc5014bb Mon Sep 17 00:00:00 2001
From: Eric Horwath <70013998+erichorwath@users.noreply.github.com>
Date: Tue, 25 Mar 2025 18:43:24 +0100
Subject: [PATCH 2/2] Small update on Makefile

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 1a81e3a1..923386bb 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,9 @@
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.31.0
+ENVTEST_K8S_VERSION = 1.32.0
 # ENVTEST_VERSION refers to https://github.com/kubernetes-sigs/controller-runtime/tree/main/tools/setup-envtest
-ENVTEST_VERSION = release-0.19
+ENVTEST_VERSION = release-0.20
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))