Skip to content

Commit 0cac98f

Browse files
committed
Point to system installed build tools path
Point to the operator-sdk, controller-gen, kustomize tools system path if already installed. Change-Id: I65aac8e3082f61f49cae0b36ff2d5152d91988e3 Signed-off-by: VijayaRamarao Mellempudi <[email protected]>
1 parent 1dda8e2 commit 0cac98f

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

Makefile

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -206,36 +206,38 @@ $(LOCALBIN):
206206

207207
## Tool Binaries
208208
KUBECTL ?= kubectl
209-
KUSTOMIZE ?= $(LOCALBIN)/kustomize
210-
CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
211-
ENVTEST ?= $(LOCALBIN)/setup-envtest
209+
KUSTOMIZE ?= $(GOBIN)/kustomize
210+
CONTROLLER_GEN ?= $(GOBIN)/controller-gen
211+
ENVTEST ?= $(GOBIN)/setup-envtest
212212

213213
## Tool Versions
214214
KUSTOMIZE_VERSION ?= v5.2.1
215215
CONTROLLER_TOOLS_VERSION ?= v0.14.0
216216

217217
.PHONY: kustomize
218218
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary. If wrong version is installed, it will be removed before downloading.
219-
$(KUSTOMIZE): $(LOCALBIN)
220-
@if test -x $(LOCALBIN)/kustomize && ! $(LOCALBIN)/kustomize version | grep -q $(KUSTOMIZE_VERSION); then \
221-
echo "$(LOCALBIN)/kustomize version is not expected $(KUSTOMIZE_VERSION). Removing it before installing."; \
222-
rm -rf $(LOCALBIN)/kustomize; \
219+
$(KUSTOMIZE):
220+
@if test -x $(GOBIN)/kustomize && ! $(GOBIN)/kustomize version | grep -q $(KUSTOMIZE_VERSION); then \
221+
echo "$(GOBIN)/kustomize version is not expected $(KUSTOMIZE_VERSION). Removing it before installing."; \
222+
rm -rf $(GOBIN)/kustomize; \
223223
fi
224-
test -s $(LOCALBIN)/kustomize || GOBIN=$(LOCALBIN) GO111MODULE=on go install sigs.k8s.io/kustomize/kustomize/v5@$(KUSTOMIZE_VERSION)
224+
test -s $(GOBIN)/kustomize || GOBIN=$(GOBIN) GO111MODULE=on go install sigs.k8s.io/kustomize/kustomize/v5@$(KUSTOMIZE_VERSION)
225225

226226
.PHONY: controller-gen
227227
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary. If wrong version is installed, it will be overwritten.
228-
$(CONTROLLER_GEN): $(LOCALBIN)
229-
test -s $(LOCALBIN)/controller-gen && $(LOCALBIN)/controller-gen --version | grep -q $(CONTROLLER_TOOLS_VERSION) || \
230-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
228+
$(CONTROLLER_GEN):
229+
test -s $(GOBIN)/controller-gen && $(GOBIN)/controller-gen --version | grep -q $(CONTROLLER_TOOLS_VERSION) || \
230+
GOBIN=$(GOBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
231231

232232
.PHONY: envtest
233233
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
234-
$(ENVTEST): $(LOCALBIN)
235-
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
234+
$(ENVTEST):
235+
test -s $(GOBIN)/setup-envtest || GOBIN=$(GOBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
236+
237+
USRLOCALBIN ?= /usr/local/bin
236238

237239
.PHONY: operator-sdk
238-
OPERATOR_SDK ?= $(LOCALBIN)/operator-sdk
240+
OPERATOR_SDK ?= $(USRLOCALBIN)/operator-sdk
239241
operator-sdk: ## Download operator-sdk locally if necessary.
240242
ifeq (,$(wildcard $(OPERATOR_SDK)))
241243
ifeq (, $(shell which operator-sdk 2>/dev/null))

0 commit comments

Comments
 (0)