fix: address review feedback - move tools-go, fix GOEXPERIMENT, bump to 1.26.1

behzad-mir · Copilot · behzad-mir · commit ebfba40f0ee7 · 2026-06-02T20:35:28.000Z
- Move tools.go.mod to tools-go/go.mod with own module path
- Update all Makefile and script references to tools-go/go.mod
- Remove GOEXPERIMENT=systemcrypto from CGO_ENABLED=0 scripts and Dockerfiles
- Bump go directive from 1.26 to 1.26.1 per reviewer feedback
- Run go mod tidy on both root and tools-go modules

Co-authored-by: Copilot &lt;223556219+Copilot@users.noreply.github.com&gt;
diff --git a/.pipelines/build/scripts/azure-ip-masq-merger.sh b/.pipelines/build/scripts/azure-ip-masq-merger.sh
@@ -5,7 +5,6 @@ set -eux
 FILE_EXT=''
 
 export CGO_ENABLED=0
-export GOEXPERIMENT=systemcrypto
 
 mkdir -p "$OUT_DIR"/bin
 mkdir -p "$OUT_DIR"/files
diff --git a/.pipelines/build/scripts/azure-ipam.sh b/.pipelines/build/scripts/azure-ipam.sh
@@ -4,7 +4,6 @@ set -eux
 [[ $OS =~ windows ]] && FILE_EXT='.exe' || FILE_EXT=''
 
 export CGO_ENABLED=0
-export GOEXPERIMENT=systemcrypto
 
 mkdir -p "$OUT_DIR"/bin
 mkdir -p "$OUT_DIR"/files
diff --git a/.pipelines/build/scripts/azure-iptables-monitor.sh b/.pipelines/build/scripts/azure-iptables-monitor.sh
@@ -5,7 +5,6 @@ set -eux
 FILE_EXT=''
 
 export CGO_ENABLED=0
-export GOEXPERIMENT=systemcrypto
 export C_INCLUDE_PATH=/usr/include/bpf
 
 mkdir -p "$OUT_DIR"/bin
diff --git a/.pipelines/build/scripts/cni.sh b/.pipelines/build/scripts/cni.sh
@@ -7,7 +7,6 @@ mkdir -p "$OUT_DIR"/files
 mkdir -p "$OUT_DIR"/bin
 
 export CGO_ENABLED=0
-export GOEXPERIMENT=systemcrypto
 
 
 CNI_NET_DIR="$REPO_ROOT"/cni/network/plugin
diff --git a/.pipelines/build/scripts/cns.sh b/.pipelines/build/scripts/cns.sh
@@ -4,7 +4,6 @@ set -eux
 [[ $OS =~ windows ]] && FILE_EXT='.exe' || FILE_EXT=''
 
 export CGO_ENABLED=0
-export GOEXPERIMENT=systemcrypto
 
 mkdir -p "$OUT_DIR"/files
 mkdir -p "$OUT_DIR"/bin
diff --git a/.pipelines/build/scripts/dropgz.sh b/.pipelines/build/scripts/dropgz.sh
@@ -21,7 +21,6 @@ function files::remove_exe_extensions() {
 [[ $OS =~ windows ]] && FILE_EXT='.exe' || FILE_EXT=''
 
 export CGO_ENABLED=0
-export GOEXPERIMENT=systemcrypto
 
 mkdir -p "$GEN_DIR"
 mkdir -p "$OUT_DIR"/bin
diff --git a/.pipelines/build/scripts/ipv6-hp-bpf.sh b/.pipelines/build/scripts/ipv6-hp-bpf.sh
@@ -38,7 +38,6 @@ function findcp::shared_library() {
 [[ $OS =~ windows ]] && FILE_EXT='.exe' || FILE_EXT=''
 
 export CGO_ENABLED=0
-export GOEXPERIMENT=systemcrypto
 export C_INCLUDE_PATH=/usr/include/bpf
 
 mkdir -p "$OUT_DIR"/bin
diff --git a/.pipelines/build/scripts/npm.sh b/.pipelines/build/scripts/npm.sh
@@ -4,7 +4,6 @@ set -eux
 [[ $OS =~ windows ]] && FILE_EXT='.exe' || FILE_EXT=''
 
 export CGO_ENABLED=0
-export GOEXPERIMENT=systemcrypto
 
 mkdir -p "$OUT_DIR"/files
 mkdir -p "$OUT_DIR"/bin
diff --git a/Makefile b/Makefile
@@ -115,7 +115,7 @@ 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
+TOOLS_GO_MOD = $(REPO_ROOT)/tools-go/go.mod
 
 # Default target
 all-binaries-platforms: ## Make all platform binaries
diff --git a/azure-ip-masq-merger/Dockerfile b/azure-ip-masq-merger/Dockerfile
@@ -5,7 +5,6 @@ ARG OS
 
 # mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0
 FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:eb3ce814e96f3319f1b5985021021682b47975f6decfe00eaac84abff0ae25c9 AS go
-ENV GOEXPERIMENT=systemcrypto
 
 FROM go AS azure-ip-masq-merger
 ARG OS
diff --git a/azure-ip-masq-merger/Dockerfile.tmpl b/azure-ip-masq-merger/Dockerfile.tmpl
@@ -5,7 +5,6 @@ ARG OS
 
 # {{.GO_IMG}}
 FROM --platform=linux/${ARCH} {{.GO_PIN}} AS go
-ENV GOEXPERIMENT=systemcrypto
 
 FROM go AS azure-ip-masq-merger
 ARG OS
diff --git a/azure-ipam/Dockerfile b/azure-ipam/Dockerfile
@@ -7,7 +7,6 @@ ARG OS
 
 # mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0
 FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:eb3ce814e96f3319f1b5985021021682b47975f6decfe00eaac84abff0ae25c9 AS go
-ENV GOEXPERIMENT=systemcrypto
 
 # mcr.microsoft.com/azurelinux/base/core:3.0
 FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:35149ae8dd179684f969944f54a337c665a64e702486154eb44253fb39c2505b AS mariner-core
diff --git a/azure-ipam/Dockerfile.tmpl b/azure-ipam/Dockerfile.tmpl
@@ -7,7 +7,6 @@ ARG OS
 
 # {{.GO_IMG}}
 FROM --platform=linux/${ARCH} {{.GO_PIN}} AS go
-ENV GOEXPERIMENT=systemcrypto
 
 # {{.MARINER_CORE_IMG}}
 FROM --platform=linux/${ARCH} {{.MARINER_CORE_PIN}} AS mariner-core
diff --git a/azure-iptables-monitor/Dockerfile b/azure-iptables-monitor/Dockerfile
@@ -10,7 +10,6 @@ FROM mcr.microsoft.com/azurelinux/distroless/base@sha256:32820d2cf20e896aa911174
 
 # mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0
 FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:eb3ce814e96f3319f1b5985021021682b47975f6decfe00eaac84abff0ae25c9 AS go
-ENV GOEXPERIMENT=systemcrypto
 
 
 FROM go AS azure-iptables-monitor
diff --git a/azure-iptables-monitor/Dockerfile.tmpl b/azure-iptables-monitor/Dockerfile.tmpl
@@ -10,7 +10,6 @@ FROM {{.MARINER_DISTROLESS_PIN}} AS mariner-distroless
 
 # {{.GO_IMG}}
 FROM --platform=linux/${ARCH} {{.GO_PIN}} AS go
-ENV GOEXPERIMENT=systemcrypto
 
 
 FROM go AS azure-iptables-monitor
diff --git a/bpf-prog/ipv6-hp-bpf/linux.Dockerfile b/bpf-prog/ipv6-hp-bpf/linux.Dockerfile
@@ -6,7 +6,6 @@ ARG DEBUG
 ARG OS
 ARG ARCH
 WORKDIR /bpf-prog/ipv6-hp-bpf
-ENV GOEXPERIMENT=systemcrypto
 COPY ./bpf-prog/ipv6-hp-bpf .
 COPY ./bpf-prog/ipv6-hp-bpf/cmd/ipv6-hp-bpf/*.go /bpf-prog/ipv6-hp-bpf/
 COPY ./bpf-prog/ipv6-hp-bpf/include/helper.h /bpf-prog/ipv6-hp-bpf/include/helper.h
diff --git a/cni/Dockerfile b/cni/Dockerfile
@@ -7,7 +7,6 @@ ARG OS
 
 # mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0
 FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:eb3ce814e96f3319f1b5985021021682b47975f6decfe00eaac84abff0ae25c9 AS go
-ENV GOEXPERIMENT=systemcrypto
 
 # mcr.microsoft.com/azurelinux/base/core:3.0
 FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:35149ae8dd179684f969944f54a337c665a64e702486154eb44253fb39c2505b AS mariner-core
diff --git a/cni/Dockerfile.tmpl b/cni/Dockerfile.tmpl
@@ -7,7 +7,6 @@ ARG OS
 
 # {{.GO_IMG}}
 FROM --platform=linux/${ARCH} {{.GO_PIN}} AS go
-ENV GOEXPERIMENT=systemcrypto
 
 # {{.MARINER_CORE_IMG}}
 FROM --platform=linux/${ARCH} {{.MARINER_CORE_PIN}} AS mariner-core
diff --git a/cns/Dockerfile b/cns/Dockerfile
@@ -6,7 +6,6 @@ ARG OS
 
 # mcr.microsoft.com/oss/go/microsoft/golang:1.26-azurelinux3.0
 FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:eb3ce814e96f3319f1b5985021021682b47975f6decfe00eaac84abff0ae25c9 AS go
-ENV GOEXPERIMENT=systemcrypto
 
 # mcr.microsoft.com/azurelinux/base/core:3.0
 FROM mcr.microsoft.com/azurelinux/base/core@sha256:35149ae8dd179684f969944f54a337c665a64e702486154eb44253fb39c2505b AS mariner-core
diff --git a/cns/Dockerfile.tmpl b/cns/Dockerfile.tmpl
@@ -6,7 +6,6 @@ ARG OS
 
 # {{.GO_IMG}}
 FROM --platform=linux/${ARCH} {{.GO_PIN}} AS go
-ENV GOEXPERIMENT=systemcrypto
 
 # {{.MARINER_CORE_IMG}}
 FROM {{.MARINER_CORE_PIN}} AS mariner-core
diff --git a/cns/multitenantcontroller/mockclients/Makefile b/cns/multitenantcontroller/mockclients/Makefile
@@ -1,5 +1,5 @@
 REPO_ROOT = $(shell git rev-parse --show-toplevel)
-MOCKGEN = go tool -modfile=$(REPO_ROOT)/tools.go.mod mockgen
+MOCKGEN = go tool -modfile=$(REPO_ROOT)/tools-go/go.mod mockgen
 
 generate: ## Generate mock clients
 	@go mod vendor
diff --git a/crd/clustersubnetstate/Makefile b/crd/clustersubnetstate/Makefile
@@ -1,7 +1,7 @@
 .DEFAULT_GOAL = all
 
 REPO_ROOT = $(shell git rev-parse --show-toplevel)
-CONTROLLER_GEN = go tool -modfile=$(REPO_ROOT)/tools.go.mod controller-gen
+CONTROLLER_GEN = go tool -modfile=$(REPO_ROOT)/tools-go/go.mod controller-gen
 
 all: generate manifests
 
diff --git a/crd/multitenancy/Makefile b/crd/multitenancy/Makefile
@@ -1,7 +1,7 @@
 .DEFAULT_GOAL = all
 
 REPO_ROOT = $(shell git rev-parse --show-toplevel)
-CONTROLLER_GEN = go tool -modfile=$(REPO_ROOT)/tools.go.mod controller-gen
+CONTROLLER_GEN = go tool -modfile=$(REPO_ROOT)/tools-go/go.mod controller-gen
 
 all: generate manifests
 
diff --git a/crd/multitenantnetworkcontainer/Makefile b/crd/multitenantnetworkcontainer/Makefile
@@ -1,7 +1,7 @@
 .DEFAULT_GOAL: all
 
 REPO_ROOT = $(shell git rev-parse --show-toplevel)
-CONTROLLER_GEN = go tool -modfile=$(REPO_ROOT)/tools.go.mod controller-gen
+CONTROLLER_GEN = go tool -modfile=$(REPO_ROOT)/tools-go/go.mod controller-gen
 
 all: generate manifests
 
diff --git a/crd/nodenetworkconfig/Makefile b/crd/nodenetworkconfig/Makefile
@@ -1,7 +1,7 @@
 .DEFAULT_GOAL = all
 
 REPO_ROOT = $(shell git rev-parse --show-toplevel)
-CONTROLLER_GEN = go tool -modfile=$(REPO_ROOT)/tools.go.mod controller-gen
+CONTROLLER_GEN = go tool -modfile=$(REPO_ROOT)/tools-go/go.mod controller-gen
 
 all: generate manifests
 
diff --git a/crd/overlayextensionconfig/Makefile b/crd/overlayextensionconfig/Makefile
@@ -1,7 +1,7 @@
 .DEFAULT_GOAL = all
 
 REPO_ROOT = $(shell git rev-parse --show-toplevel)
-CONTROLLER_GEN = go tool -modfile=$(REPO_ROOT)/tools.go.mod controller-gen
+CONTROLLER_GEN = go tool -modfile=$(REPO_ROOT)/tools-go/go.mod controller-gen
 
 all: generate manifests
 
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/Azure/azure-container-networking
 
-go 1.26
+go 1.26.1
 
 require (
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.1
diff --git a/npm/linux.Dockerfile b/npm/linux.Dockerfile
@@ -4,7 +4,6 @@ ARG NPM_AI_PATH
 ARG NPM_AI_ID
 WORKDIR /usr/local/src
 COPY . .
-ENV GOEXPERIMENT=systemcrypto
 RUN CGO_ENABLED=0 go build -v -o /usr/local/bin/azure-npm -ldflags "-s -w -X main.version="$VERSION" -X "$NPM_AI_PATH"="$NPM_AI_ID"" -gcflags="-dwarflocationlists=true" npm/cmd/*.go
 
 FROM mcr.microsoft.com/mirror/docker/library/ubuntu:24.04 as linux
diff --git a/npm/pkg/dataplane/Makefile b/npm/pkg/dataplane/Makefile
@@ -1,5 +1,5 @@
 REPO_ROOT = $(shell git rev-parse --show-toplevel)
-MOCKGEN = go tool -modfile=$(REPO_ROOT)/tools.go.mod mockgen
+MOCKGEN = go tool -modfile=$(REPO_ROOT)/tools-go/go.mod mockgen
 
 .PHONY: generate
 
diff --git a/npm/windows.Dockerfile b/npm/windows.Dockerfile
@@ -5,7 +5,6 @@ ARG NPM_AI_PATH
 ARG NPM_AI_ID
 WORKDIR /usr/local/src
 COPY . .
-ENV GOEXPERIMENT=systemcrypto
 RUN GOOS=windows CGO_ENABLED=0 go build -v -o /usr/local/bin/azure-npm.exe -ldflags "-s -w -X main.version="$VERSION" -X "$NPM_AI_PATH"="$NPM_AI_ID"" -gcflags="-dwarflocationlists=true" npm/cmd/*.go
 
 # intermediate for win-ltsc2022
diff --git a/platform/Makefile b/platform/Makefile
@@ -1,5 +1,5 @@
 REPO_ROOT = $(shell git rev-parse --show-toplevel)
-MOCKGEN = go tool -modfile=$(REPO_ROOT)/tools.go.mod mockgen
+MOCKGEN = go tool -modfile=$(REPO_ROOT)/tools-go/go.mod mockgen
 
 .PHONY: generate
 
diff --git a/scripts/install-protoc.sh b/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
+	go install -modfile=${REPO_ROOT}/tools-go/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
+	go install -modfile=${REPO_ROOT}/tools-go/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
diff --git a/tools-go/go.mod b/tools-go/go.mod
diff --git a/tools-go/go.sum b/tools-go/go.sum
