From 2746d6ba07fbb3d441ffc5e8f8db10b01f915f4a Mon Sep 17 00:00:00 2001 From: Stefan Bueringer Date: Wed, 22 May 2024 20:22:53 +0200 Subject: [PATCH] Use setup-envtest from CR main (05/2024) to use envtest binaries from CT releases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Büringer buringerst@vmware.com --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e7d8b56819..1eb0554f37 100644 --- a/Makefile +++ b/Makefile @@ -110,7 +110,11 @@ KUSTOMIZE_BIN := kustomize KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER)) KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v4 -SETUP_ENVTEST_VER := 116a1b831fffe7ccc3c8145306c3e1a3b1b14ffa # Note: this matches the commit ID of the dependent controller-runtime module. +# This is a commit from CR main (22.05.2024). +# Intentionally using a commit from main to use a setup-envtest version +# that uses binaries from controller-tools, not GCS. +# CR PR: https://github.com/kubernetes-sigs/controller-runtime/pull/2811 +SETUP_ENVTEST_VER := v0.0.0-20240522175850-2e9781e9fc60 SETUP_ENVTEST_BIN := setup-envtest SETUP_ENVTEST := $(abspath $(TOOLS_BIN_DIR)/$(SETUP_ENVTEST_BIN)-$(SETUP_ENVTEST_VER)) SETUP_ENVTEST_PKG := sigs.k8s.io/controller-runtime/tools/setup-envtest