chore: pre-review cleanup

Author: jpayne3506

.github/workflows/baseimages.yaml

@@ -21,7 +21,7 @@ jobs:
     - uses: actions/setup-go@v5
       with:
         go-version-file: go.mod
-    - name: go debug
+    - name: go env
       run: |
         echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
     - name: Render Dockerfiles

Makefile

@@ -938,13 +938,13 @@ test-extended-cyclonus: ## run the cyclonus test for npm.
 	cd ..
 
 test-azure-ipam: ## run the unit test for azure-ipam
-	cd $(AZURE_IPAM_DIR) && go test -race -covermode atomic -coverprofile=../coverage-azure-ipam.out && go tool cover  -func=../coverage-azure-ipam.out
+	cd $(AZURE_IPAM_DIR) && go test -race -covermode atomic -coverprofile=../coverage-azure-ipam.out && go tool cover -func=../coverage-azure-ipam.out
 
 test-azure-ip-masq-merger: ## run the unit test for azure-ip-masq-merger
-	cd $(AZURE_IP_MASQ_MERGER_DIR) && go test -race -covermode atomic -coverprofile=../coverage-azure-ip-masq-merger.out && go tool cover  -func=../coverage-azure-ip-masq-merger.out
+	cd $(AZURE_IP_MASQ_MERGER_DIR) && go test -race -covermode atomic -coverprofile=../coverage-azure-ip-masq-merger.out && go tool cover -func=../coverage-azure-ip-masq-merger.out
 
 test-azure-iptables-monitor: ## run the unit test for azure-iptables-monitor
-	cd $(AZURE_IPTABLES_MONITOR_DIR) && go test -race -covermode atomic -coverprofile=../coverage-azure-iptables-monitor.out && go tool cover  -func=../coverage-azure-iptables-monitor.out
+	cd $(AZURE_IPTABLES_MONITOR_DIR) && go test -race -covermode atomic -coverprofile=../coverage-azure-iptables-monitor.out && go tool cover -func=../coverage-azure-iptables-monitor.out
 
 kind:
 	kind create cluster --config ./test/kind/kind.yaml
@@ -985,7 +985,8 @@ gitconfig: ## configure the local git repository
 	@git config core.fsmonitor true
 	@git config core.untrackedcache true
 
-setup: install-hooks gitconfig ## performs common required repo setup
+setup: tools install-hooks gitconfig ## performs common required repo setup
+
 
 ##@ Tools
 

build/images.mk

@@ -26,6 +26,5 @@ print:
 	@echo ${WIN_HPC_PIN}
 
 render:
-	@echo "${GOPATH}"
 	${GOPATH}/bin/renderkit -f ${SRC} --ds env:// > ${DEST}
 	${GOPATH}/bin/renderkit -f ${SRC_PIPE} --ds env:// > ${DEST_PIPE}

scripts/install-protoc.sh

@@ -32,15 +32,15 @@ fi
 # install protoc-gen-go
 if [ ! -f ${GOPATH}/bin/protoc-gen-go ]; then
 	echo "Installing protoc-gen-go"
-	go install -modfile=${REPO_ROOT}/tools.go.mod github.com/golang/protobuf/protoc-gen-go@v1.26
+	go install -modfile=${REPO_ROOT}/tools.go.mod github.com/golang/protobuf/protoc-gen-go
 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 -modfile=${REPO_ROOT}/tools.go.mod google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.1
+	go install -modfile=${REPO_ROOT}/tools.go.mod google.golang.org/grpc/cmd/protoc-gen-go-grpc
 else
 	echo "protoc-gen-go-grpc already installed at ${GOPATH}/bin/protoc-gen-go-grpc"
 fi