chore: address comments

Author: jpayne3506

.pipelines/templates/run-unit-tests.yaml

@@ -20,7 +20,7 @@ stages:
               { { { {
                     sudo -E env "PATH=$PATH" make test-all;
                     echo $? >&3;
-                    } | tee >(go tool go-junit-report > report.xml) >&4;
+                    } | tee >(go tool -modfile=tools.go.mod go-junit-report > report.xml) >&4;
                   } 3>&1;
                 } | { read xs; exit $xs; }
               } 4>&1

Makefile

@@ -860,8 +860,8 @@ lint-all: ## Lint the current branch in entirety.
 
 FMT_PKG ?= cni cns npm
 
-fmt: $(GOFUMPT) ## run gofumpt on $FMT_PKG (default "cni cns npm").
-	$(GOFUMPT) -s -w $(FMT_PKG)
+fmt: ## run gofumpt on $FMT_PKG (default "cni cns npm").
+	go tool -modfile=$(TOOLS_GO_MOD) gofumpt -s -w $(FMT_PKG)
 
 
 workspace: ## Set up the Go workspace.
@@ -943,7 +943,7 @@ dockerfiles: renderkit ## Render all Dockerfile templates with current state of
 	@make -f build/images.mk render PATH=cns
 	@make -f build/images.mk render PATH=cni
 
-regenerate-crd: controller-gen ## Regenerate CRDs
+regenerate-crd: ## Regenerate CRDs
 	for makefile in $$(find ./crd/ -name "Makefile" -type f -printf '%h\n'); do \
 		echo "Running make in $$makefile"; \
 		make -C $$makefile; \
@@ -967,13 +967,11 @@ setup: install-hooks gitconfig ## performs common required repo setup
 
 ##@ Tools
 
-tools: renderkit controller-gen
+tools: renderkit
 
 renderkit: ## Install renderkit for rendering Dockerfile templates
 	@go install -modfile=$(TOOLS_GO_MOD) github.com/orellazri/renderkit
 
-controller-gen: ## Install renderkit for rendering Dockerfile templates
-	@go install -modfile=$(TOOLS_GO_MOD) -mod=readonly sigs.k8s.io/controller-tools/cmd/controller-gen
 
 ##@ Help
 

cns/multitenantcontroller/mockclients/Makefile

@@ -1,5 +1,5 @@
 REPO_ROOT = $(shell git rev-parse --show-toplevel)
-MOCKGEN = go tool mockgen
+MOCKGEN = go tool -modfile=$(REPO_ROOT)/tools.go.mod mockgen
 
 generate: ## Generate mock clients
 	@go mod vendor

npm/pkg/dataplane/Makefile

@@ -1,5 +1,5 @@
 REPO_ROOT = $(shell git rev-parse --show-toplevel)
-MOCKGEN = go tool mockgen
+MOCKGEN = go tool -modfile=$(REPO_ROOT)/tools.go.mod mockgen
 
 .PHONY: generate
 

platform/Makefile

@@ -1,5 +1,5 @@
 REPO_ROOT = $(shell git rev-parse --show-toplevel)
-MOCKGEN = go tool mockgen
+MOCKGEN = go tool -modfile=$(REPO_ROOT)/tools.go.mod mockgen
 
 .PHONY: generate
 

scripts/install-protoc.sh

@@ -4,6 +4,7 @@ PROTOBUFF_VERSION=3.19.1
 PB_REL="https://github.com/protocolbuffers/protobuf/releases"
 PROTOC_ZIP_NAME=protoc-${PROTOBUFF_VERSION}-linux-x86_64.zip
 PROTOC_INSTALL_PATH=$HOME/.local
+REPO_ROOT=$(git rev-parse --show-toplevel)
 
 # install unzip on linux if not installed
 if [[ "$OSTYPE" == "linux-gnu" ]]; then
@@ -18,7 +19,7 @@ if [ ! -f ${PROTOC_INSTALL_PATH}/bin/protoc ]; then
 		curl -LO ${PB_REL}/download/v${PROTOBUFF_VERSION}/${PROTOC_ZIP_NAME}
 		echo "Unzipping protoc"
 		unzip -o ${PROTOC_ZIP_NAME} -d ${PROTOC_INSTALL_PATH}
-		chmod +x ${PROTOC_INSTALL_PATH}/bin/protoc 
+		chmod +x ${PROTOC_INSTALL_PATH}/bin/protoc
 		export PATH=${PROTOC_INSTALL_PATH}/bin:$PATH
 		echo "Removing protoc zip"
 		rm ${PROTOC_ZIP_NAME}
@@ -31,15 +32,15 @@ fi
 # install protoc-gen-go
 if [ ! -f ${GOPATH}/bin/protoc-gen-go ]; then
 	echo "Installing protoc-gen-go"
-	go install github.com/golang/protobuf/[email protected]
+	go install -modfile=${REPO_ROOT}/tools.go.mod github.com/golang/protobuf/[email protected]
 else
 	echo "protoc-gen-go already installed at ${GOPATH}/bin/protoc-gen-go"
 fi
 
 # install protoc-gen-go-grpc
 if [ ! -f ${GOPATH}/bin/protoc-gen-go-grpc ]; then
 	echo "Installing protoc-gen-go-grpc"
-	go install google.golang.org/grpc/cmd/[email protected]
+	go install -modfile=${REPO_ROOT}/tools.go.mod google.golang.org/grpc/cmd/[email protected]
 else
 	echo "protoc-gen-go-grpc already installed at ${GOPATH}/bin/protoc-gen-go-grpc"
 fi