From 31729abe1cfc2133a2d696af871b3641196775e6 Mon Sep 17 00:00:00 2001 From: Rohan Kumar Date: Wed, 11 Feb 2026 23:39:25 +0530 Subject: [PATCH] fix(envtest): resolve build failure caused by deprecated kubebuilder-tools download fix build failure caused by old kubebuilder binaries not being able to download via legacy GCS buckets, which are now returning 401 Switch to setup-envtest latest installer Signed-off-by: Rohan Kumar --- Makefile | 4 ++-- controllers/controller/devworkspacerouting/suite_test.go | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d7053812b..6e057aab4 100644 --- a/Makefile +++ b/Makefile @@ -385,9 +385,9 @@ $(LOCALBIN): ## Tool Binaries CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen CONTROLLER_GEN_VERSION = v0.18.0 -ENVTEST_VERSION = v0.0.0-20240320141353-395cfc7486e6 +ENVTEST_VERSION = latest ENVTEST ?= $(LOCALBIN)/setup-envtest -ENVTEST_K8S_VERSION = 1.24.2 +export ENVTEST_K8S_VERSION = 1.30.0 ### controller-gen: Finds or downloads controller-gen # download controller-gen if necessary diff --git a/controllers/controller/devworkspacerouting/suite_test.go b/controllers/controller/devworkspacerouting/suite_test.go index b48133b74..dd3f0c06a 100644 --- a/controllers/controller/devworkspacerouting/suite_test.go +++ b/controllers/controller/devworkspacerouting/suite_test.go @@ -82,6 +82,8 @@ var _ = BeforeSuite(func() { Expect(setupEnvVars()).To(Succeed()) By("bootstrapping test environment") + k8sVersion := os.Getenv("ENVTEST_K8S_VERSION") + testEnv = &envtest.Environment{ CRDDirectoryPaths: []string{ filepath.Join("..", "..", "..", "deploy", "templates", "crd", "bases"), @@ -89,7 +91,7 @@ var _ = BeforeSuite(func() { filepath.Join(".", "testdata", "route.crd.yaml"), }, ErrorIfCRDPathMissing: true, - BinaryAssetsDirectory: filepath.Join("..", "..", "..", "bin", "k8s", fmt.Sprintf("1.24.2-%s-%s", runtime.GOOS, runtime.GOARCH)), + BinaryAssetsDirectory: filepath.Join("..", "..", "..", "bin", "k8s", fmt.Sprintf("%s-%s-%s", k8sVersion, runtime.GOOS, runtime.GOARCH)), } cfg, err := testEnv.Start()