Clean up Makefile:

Remove unused goals/targets and associated
files and directories.

Signed-off-by: Jacob Weinstock <[email protected]>

Author: jacobweinstock

.dockerignore

@@ -1,7 +1,6 @@
 .github
 .vscode
 config/
-hack/
 docs/
 templates/
 scripts/

.github/workflows/ci.yaml

@@ -31,21 +31,12 @@ jobs:
 
       - uses: actions/cache@v4
         with:
-          path: hack/tools/bin
+          path: bin
           key: ${{ runner.os }}-tools-bin-${{ matrix.target }}-${{ hashFiles('Makefile') }}
           restore-keys: |
             ${{ runner.os }}-tools-bin-${{ matrix.target }}-
             ${{ runner.os }}-tools-bin-
 
-      - uses: actions/cache@v4
-        if: ${{ matrix.target == 'test' }}
-        with:
-          path: /tmp/kubebuilder-tools-*.tar.gz
-          key: ${{ runner.os }}-tmp-${{ matrix.target }}-${{ hashFiles('scripts/fetch_ext_bins.sh') }}
-          restore-keys: |
-            ${{ runner.os }}-tmp-${{ matrix.target }}-
-            ${{ runner.os }}-tmp-
-
       - name: ${{ matrix.target }}
         run: make ${{ matrix.target }}
 

.github/workflows/release.yaml

@@ -89,7 +89,7 @@ jobs:
 
       - uses: actions/cache@v4
         with:
-          path: hack/tools/bin
+          path: bin
           key: ${{ runner.os }}-tools-bin-release-${{ hashFiles('Makefile') }}
           restore-keys: |
             ${{ runner.os }}-tools-bin-release-

.gitignore

@@ -43,4 +43,3 @@ dist
 
 # development / test / lints
 bin/
-hack/tools

Makefile

@@ -29,9 +29,6 @@ GOPROXY := https://proxy.golang.org
 endif
 export GOPROXY
 
-# Active module mode, as we use go modules to manage dependencies
-export GO111MODULE=on
-
 # Default timeout for starting/stopping the Kubebuilder test control plane
 export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT ?=60s
 export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT ?=60s
@@ -42,11 +39,7 @@ export DOCKER_CLI_EXPERIMENTAL := enabled
 CURL_RETRIES=3
 
 # Directories.
-ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
-TOOLS_DIR := hack/tools
-TOOLS_BIN_DIR := $(abspath $(TOOLS_DIR)/bin)
-BIN_DIR := $(abspath $(ROOT_DIR)/bin)
-GO_INSTALL = ./scripts/go_install.sh
+TOOLS_BIN_DIR := $(abspath bin)
 
 # Binaries.
 CONTROLLER_GEN := go run sigs.k8s.io/controller-tools/cmd/[email protected]
@@ -55,28 +48,16 @@ GOLANGCI_LINT_VER := v2.3.0
 GOLANGCI_LINT_BIN := golangci-lint
 GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
 
+KUSTOMIZE_VER := v5.7.1
 KUSTOMIZE_BIN := kustomize
-KUSTOMIZE := $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)
-
-KUBECTL_VER := v1.33.0
-KUBECTL_BIN := kubectl
-KUBECTL := $(TOOLS_BIN_DIR)/$(KUBECTL_BIN)-$(KUBECTL_VER)
-
-KIND_VER := v0.29.0
-KIND_BIN := kind
-KIND := $(TOOLS_BIN_DIR)/$(KIND_BIN)-$(KIND_VER)
+KUSTOMIZE := $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER)
 
-toolsBins := $(addprefix ${TOOLS_BIN_DIR}/,$(notdir $(shell awk -F'"' '/^\s*_/ {print $$2}' tools.go | sed 's|/v[[:digit:]]\+||')))
-
-# installs cli tools defined in tools.go
-$(toolsBins): go.mod go.sum tools.go
-$(toolsBins): CMD=$(shell grep -w '$(@F)' tools.go | awk -F'"' '{print $$2}')
-$(toolsBins):
-	echo "Installing $(CMD)"
-	GOBIN=$(TOOLS_BIN_DIR) go install $(CMD)
+GINKGO_VER := v2.23.4
+GINKGO_BIN := ginkgo
+GINKGO := $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER)
 
 .PHONY: tools
-tools: ${toolsBins} ## Build Go based build tools
+tools: $(GINKGO) $(KUSTOMIZE) $(GOLANGCI_LINT) ## Install build tools
 
 TIMEOUT := $(shell command -v timeout || command -v gtimeout)
 
@@ -122,7 +103,7 @@ help:  ## Display this help
 
 .PHONY: test
 test: ## Run tests
-	source ./scripts/fetch_ext_bins.sh; fetch_tools; setup_envs; go test -v ./... -coverprofile cover.out
+	go test -v ./... -coverprofile cover.out
 
 ## --------------------------------------
 ## Tooling Binaries
@@ -142,6 +123,16 @@ $(KIND): ## Build kind
 	ln -sf "$(KIND)" "$(TOOLS_BIN_DIR)/$(KIND_BIN)"
 	chmod +x "$(TOOLS_BIN_DIR)/$(KIND_BIN)" "$(KIND)"
 
+$(GINKGO): ## Build ginkgo
+	mkdir -p $(TOOLS_BIN_DIR)
+	GOBIN=$(TOOLS_BIN_DIR) go install github.com/onsi/ginkgo/v2/ginkgo@${GINKGO_VER}
+	@mv $(TOOLS_BIN_DIR)/ginkgo $(GINKGO)
+
+$(KUSTOMIZE): ## Install kustomize
+	mkdir -p $(TOOLS_BIN_DIR)
+	GOBIN=$(TOOLS_BIN_DIR) go install sigs.k8s.io/kustomize/kustomize/v5@${KUSTOMIZE_VER}
+	@mv $(TOOLS_BIN_DIR)/kustomize $(KUSTOMIZE)
+
 ## --------------------------------------
 ## Linting
 ## --------------------------------------
@@ -204,7 +195,7 @@ generate: ## Generate code
 generate-go: tools ## Runs Go related generate targets
 	$(CONTROLLER_GEN) \
 		paths=./api/... \
-		object:headerFile=./hack/boilerplate.go.txt
+		object:headerFile=./config/boilerplate.go.txt
 	go generate ./...
 
 .PHONY: generate-manifests
@@ -314,7 +305,6 @@ clean: clean-bin clean-temporary clean-release ## Remove all generated files
 .PHONY: clean-bin
 clean-bin: ## Remove all generated binaries
 	rm -rf bin
-	rm -rf hack/tools/bin
 
 .PHONY: clean-temporary
 clean-temporary: ## Remove all temporary files and folders
@@ -328,13 +318,9 @@ clean-release: ## Remove the release folder
 .PHONY: verify
 verify: verify-modules verify-gen
 
-.PHONY: verify-boilerplate
-verify-boilerplate:
-	./hack/verify-boilerplate.sh
-
 .PHONY: verify-modules
 verify-modules: modules
-	@if !(git diff --quiet HEAD -- go.sum go.mod hack/tools/go.mod hack/tools/go.sum); then \
+	@if !(git diff --quiet HEAD -- go.sum go.mod); then \
 		echo "go module files are out of date"; exit 1; \
 	fi