upgrade to go v1.22.7 (#3046)

Azure · Oct 3, 2024 · 45e58cc · 45e58cc
1 parent 21265a7
commit 45e58cc
Show file tree

Hide file tree

Showing 28 changed files with 78 additions and 71 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,7 +1,7 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.203.0/containers/go/.devcontainer/base.Dockerfile
 
 # [Choice] Go version (use -bullseye variants on local arm64/Apple Silicon): 1, 1.16, 1.17, 1-bullseye, 1.16-bullseye, 1.17-bullseye, 1-buster, 1.16-buster, 1.17-buster
-ARG VARIANT="1.21"
+ARG VARIANT="1.22"
 FROM mcr.microsoft.com/vscode/devcontainers/go:${VARIANT}
 
 # [Choice] Node.js version: none, lts/*, 16, 14, 12, 10

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -8,7 +8,7 @@
 			// Update the VARIANT arg to pick a version of Go: 1, 1.16, 1.17
 			// Append -bullseye or -buster to pin to an OS version.
 			// Use -bullseye variants on local arm64/Apple Silicon.
-			"VARIANT": "1.21-bullseye",
+			"VARIANT": "1.22-bullseye",
 			// Options
 			"NODE_VERSION": "none"
 		}

diff --git a/.github/workflows/crdgen.yaml b/.github/workflows/crdgen.yaml
@@ -3,28 +3,28 @@ on:
   workflow_dispatch:
   pull_request:
     types:
-        - opened
-        - reopened
-        - synchronize
-        - ready_for_review
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review
 jobs:
   crdgen119:
     strategy:
       matrix:
-        go-version: ['1.21']
+        go-version: ["1.21", "1.22"]
         os: [ubuntu-latest]
     name: CRDs are Generated
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-    - uses: actions/setup-go@v4
-      with:
-        go-version: ${{ matrix.go-version }} 
-    - name: Regenerate NodeNetworkConfig CRD
-      run: make -C crd/nodenetworkconfig
-    - name: Regenerate MultitenantNetworkContainer CRD
-      run: make -C crd/multitenantnetworkcontainer
-    - name: Fail if the tree is dirty
-      run: test -z "$(git status --porcelain)"
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-go@v4
+        with:
+          go-version: ${{ matrix.go-version }}
+      - name: Regenerate NodeNetworkConfig CRD
+        run: make -C crd/nodenetworkconfig
+      - name: Regenerate MultitenantNetworkContainer CRD
+        run: make -C crd/multitenantnetworkcontainer
+      - name: Fail if the tree is dirty
+        run: test -z "$(git status --porcelain)"
diff --git a/.github/workflows/cyclonus-netpol-extended-nightly-test.yaml b/.github/workflows/cyclonus-netpol-extended-nightly-test.yaml
@@ -27,7 +27,7 @@ jobs:
 
       - uses: actions/setup-go@v4
         with:
-          go-version: "^1.21"
+          go-version: "^1.22"
 
       - name: Setup Kind
         uses: engineerd/[email protected]

diff --git a/.github/workflows/cyclonus-netpol-test.yaml b/.github/workflows/cyclonus-netpol-test.yaml
@@ -7,27 +7,34 @@ on:
       - main
   pull_request:
     paths:
-      - 'npm/**'
-      - 'github/**'
-      - 'test/**'
+      - "npm/**"
+      - "github/**"
+      - "test/**"
   schedule:
     # run once a day at midnight
-    - cron: '0 0 * * *'
+    - cron: "0 0 * * *"
 
 jobs:
   cyclonus-test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         # run cyclonus tests in parallel for NPM with the given ConfigMaps
-        profile: [v1-default.yaml, v1-place-azure-chain-first.yaml, v2-default.yaml, v2-apply-on-need.yaml, v2-place-azure-after-kube-services.yaml]
+        profile:
+          [
+            v1-default.yaml,
+            v1-place-azure-chain-first.yaml,
+            v2-default.yaml,
+            v2-apply-on-need.yaml,
+            v2-place-azure-after-kube-services.yaml,
+          ]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
       - uses: actions/setup-go@v4
         with:
-          go-version: '^1.21'
+          go-version: "^1.22"
 
       - name: Setup Kind
         uses: engineerd/[email protected]
@@ -43,7 +50,7 @@ jobs:
       - name: Make NPM image
         run: |
           make npm-image NPM_PLATFORM_TAG=cyclonus PLATFORM=linux/amd64 CONTAINER_BUILDER=docker BUILDX_ACTION='--load'
-      
+
       - name: Install Azure NPM
         # set the ConfigMap based on the build matrix
         # currently have to restart the daemonset because changing the ConfigMap doesn't restart NPM
@@ -54,7 +61,7 @@ jobs:
           echo "Applying profile: ${{ matrix.profile }}"
           kubectl apply -f ./npm/profiles/${{ matrix.profile }}
           kubectl rollout restart ds azure-npm -n kube-system
-    
+
       - name: Check Cluster Components
         run: |
           sleep 10
@@ -70,7 +77,7 @@ jobs:
           kubectl logs -n kube-system -l k8s-app=azure-npm --tail -1 --prefix > npm-logs_${{ matrix.profile }}.txt
           mv ./test/cyclonus/cyclonus-test.txt ./cyclonus-test_${{ matrix.profile }}.txt
 
-      - name: 'Upload Logs'
+      - name: "Upload Logs"
         uses: actions/upload-artifact@v3
         if: always()
         with:

diff --git a/.github/workflows/golangci.yaml b/.github/workflows/golangci.yaml
@@ -12,20 +12,20 @@ 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 }}
     steps:
-    - uses: actions/setup-go@v4
-      with:
-        go-version: ${{ matrix.go-version }} 
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-    - name: golangci-lint
-      uses: golangci/golangci-lint-action@v3
-      with:
-        version: v1.55.2
-        args: --timeout=25m
-        only-new-issues: true
+      - uses: actions/setup-go@v4
+        with:
+          go-version: ${{ matrix.go-version }}
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: v1.55.2
+          args: --timeout=25m
+          only-new-issues: true
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.7
 
 require (
 	github.com/pkg/errors v0.9.1

diff --git a/azure-ipam/linux.Dockerfile b/azure-ipam/linux.Dockerfile
@@ -3,7 +3,7 @@ ARG DROPGZ_VERSION=v0.0.12
 ARG OS_VERSION
 ARG OS
 
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.21 AS azure-ipam
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.22 AS azure-ipam
 ARG OS
 ARG VERSION
 WORKDIR /azure-ipam
@@ -18,7 +18,7 @@ COPY --from=azure-ipam /azure-ipam/*.conflist /payload
 RUN cd /payload && sha256sum * > sum.txt
 RUN gzip --verbose --best --recursive /payload && for f in /payload/*.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 DROPGZ_VERSION
 ARG OS
 ARG VERSION

diff --git a/azure-ipam/windows.Dockerfile b/azure-ipam/windows.Dockerfile
@@ -3,7 +3,7 @@ ARG DROPGZ_VERSION=v0.0.12
 ARG OS
 ARG OS_VERSION
 
-FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.21 AS azure-ipam
+FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.22 AS azure-ipam
 ARG OS
 ARG VERSION
 WORKDIR /azure-ipam
@@ -18,7 +18,7 @@ COPY --from=azure-ipam /azure-ipam/*.conflist /payload
 RUN cd /payload && sha256sum * > sum.txt
 RUN gzip --verbose --best --recursive /payload && for f in /payload/*.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 DROPGZ_VERSION
 ARG OS
 ARG VERSION

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.7
 
 require (
 	github.com/AlekSi/gocov-xml v1.1.0

diff --git a/cni/build/windows.Dockerfile b/cni/build/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 CNI_AI_PATH
 ARG CNI_AI_ID

diff --git a/cni/linux.Dockerfile b/cni/linux.Dockerfile
@@ -3,7 +3,7 @@ ARG DROPGZ_VERSION=v0.0.12
 ARG OS_VERSION
 ARG OS
 
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.21 AS azure-vnet
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.22 AS azure-vnet
 ARG OS
 ARG VERSION
 WORKDIR /azure-container-networking
@@ -23,7 +23,7 @@ COPY --from=azure-vnet /azure-container-networking/telemetry/azure-vnet-telemetr
 RUN cd /payload && sha256sum * > sum.txt
 RUN gzip --verbose --best --recursive /payload && for f in /payload/*.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 DROPGZ_VERSION
 ARG OS
 ARG VERSION

diff --git a/cni/windows.Dockerfile b/cni/windows.Dockerfile
@@ -3,7 +3,7 @@ ARG DROPGZ_VERSION=v0.0.12
 ARG OS
 ARG OS_VERSION
 
-FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.21 AS azure-vnet
+FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.22 AS azure-vnet
 ARG OS
 ARG VERSION
 WORKDIR /azure-container-networking
@@ -23,7 +23,7 @@ COPY --from=azure-vnet /azure-container-networking/telemetry/azure-vnet-telemetr
 RUN cd /payload && sha256sum * > sum.txt
 RUN gzip --verbose --best --recursive /payload && for f in /payload/*.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 DROPGZ_VERSION
 ARG OS
 ARG VERSION

diff --git a/cns/linux.Dockerfile b/cns/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 CNS_AI_PATH
 ARG CNS_AI_ID

diff --git a/cns/windows.Dockerfile b/cns/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 CNS_AI_PATH
 ARG CNS_AI_ID

diff --git a/dropgz/build/cniTest_linux.Dockerfile b/dropgz/build/cniTest_linux.Dockerfile
@@ -1,10 +1,10 @@
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.21 AS azure-ipam
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.22 AS azure-ipam
 ARG VERSION
 WORKDIR /azure-ipam
 COPY ./azure-ipam .
 RUN CGO_ENABLED=0 go build -a -o bin/azure-ipam -trimpath -ldflags "-X main.version="$VERSION"" -gcflags="-dwarflocationlists=true" .
 
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.21 AS azure-vnet
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.22 AS azure-vnet
 ARG VERSION
 WORKDIR /azure-container-networking
 COPY . .
@@ -27,7 +27,7 @@ COPY --from=azure-vnet /azure-container-networking/telemetry/azure-vnet-telemetr
 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/cniTest_windows.Dockerfile b/dropgz/build/cniTest_windows.Dockerfile
@@ -1,6 +1,6 @@
 ARG ARCH
 ARG OS_VERSION
-FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.21 AS azure-vnet
+FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.22 AS azure-vnet
 ARG VERSION
 WORKDIR /azure-container-networking
 COPY . .
@@ -19,7 +19,7 @@ COPY --from=azure-vnet /azure-container-networking/telemetry/azure-vnet-telemetr
 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/build/linux.Dockerfile b/dropgz/build/linux.Dockerfile
@@ -35,7 +35,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
@@ -25,7 +25,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.7
 
 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.7
 
 require (
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1

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 /
 WORKDIR /
 RUN CGO_ENABLED=0 GOOS=linux go build -o server .

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 . .