Skip to content

Commit c4ccf4d

Browse files
committed
Fix: pin envtest version
This commit pins the envtest version to work aound an upstream issue in: kubernetes-sigs/controller-runtime#2720 Signed-off-by: Yuxing Jiang <[email protected]> (cherry picked from commit a40f521)
1 parent 10cf585 commit c4ccf4d

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ DEPLOY_LDFLAGS += -X ${APP_MODULE}/cmd/deployctl/cmd.GitHead=${GIT_HEAD}
2727
DEPLOY_LDFLAGS += -X ${APP_MODULE}/cmd/deployctl/cmd.GitBranch=${GIT_BRANCH}
2828

2929
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
30-
ENVTEST_K8S_VERSION = 1.23
30+
ENVTEST_K8S_VERSION = 1.26
3131

3232
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
3333
ifeq (,$(shell go env GOBIN))
@@ -177,6 +177,7 @@ GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
177177
KUSTOMIZE_VERSION ?= v3.8.7
178178
CONTROLLER_TOOLS_VERSION ?= v0.8.0
179179
GOLANGCI_LINT_VERSION ?= v1.49.0
180+
SETPUP_ENVTEST_VERSION ?= release-0.16
180181

181182
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
182183
GOLANGCI_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh"
@@ -196,7 +197,7 @@ $(CONTROLLER_GEN): $(LOCALBIN)
196197
.PHONY: envtest
197198
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
198199
$(ENVTEST): $(LOCALBIN)
199-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
200+
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@$(SETPUP_ENVTEST_VERSION)
200201

201202
.PHONY: deepequal-gen
202203
deepequal-gen: $(DEEPEQUAL_GEN) ## Download deepequal-gen locally if necessary.

0 commit comments

Comments
 (0)