You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Remove go module in hack/tools and align to core CAPI with regards to tools installation.
* Uses hack/go-install.sh to install:
* setup-envtest
* conversion-gen
* go-apidiff
* ginkgo
* kind
* Uses hack/go-tools-build.sh to install:
* conversion-verifier
* release-notes
* Adjusts help display function to core CAPI
* Reorders definitions in Makefile to improve comparability to core CAPI Makefile
* Implements hack/go-tools-build.sh to install binaries from sigs.k8s.io/cluster-api/hack/tools/...
* Removes Makefile and go module in hack/tools
echo":rotating_light: This is a RELEASE CANDIDATE. Use it only for testing purposes. If you find any bugs, file an [issue](https://github.com/kubernetes-sigs/cluster-api/issues/new).">$(RELEASE_NOTES_DIR)/$(RELEASE_TAG).md;\
428
432
else\
@@ -458,7 +462,7 @@ verify-gen: generate ## Verfiy go generated files are up to date
458
462
459
463
.PHONY: verify-modules
460
464
verify-modules: modules ## Verify go modules are up to date
461
-
@if !(git diff --quiet HEAD -- go.sum go.mod$(TOOLS_DIR)/go.mod $(TOOLS_DIR)/go.sum);then\
465
+
@if !(git diff --quiet HEAD -- go.sum go.mod);then\
462
466
git diff;\
463
467
echo"go module files are out of date";exit 1;\
464
468
fi
@@ -506,7 +510,7 @@ clean-build:
506
510
.PHONY: clean-bin
507
511
clean-bin: ## Remove all generated binaries
508
512
rm -rf bin
509
-
$(MAKE) -C$(TOOLS_DIR) clean
513
+
rm -rf$(TOOLS_BIN_DIR)
510
514
511
515
.PHONY: clean-temporary
512
516
clean-temporary: ## Remove all temporary files and folders
@@ -549,5 +553,87 @@ docker-push: ## Push the docker image
549
553
-t $(DEV_CONTROLLER_IMG):$(DEV_TAG).
550
554
docker buildx rm capv
551
555
556
+
557
+
## --------------------------------------
558
+
## Hack / Tools
559
+
## --------------------------------------
560
+
561
+
##@ hack/tools:
562
+
563
+
.PHONY: $(CONTROLLER_GEN_BIN)
564
+
$(CONTROLLER_GEN_BIN): $(CONTROLLER_GEN)## Build a local copy of controller-gen.
565
+
566
+
.PHONY: $(CONVERSION_GEN_BIN)
567
+
$(CONVERSION_GEN_BIN): $(CONVERSION_GEN)## Build a local copy of conversion-gen.
568
+
569
+
.PHONY: $(GO_APIDIFF_BIN)
570
+
$(GO_APIDIFF_BIN): $(GO_APIDIFF)## Build a local copy of go-apidiff
571
+
572
+
.PHONY: $(KUSTOMIZE_BIN)
573
+
$(KUSTOMIZE_BIN): $(KUSTOMIZE)## Build a local copy of kustomize.
574
+
575
+
.PHONY: $(SETUP_ENVTEST_BIN)
576
+
$(SETUP_ENVTEST_BIN): $(SETUP_ENVTEST)## Build a local copy of setup-envtest.
577
+
578
+
.PHONY: $(GINKGO_BIN)
579
+
$(GINKGO_BIN): $(GINKGO)## Build a local copy of ginkgo.
580
+
581
+
.PHONY: $(GOLANGCI_LINT_BIN)
582
+
$(GOLANGCI_LINT_BIN): $(GOLANGCI_LINT)## Build a local copy of golangci-lint.
583
+
584
+
.PHONY: $(GOVC_BIN)
585
+
$(GOVC_BIN): $(GOVC)## Build a local copy of govc.
586
+
587
+
.PHONY: $(KIND_BIN)
588
+
$(KIND_BIN): $(KIND)## Build a local copy of kind.
589
+
590
+
.PHONY: $(CONVERSION_VERIFIER_BIN)
591
+
$(CONVERSION_VERIFIER_BIN): $(CONVERSION_VERIFIER)## Build a local copy of conversion-verifier.
592
+
593
+
.PHONY: $(RELEASE_NOTES_BIN)
594
+
$(RELEASE_NOTES_BIN): $(RELEASE_NOTES)## Build a local copy of release-notes.
0 commit comments