@@ -229,15 +229,15 @@ build-deploy: ## Build current branch image and deploy controller to the k8s clu
229
229
230
230
CONTROLLER_GEN = $(shell pwd) /bin/controller-gen
231
231
controller-gen : # # Download controller-gen locally if necessary.
232
- $(call go-get -tool,$(CONTROLLER_GEN ) ,sigs.k8s.io/controller-tools/cmd/[email protected] )
232
+ $(call go-install -tool,$(CONTROLLER_GEN ) ,sigs.k8s.io/controller-tools/cmd/[email protected] )
233
233
234
234
KUSTOMIZE = $(shell pwd) /bin/kustomize
235
235
kustomize : # # Download kustomize locally if necessary.
236
- $(call go-get -tool,$(KUSTOMIZE ) ,sigs.k8s.io/kustomize/kustomize/[email protected] )
236
+ $(call go-install -tool,$(KUSTOMIZE ) ,sigs.k8s.io/kustomize/kustomize/[email protected] )
237
237
238
238
ENVTEST = $(shell pwd) /bin/setup-envtest
239
239
envtest : # # Download envtest-setup locally if necessary.
240
- $(call go-get -tool,$(ENVTEST ) ,sigs.k8s.io/controller-runtime/tools/setup-envtest@latest)
240
+ $(call go-install -tool,$(ENVTEST ) ,sigs.k8s.io/controller-runtime/tools/setup-envtest@latest)
241
241
242
242
# Codecov OS String for use in download url
243
243
ifeq ($(OS ) ,Windows_NT)
@@ -264,16 +264,16 @@ submit-coverage:
264
264
fi
265
265
rm -f codecov tmp.*
266
266
267
- # go-get -tool will 'go get ' any package $2 and install it to $1.
267
+ # go-install -tool will 'go install ' any package $2 and install it to $1.
268
268
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST ) ) ) )
269
- define go-get -tool
269
+ define go-install -tool
270
270
@[ -f $(1 ) ] || { \
271
271
set -e ;\
272
272
TMP_DIR=$$(mktemp -d ) ;\
273
273
cd $$TMP_DIR ;\
274
274
go mod init tmp ;\
275
275
echo "Downloading $(2 ) " ;\
276
- GOBIN=$(PROJECT_DIR ) /bin go get $(2 ) ;\
276
+ GOBIN=$(PROJECT_DIR ) /bin go install $(2 ) ;\
277
277
rm -rf $$TMP_DIR ;\
278
278
}
279
279
endef
0 commit comments