Update dockerfiles to use go v1.22 (#2931)

* update dockerfiles to use go v1.22 * more changes * mod file update * revert bpf-prog * fix for e2e * remove/update comment
Azure · Aug 27, 2024 · 8359dbb · 8359dbb
1 parent 0a47e17
commit 8359dbb
Show file tree

Hide file tree

Showing 21 changed files with 42 additions and 43 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-ARG VARIANT="1.21"
+ARG VARIANT="1.22"
 FROM mcr.microsoft.com/vscode/devcontainers/go:${VARIANT}
 RUN apt-get update && \
     export DEBIAN_FRONTEND=noninteractive && \

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -5,7 +5,7 @@
 	"build": {
 		"dockerfile": "Dockerfile",
 		"args": {
-			"VARIANT": "1.21-bullseye",
+			"VARIANT": "1.22-bullseye",
 			"NODE_VERSION": "none"
 		}
 	},

diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
@@ -2,12 +2,12 @@ name: "CodeQL"
 on:
   push:
     branches:
-    - master
-    - release/*
+      - master
+      - release/*
   pull_request:
     branches:
-    - master
-    - release/*
+      - master
+      - release/*
     types:
       - opened
       - reopened
@@ -32,21 +32,21 @@ jobs:
       contents: read
       security-events: write
     steps:
-    - name: Setup go
-      uses: actions/setup-go@v5
-      with:
-        go-version: '1.21.0'
-        check-latest: true
-    - name: Checkout repository
-      uses: actions/checkout@v4
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
-      with:
-        languages: ${{ matrix.language }}
-        queries: ./codeql/
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
-      with:
-        category: "/language:${{matrix.language}}"
+      - name: Setup go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.22"
+          check-latest: true
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+          queries: ./codeql/
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v3
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
+        with:
+          category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/crdgen.yaml b/.github/workflows/crdgen.yaml
@@ -14,7 +14,7 @@ jobs:
   crdgen:
     strategy:
       matrix:
-        go-version: ['1.21']
+        go-version: ['1.21', '1.22']
         os: [ubuntu-latest]
     name: CRDs are Generated
     runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/cyclonus-netpol-extended-nightly-test.yaml b/.github/workflows/cyclonus-netpol-extended-nightly-test.yaml
@@ -26,7 +26,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: "^1.21"
+          go-version: "^1.22"
 
       - name: Setup Kind
         uses: engineerd/setup-kind@v0.5.0

diff --git a/.github/workflows/cyclonus-netpol-test.yaml b/.github/workflows/cyclonus-netpol-test.yaml
@@ -33,7 +33,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '^1.21'
+          go-version: '^1.22'
 
       - name: Setup Kind
         uses: helm/kind-action@v1

diff --git a/.github/workflows/golangci.yaml b/.github/workflows/golangci.yaml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: ['1.21.x']
+        go-version: ['1.21.x', '1.22.x']
         os: [ubuntu-latest, windows-latest]
     name: Lint
     runs-on: ${{ matrix.os }}

diff --git a/Makefile b/Makefile
@@ -824,9 +824,8 @@ RESTART_CASE ?= false
 # CNI type is a key to direct the types of state validation done on a cluster.
 CNI_TYPE ?= cilium
 
-# COVER_FILTER omits folders with all files tagged with one of 'unit', '!ignore_uncovered', or '!ignore_autogenerated'
 test-all: ## run all unit tests.
-	@$(eval COVER_FILTER=`go list --tags ignore_uncovered,ignore_autogenerated $(COVER_PKG)/... | tr '\n' ','`)
+	@$(eval COVER_FILTER=`go list $(COVER_PKG)/... | tr '\n' ','`)
 	@echo Test coverpkg: $(COVER_FILTER)
 	go test -mod=readonly -buildvcs=false -tags "unit" --skip 'TestE2E*' -coverpkg=$(COVER_FILTER) -race -covermode atomic -coverprofile=coverage.out $(COVER_PKG)/...
 

diff --git a/azure-ipam/go.mod b/azure-ipam/go.mod
@@ -1,6 +1,6 @@
 module github.com/Azure/azure-container-networking/azure-ipam
 
-go 1.21
+go 1.22
 
 require (
 	github.com/Azure/azure-container-networking v1.5.21

diff --git a/build/tools/go.mod b/build/tools/go.mod
@@ -1,6 +1,6 @@
 module github.com/Azure/azure-container-networking/build/tools
 
-go 1.21
+go 1.22
 
 require (
 	github.com/AlekSi/gocov-xml v1.1.0

diff --git a/dropgz/build/linux.Dockerfile b/dropgz/build/linux.Dockerfile
@@ -36,7 +36,7 @@ COPY --from=azure-vnet /azure-container-networking/azure-vnet-ipam pkg/embed/fs
 RUN cd pkg/embed/fs/ && sha256sum * > sum.txt
 RUN gzip --verbose --best --recursive pkg/embed/fs && for f in pkg/embed/fs/*.gz; do mv -- "$f" "${f%%.gz}"; done
 
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.21 AS dropgz
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.22 AS dropgz
 ARG VERSION
 WORKDIR /dropgz
 COPY --from=compressor /dropgz .

diff --git a/dropgz/build/windows.Dockerfile b/dropgz/build/windows.Dockerfile
@@ -28,7 +28,7 @@ COPY --from=azure-vnet /azure-container-networking/azure-vnet-telemetry.config p
 RUN cd pkg/embed/fs/ && sha256sum * > sum.txt
 RUN gzip --verbose --best --recursive pkg/embed/fs && for f in pkg/embed/fs/*.gz; do mv -- "$f" "${f%%.gz}"; done
 
-FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.21 AS dropgz
+FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.22 AS dropgz
 ARG VERSION
 WORKDIR /dropgz
 COPY --from=compressor /dropgz .

diff --git a/dropgz/go.mod b/dropgz/go.mod
@@ -1,6 +1,6 @@
 module github.com/Azure/azure-container-networking/dropgz
 
-go 1.21
+go 1.22
 
 require (
 	github.com/jsternberg/zap-logfmt v1.3.0

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/Azure/azure-container-networking
 
-go 1.21
+go 1.22
 
 require (
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0

diff --git a/hack/toolbox/Dockerfile.windows b/hack/toolbox/Dockerfile.windows
@@ -1,5 +1,5 @@
 # Build cns
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.21 AS builder
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.22 AS builder
 # Build args
 ARG VERSION
 ARG CNS_AI_PATH

diff --git a/hack/toolbox/server/Dockerfile.heavy b/hack/toolbox/server/Dockerfile.heavy
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.21 as build
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.22 as build
 ADD ./ /
 WORKDIR /
 RUN CGO_ENABLED=0 GOOS=linux go build -o server .

diff --git a/hack/toolbox/server/Dockerfile.lite b/hack/toolbox/server/Dockerfile.lite
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.21 as build
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.22 as build
 ADD ./server/server.go /
 ADD ./server/go.mod /
 WORKDIR /

diff --git a/npm/linux.Dockerfile b/npm/linux.Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.21 AS builder
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.22 AS builder
 ARG VERSION
 ARG NPM_AI_PATH
 ARG NPM_AI_ID

diff --git a/npm/windows.Dockerfile b/npm/windows.Dockerfile
@@ -1,5 +1,5 @@
 ARG OS_VERSION
-FROM --platform=linux/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.21 AS builder
+FROM --platform=linux/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.22 AS builder
 ARG VERSION
 ARG NPM_AI_PATH
 ARG NPM_AI_ID

diff --git a/tools/acncli/Dockerfile b/tools/acncli/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.21 as build
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.22 as build
 WORKDIR /go/src/github.com/Azure/azure-container-networking/
 ARG VERSION
 ADD . . 

diff --git a/zapai/go.mod b/zapai/go.mod
@@ -1,6 +1,6 @@
 module github.com/Azure/azure-container-networking/zapai
 
-go 1.21
+go 1.22
 
 require (
 	github.com/jsternberg/zap-logfmt v1.3.0