Skip to content

Commit 3563506

Browse files
Camila MCamila M
Camila M
authored and
Camila M
committed
Remove bingo dependency
1 parent c3080c4 commit 3563506

File tree

3 files changed

+5
-96
lines changed

3 files changed

+5
-96
lines changed

.bingo/setup-envtest.mod

Lines changed: 0 additions & 7 deletions
This file was deleted.

.bingo/setup-envtest.sum

Lines changed: 0 additions & 85 deletions
This file was deleted.

Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,19 +152,20 @@ test-ext-dev-e2e: $(OPERATOR_SDK) $(KUSTOMIZE) $(KIND) #HELP Run extension creat
152152
go test -count=1 -v ./test/extension-developer-e2e/...
153153

154154
ENVTEST_VERSION := $(shell go list -m k8s.io/client-go | cut -d" " -f2 | sed 's/^v0\.\([[:digit:]]\{1,\}\)\.[[:digit:]]\{1,\}$$/1.\1.x/')
155+
CONTROLLER_RUNTIME_VERSION := release-$(shell go list -m sigs.k8s.io/controller-runtime | awk '{print $$2}' | sed -E 's/^v([0-9]+)\.([0-9]+)\..*/\1.\2/')
155156
UNIT_TEST_DIRS := $(shell go list ./... | grep -v /test/)
156157
COVERAGE_UNIT_DIR := $(ROOT_DIR)/coverage/unit
157158

158159
.PHONY: setup-envtest #HELP Install setup-envtest binary in the bin directory.
159160
setup-envtest:
160161
mkdir -p $(ROOT_DIR)/bin
161-
GOBIN=$(ROOT_DIR)/bin go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
162-
$(SETUP_ENVTEST) use -p env $(ENVTEST_VERSION) $(SETUP_ENVTEST_BIN_DIR_OVERRIDE)
162+
GOBIN=$(ROOT_DIR)/bin go install sigs.k8s.io/controller-runtime/tools/setup-envtest@$(CONTROLLER_RUNTIME_VERSION)
163+
$(ROOT_DIR)/bin/setup-envtest use -p env $(ENVTEST_VERSION) $(SETUP_ENVTEST_BIN_DIR_OVERRIDE)
163164

164165
.PHONY: test-unit
165-
test-unit: $(SETUP_ENVTEST) #HELP Run the unit tests
166+
test-unit: setup-envtest #HELP Run the unit tests
166167
rm -rf $(COVERAGE_UNIT_DIR) && mkdir -p $(COVERAGE_UNIT_DIR)
167-
KUBEBUILDER_ASSETS="$(shell $(SETUP_ENVTEST) use -p path $(ENVTEST_VERSION) $(SETUP_ENVTEST_BIN_DIR_OVERRIDE))" \
168+
KUBEBUILDER_ASSETS="$(shell $(ROOT_DIR)/bin/setup-envtest use -p path $(ENVTEST_VERSION) $(SETUP_ENVTEST_BIN_DIR_OVERRIDE))" \
168169
CGO_ENABLED=1 go test \
169170
-tags '$(GO_BUILD_TAGS)' \
170171
-cover -coverprofile ${ROOT_DIR}/coverage/unit.out \

0 commit comments

Comments
 (0)