Skip to content

Commit d1e27ea

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2844 from FotiadisM/makefile_fix
🐛 (go/v3, go/v4-alpha): fix makefile targets do not re-install binaries when they are found in the project bin directory
2 parents 6a3b0cb + a9bf7b9 commit d1e27ea

File tree

17 files changed

+32
-32
lines changed

17 files changed

+32
-32
lines changed

‎docs/book/src/component-config-tutorial/testdata/project/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ $(KUSTOMIZE): $(LOCALBIN)
124124
.PHONY: controller-gen
125125
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
126126
$(CONTROLLER_GEN): $(LOCALBIN)
127-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
127+
test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
128128

129129
.PHONY: envtest
130130
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
131131
$(ENVTEST): $(LOCALBIN)
132-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
132+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest

‎docs/book/src/cronjob-tutorial/testdata/project/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ $(KUSTOMIZE): $(LOCALBIN)
124124
.PHONY: controller-gen
125125
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
126126
$(CONTROLLER_GEN): $(LOCALBIN)
127-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
127+
test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
128128

129129
.PHONY: envtest
130130
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
131131
$(ENVTEST): $(LOCALBIN)
132-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
132+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest

‎docs/book/src/migration/manually_migration_guide_v2_v3.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -481,12 +481,12 @@ $(KUSTOMIZE): $(LOCALBIN)
481481
.PHONY: controller-gen
482482
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
483483
$(CONTROLLER_GEN): $(LOCALBIN)
484-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
484+
test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
485485
486486
.PHONY: envtest
487487
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
488488
$(ENVTEST): $(LOCALBIN)
489-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
489+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
490490
```
491491

492492
And then, to make your project use the `kustomize` version defined in the Makefile, replace all usage of `kustomize` with `$(KUSTOMIZE)`

‎docs/book/src/multiversion-tutorial/testdata/project/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ $(KUSTOMIZE): $(LOCALBIN)
124124
.PHONY: controller-gen
125125
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
126126
$(CONTROLLER_GEN): $(LOCALBIN)
127-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
127+
test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
128128

129129
.PHONY: envtest
130130
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
131131
$(ENVTEST): $(LOCALBIN)
132-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
132+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest

‎pkg/plugins/golang/v2/scaffolds/internal/templates/makefile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,5 +178,5 @@ $(KUSTOMIZE): $(LOCALBIN)
178178
.PHONY: controller-gen
179179
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
180180
$(CONTROLLER_GEN): $(LOCALBIN)
181-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
181+
test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
182182
`

‎pkg/plugins/golang/v3/scaffolds/internal/templates/makefile.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,10 @@ $(KUSTOMIZE): $(LOCALBIN)
183183
.PHONY: controller-gen
184184
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
185185
$(CONTROLLER_GEN): $(LOCALBIN)
186-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
186+
test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
187187
188188
.PHONY: envtest
189189
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
190190
$(ENVTEST): $(LOCALBIN)
191-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
191+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
192192
`

‎testdata/project-v2/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,4 @@ $(KUSTOMIZE): $(LOCALBIN)
122122
.PHONY: controller-gen
123123
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
124124
$(CONTROLLER_GEN): $(LOCALBIN)
125-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
125+
test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)

‎testdata/project-v3-addon-and-grafana/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ $(KUSTOMIZE): $(LOCALBIN)
124124
.PHONY: controller-gen
125125
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
126126
$(CONTROLLER_GEN): $(LOCALBIN)
127-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
127+
test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
128128

129129
.PHONY: envtest
130130
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
131131
$(ENVTEST): $(LOCALBIN)
132-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
132+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest

‎testdata/project-v3-config/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ $(KUSTOMIZE): $(LOCALBIN)
124124
.PHONY: controller-gen
125125
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
126126
$(CONTROLLER_GEN): $(LOCALBIN)
127-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
127+
test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
128128

129129
.PHONY: envtest
130130
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
131131
$(ENVTEST): $(LOCALBIN)
132-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
132+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest

‎testdata/project-v3-multigroup/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ $(KUSTOMIZE): $(LOCALBIN)
124124
.PHONY: controller-gen
125125
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
126126
$(CONTROLLER_GEN): $(LOCALBIN)
127-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
127+
test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
128128

129129
.PHONY: envtest
130130
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
131131
$(ENVTEST): $(LOCALBIN)
132-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
132+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest

0 commit comments

Comments
 (0)