Skip to content

Commit 0a8c439

Browse files
committed
Download the "setup-envtest" tool in its own target
1 parent 69cb0bb commit 0a8c439

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

Makefile

+7-3
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,9 @@ check: get-pgmonitor
194194
# - KUBEBUILDER_ATTACH_CONTROL_PLANE_OUTPUT=true
195195
.PHONY: check-envtest
196196
check-envtest: ## Run check using envtest and a mock kube api
197-
check-envtest: ENVTEST_USE = hack/tools/setup-envtest --bin-dir=$(CURDIR)/hack/tools/envtest use $(ENVTEST_K8S_VERSION)
197+
check-envtest: ENVTEST_USE = $(ENVTEST) --bin-dir=$(CURDIR)/hack/tools/envtest use $(ENVTEST_K8S_VERSION)
198198
check-envtest: SHELL = bash
199-
check-envtest: get-pgmonitor
200-
GOBIN='$(CURDIR)/hack/tools' $(GO) install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
199+
check-envtest: get-pgmonitor tools/setup-envtest
201200
@$(ENVTEST_USE) --print=overview && echo
202201
source <($(ENVTEST_USE) --print=env) && PGO_NAMESPACE="postgres-operator" QUERIES_CONFIG_DIR="$(CURDIR)/${QUERIES_CONFIG_DIR}" \
203202
$(GO_TEST) -count=1 -cover ./...
@@ -327,6 +326,11 @@ tools: tools/controller-gen
327326
tools/controller-gen:
328327
$(call go-get-tool,$(CONTROLLER),sigs.k8s.io/controller-tools/cmd/[email protected])
329328

329+
ENVTEST ?= hack/tools/setup-envtest
330+
tools: tools/setup-envtest
331+
tools/setup-envtest:
332+
$(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@latest)
333+
330334
##@ Release
331335

332336
.PHONY: license licenses

0 commit comments

Comments
 (0)