upgrade to v1.22

Azure · Oct 1, 2024 · 72a13b4 · 72a13b4
1 parent 43b6778
commit 72a13b4
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 66 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -6,7 +6,7 @@
  "build": {
  "dockerfile": "Dockerfile",
  "args": {
- "VARIANT": "1.22-bullseye",
+ "VARIANT": "1.22.7-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,20 +32,20 @@ jobs:
  contents: read
  security-events: write
  steps:
- - name: Setup go
- uses: actions/setup-go@v5
- with:
- go-version: '1.21'
- check-latest: true
- - name: Checkout repository
- uses: actions/checkout@v4
- - name: Initialize CodeQL
- uses: github/codeql-action/init@v3
- with:
- languages: ${{ matrix.language }}
- - 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.7"
+  check-latest: true
+  - name: Checkout repository
+  uses: actions/checkout@v4
+  - name: Initialize CodeQL
+  uses: github/codeql-action/init@v3
+  with:
+  languages: ${{ matrix.language }}
+  - 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
@@ -3,33 +3,33 @@ on:
  workflow_dispatch:
  pull_request:
  types:
-  - opened
-  - reopened
-  - synchronize
-  - ready_for_review
+ - opened
+ - reopened
+ - synchronize
+ - ready_for_review
  merge_group:
  types:
  - checks_requested
 jobs:
  crdgen:
  strategy:
  matrix:
- go-version: ['1.21']
+ go-version: ["1.21", "1.22.7"]
  os: [ubuntu-latest]
  name: CRDs are Generated
  runs-on: ${{ matrix.os }}
  steps:
- - uses: actions/checkout@v4
- with:
- fetch-depth: 0
- - uses: actions/setup-go@v5
- 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: Regenerate Multitenancy CRDs
- run: make -C crd/multitenancy
- - name: Fail if the tree is dirty
- run: test -z "$(git status --porcelain)"
+  - uses: actions/checkout@v4
+  with:
+  fetch-depth: 0
+  - uses: actions/setup-go@v5
+  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: Regenerate Multitenancy CRDs
+  run: make -C crd/multitenancy
+  - 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
@@ -26,7 +26,7 @@ jobs:
 
  - uses: actions/setup-go@v5
  with:
- go-version: "^1.21"
+ go-version: "^1.22.7"
 
  - name: Setup Kind
  uses: engineerd/[email protected]

diff --git a/.github/workflows/cyclonus-netpol-test.yaml b/.github/workflows/cyclonus-netpol-test.yaml
@@ -8,11 +8,11 @@ on:
  - release/*
  pull_request:
  paths:
- - 'npm/**'
- - '.github/**'
+ - "npm/**"
+ - ".github/**"
  schedule:
  # run once a day at midnight
- - cron: '0 0 * * *'
+ - cron: "0 0 * * *"
 
 jobs:
  cyclonus-test:
@@ -33,7 +33,7 @@ jobs:
 
  - uses: actions/setup-go@v5
  with:
- go-version: '^1.21'
+ go-version: "^1.22.7"
 
  - name: Setup Kind
  uses: helm/kind-action@v1
@@ -77,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@v4
  if: always()
  with:

diff --git a/.github/workflows/golangci.yaml b/.github/workflows/golangci.yaml
@@ -15,19 +15,19 @@ 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@v5
- with:
- go-version: ${{ matrix.go-version }}
- - uses: actions/checkout@v4
- with:
- fetch-depth: 0
- - name: golangci-lint
- uses: golangci/golangci-lint-action@v5
- with:
- version: v1.55
- args: --new-from-rev=origin/release/v1.5 --config=.golangci.yml --timeout=25m 
+  - uses: actions/setup-go@v5
+  with:
+  go-version: ${{ matrix.go-version }}
+  - uses: actions/checkout@v4
+  with:
+  fetch-depth: 0
+  - name: golangci-lint
+  uses: golangci/golangci-lint-action@v5
+  with:
+  version: v1.55
+  args: --new-from-rev=origin/release/v1.5 --config=.golangci.yml --timeout=25m
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/Azure/azure-container-networking v1.5.21

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.7 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.7 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.7 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.7 AS dropgz
 ARG DROPGZ_VERSION
 ARG OS
 ARG VERSION

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/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.7
 
 require (
  github.com/jsternberg/zap-logfmt v1.3.0