Merge branch 'main' into feature/check_pipeline_less_spammy

kyma-project · Mar 6, 2025 · 806a0b1 · 806a0b1
2 parents ceb92de + 088fd2f
commit 806a0b1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -8,6 +8,7 @@ BUILD_VERSION := from_makefile
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = $(shell yq e '.k8s' ./versions.yaml)
+ENVTEST_VERSION = $(shell yq e '.envtest' ./versions.yaml)
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -164,7 +165,7 @@ $(CONTROLLER_GEN): $(LOCALBIN)
 .PHONY: envtest
 envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
 $(ENVTEST): $(LOCALBIN)
-	GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
+	GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@release-$(ENVTEST_VERSION)
 
 .PHONY: fmt
 fmt: ## Run go fmt against code.

diff --git a/versions.yaml b/versions.yaml
@@ -11,3 +11,4 @@ kubectl: "1.31.3"
 kustomize: "5.3.0"
 modulectl: "1.1.8"
 yq: "4.45.1"
+envtest: "0.20"