chore: cleanup rebase

Author: jpayne3506

.github/workflows/codeql.yaml

@@ -32,12 +32,12 @@ jobs:
       contents: read
       security-events: write
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
       - name: Setup go
         uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
-      - name: Checkout repository
-        uses: actions/checkout@v4
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3
         with:

.github/workflows/golangci.yaml

@@ -19,12 +19,12 @@ jobs:
     name: Lint
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/setup-go@v5
-      with:
-        go-version-file: go.mod
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
+    - uses: actions/setup-go@v5
+      with:
+        go-version-file: go.mod
     - name: golangci-lint
       uses: golangci/golangci-lint-action@v6
       with:

Makefile

@@ -107,6 +107,9 @@ CNI_IMAGE_INFO_FILE			= azure-cni-$(CNI_VERSION).txt
 CNS_IMAGE_INFO_FILE			= azure-cns-$(CNS_VERSION).txt
 NPM_IMAGE_INFO_FILE			= azure-npm-$(NPM_VERSION).txt
 
+#Tools paths
+TOOLS_GO_MOD = $(REPO_ROOT)/tools.go.mod
+
 # Default target
 all-binaries-platforms: ## Make all platform binaries
 	@for goos in "$(GOOSES)"; do \
@@ -846,7 +849,7 @@ clean: ## Clean build artifacts.
 
 LINT_PKG ?= .
 
-GOLANGCI_LINT = go tool golangci-lint
+GOLANGCI_LINT = go tool -modfile=$(TOOLS_GO_MOD) golangci-lint
 
 lint: ## Fast lint vs default branch showing only new issues.
 	GOGC=20 $(GOLANGCI_LINT) run --timeout 25m -v $(LINT_PKG)/...
@@ -882,7 +885,7 @@ test-all: test-azure-ipam test-azure-ip-masq-merger test-azure-iptables-monitor
 
 test-main:
 	go test -mod=readonly -buildvcs=false -tags "unit" --skip 'TestE2E*' -race -covermode atomic -coverprofile=coverage-main.out $(COVER_PKG)/...
-	go tool cover -func=coverage-main.out
+	go tool -modfile=$(TOOLS_GO_MOD) cover -func=coverage-main.out
 
 test-integration: ## run all integration tests.
 	AZURE_IPAM_VERSION=$(AZURE_IPAM_VERSION) \
@@ -913,13 +916,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 -modfile=$(TOOLS_GO_MOD) -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 -modfile=$(TOOLS_GO_MOD) -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 -modfile=$(TOOLS_GO_MOD) -func=../coverage-azure-iptables-monitor.out
 
 kind:
 	kind create cluster --config ./test/kind/kind.yaml
@@ -961,7 +964,7 @@ setup: install-hooks gitconfig ## performs common required repo setup
 tools: renderkit
 
 renderkit: ## Install renderkit for rendering Dockerfile templates
-	@go install -modfile=tools.go.mod github.com/orellazri/renderkit
+	@go install -modfile=$(TOOLS_GO_MOD) github.com/orellazri/renderkit
 
 ##@ Help