Skip to content

Commit 753d6d6

Browse files
committed
remove envtest from Makefile
On-behalf-of: @SAP [email protected]
1 parent 11acf67 commit 753d6d6

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

Makefile

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@
22
# for checking import statements.
33
OPENSHIFT_GOIMPORTS_VER := c72f1dc2e3aacfa00aece3391d938c9bc734e791
44
RECONCILER_GEN_VER := v0.5.0
5-
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
6-
ENVTEST_K8S_VERSION = 1.31.0
75
## Tool Versions
86
KUBECTL_VERSION ?= v1.32.0
97
KUSTOMIZE_VERSION ?= v5.4.3
108
CONTROLLER_TOOLS_VERSION ?= v0.16.1
11-
ENVTEST_VERSION ?= release-0.19
129
GOLANGCI_LINT_VERSION ?= 2.1.6
1310
PROTOKOL_VERSION ?= 0.7.2
1411

@@ -63,8 +60,8 @@ vet: ## Run go vet against code.
6360
go vet ./...
6461

6562
.PHONY: test
66-
test: fmt vet envtest ## Run tests.
67-
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(TOOLS_DIR) -p path)" go test $$(go list ./... | grep -v /e2e) -coverprofile cover.out
63+
test: fmt vet ## Run tests.
64+
go test $$(go list ./... | grep -v /e2e) -coverprofile cover.out
6865

6966
# Utilize Kind or modify the e2e tests to load the image locally, enabling compatibility with other vendors.
7067
.PHONY: test-e2e # Run the e2e tests against a Kind k8s instance that is spun up.
@@ -152,7 +149,6 @@ undeploy: kubectl kustomize ## Undeploy controller from the K8s cluster specifie
152149
## Tool Binaries
153150
KUBECTL ?= $(TOOLS_DIR)/kubectl
154151
KUSTOMIZE ?= $(TOOLS_DIR)/kustomize
155-
ENVTEST ?= $(TOOLS_DIR)/setup-envtest
156152
GOLANGCI_LINT = $(TOOLS_DIR)/golangci-lint
157153
PROTOKOL = $(TOOLS_DIR)/protokol
158154
RECONCILER_GEN := $(TOOLS_DIR)/reconciler-gen
@@ -172,13 +168,6 @@ kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
172168
$(KUSTOMIZE):
173169
@GO_MODULE=true hack/download-tool.sh sigs.k8s.io/kustomize/kustomize/v5 kustomize $(KUSTOMIZE_VERSION)
174170

175-
.PHONY: envtest
176-
envtest: $(ENVTEST) ## Download setup-envtest locally if necessary.
177-
178-
.PHONY: $(ENVTEST)
179-
$(ENVTEST):
180-
@GO_MODULE=true hack/download-tool.sh sigs.k8s.io/controller-runtime/tools/setup-envtest setup-envtest $(ENVTEST_VERSION)
181-
182171
.PHONY: golangci-lint
183172
golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary.
184173

0 commit comments

Comments
 (0)