Skip to content

Commit 45e58cc

Browse files
aggarwal0009aggarwal0009
authored
upgrade to go v1.22.7 (#3046)
1 parent 21265a7 commit 45e58cc

28 files changed

+78
-71
lines changed

‎.devcontainer/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.203.0/containers/go/.devcontainer/base.Dockerfile
22

33
# [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
4-
ARG VARIANT="1.21"
4+
ARG VARIANT="1.22"
55
FROM mcr.microsoft.com/vscode/devcontainers/go:${VARIANT}
66

77
# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// Update the VARIANT arg to pick a version of Go: 1, 1.16, 1.17
99
// Append -bullseye or -buster to pin to an OS version.
1010
// Use -bullseye variants on local arm64/Apple Silicon.
11-
"VARIANT": "1.21-bullseye",
11+
"VARIANT": "1.22-bullseye",
1212
// Options
1313
"NODE_VERSION": "none"
1414
}

‎.github/workflows/crdgen.yaml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@ on:
33
workflow_dispatch:
44
pull_request:
55
types:
6-
- opened
7-
- reopened
8-
- synchronize
9-
- ready_for_review
6+
- opened
7+
- reopened
8+
- synchronize
9+
- ready_for_review
1010
jobs:
1111
crdgen119:
1212
strategy:
1313
matrix:
14-
go-version: ['1.21']
14+
go-version: ["1.21", "1.22"]
1515
os: [ubuntu-latest]
1616
name: CRDs are Generated
1717
runs-on: ${{ matrix.os }}
1818
steps:
19-
- uses: actions/checkout@v3
20-
with:
21-
fetch-depth: 0
22-
- uses: actions/setup-go@v4
23-
with:
24-
go-version: ${{ matrix.go-version }}
25-
- name: Regenerate NodeNetworkConfig CRD
26-
run: make -C crd/nodenetworkconfig
27-
- name: Regenerate MultitenantNetworkContainer CRD
28-
run: make -C crd/multitenantnetworkcontainer
29-
- name: Fail if the tree is dirty
30-
run: test -z "$(git status --porcelain)"
19+
- uses: actions/checkout@v3
20+
with:
21+
fetch-depth: 0
22+
- uses: actions/setup-go@v4
23+
with:
24+
go-version: ${{ matrix.go-version }}
25+
- name: Regenerate NodeNetworkConfig CRD
26+
run: make -C crd/nodenetworkconfig
27+
- name: Regenerate MultitenantNetworkContainer CRD
28+
run: make -C crd/multitenantnetworkcontainer
29+
- name: Fail if the tree is dirty
30+
run: test -z "$(git status --porcelain)"

‎.github/workflows/cyclonus-netpol-extended-nightly-test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
- uses: actions/setup-go@v4
2929
with:
30-
go-version: "^1.21"
30+
go-version: "^1.22"
3131

3232
- name: Setup Kind
3333
uses: engineerd/[email protected]

‎.github/workflows/cyclonus-netpol-test.yaml‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,34 @@ on:
77
- main
88
pull_request:
99
paths:
10-
- 'npm/**'
11-
- 'github/**'
12-
- 'test/**'
10+
- "npm/**"
11+
- "github/**"
12+
- "test/**"
1313
schedule:
1414
# run once a day at midnight
15-
- cron: '0 0 * * *'
15+
- cron: "0 0 * * *"
1616

1717
jobs:
1818
cyclonus-test:
1919
runs-on: ubuntu-latest
2020
strategy:
2121
matrix:
2222
# run cyclonus tests in parallel for NPM with the given ConfigMaps
23-
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]
23+
profile:
24+
[
25+
v1-default.yaml,
26+
v1-place-azure-chain-first.yaml,
27+
v2-default.yaml,
28+
v2-apply-on-need.yaml,
29+
v2-place-azure-after-kube-services.yaml,
30+
]
2431
steps:
2532
- name: Checkout
2633
uses: actions/checkout@v3
2734

2835
- uses: actions/setup-go@v4
2936
with:
30-
go-version: '^1.21'
37+
go-version: "^1.22"
3138

3239
- name: Setup Kind
3340
uses: engineerd/[email protected]
@@ -43,7 +50,7 @@ jobs:
4350
- name: Make NPM image
4451
run: |
4552
make npm-image NPM_PLATFORM_TAG=cyclonus PLATFORM=linux/amd64 CONTAINER_BUILDER=docker BUILDX_ACTION='--load'
46-
53+
4754
- name: Install Azure NPM
4855
# set the ConfigMap based on the build matrix
4956
# currently have to restart the daemonset because changing the ConfigMap doesn't restart NPM
@@ -54,7 +61,7 @@ jobs:
5461
echo "Applying profile: ${{ matrix.profile }}"
5562
kubectl apply -f ./npm/profiles/${{ matrix.profile }}
5663
kubectl rollout restart ds azure-npm -n kube-system
57-
64+
5865
- name: Check Cluster Components
5966
run: |
6067
sleep 10
@@ -70,7 +77,7 @@ jobs:
7077
kubectl logs -n kube-system -l k8s-app=azure-npm --tail -1 --prefix > npm-logs_${{ matrix.profile }}.txt
7178
mv ./test/cyclonus/cyclonus-test.txt ./cyclonus-test_${{ matrix.profile }}.txt
7279
73-
- name: 'Upload Logs'
80+
- name: "Upload Logs"
7481
uses: actions/upload-artifact@v3
7582
if: always()
7683
with:

‎.github/workflows/golangci.yaml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
go-version: ["1.21.x"]
15+
go-version: ["1.21.x", "1.22.x"]
1616
os: [ubuntu-latest, windows-latest]
1717
name: Lint
1818
runs-on: ${{ matrix.os }}
1919
steps:
20-
- uses: actions/setup-go@v4
21-
with:
22-
go-version: ${{ matrix.go-version }}
23-
- uses: actions/checkout@v3
24-
with:
25-
fetch-depth: 0
26-
- name: golangci-lint
27-
uses: golangci/golangci-lint-action@v3
28-
with:
29-
version: v1.55.2
30-
args: --timeout=25m
31-
only-new-issues: true
20+
- uses: actions/setup-go@v4
21+
with:
22+
go-version: ${{ matrix.go-version }}
23+
- uses: actions/checkout@v3
24+
with:
25+
fetch-depth: 0
26+
- name: golangci-lint
27+
uses: golangci/golangci-lint-action@v3
28+
with:
29+
version: v1.55.2
30+
args: --timeout=25m
31+
only-new-issues: true

‎azure-ipam/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/Azure/azure-container-networking/azure-ipam
22

3-
go 1.21
3+
go 1.22.7
44

55
require (
66
github.com/pkg/errors v0.9.1

‎azure-ipam/linux.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG DROPGZ_VERSION=v0.0.12
33
ARG OS_VERSION
44
ARG OS
55

6-
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.21 AS azure-ipam
6+
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.22 AS azure-ipam
77
ARG OS
88
ARG VERSION
99
WORKDIR /azure-ipam
@@ -18,7 +18,7 @@ COPY --from=azure-ipam /azure-ipam/*.conflist /payload
1818
RUN cd /payload && sha256sum * > sum.txt
1919
RUN gzip --verbose --best --recursive /payload && for f in /payload/*.gz; do mv -- "$f" "${f%%.gz}"; done
2020

21-
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.21 AS dropgz
21+
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.22 AS dropgz
2222
ARG DROPGZ_VERSION
2323
ARG OS
2424
ARG VERSION

‎azure-ipam/windows.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG DROPGZ_VERSION=v0.0.12
33
ARG OS
44
ARG OS_VERSION
55

6-
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.21 AS azure-ipam
6+
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.22 AS azure-ipam
77
ARG OS
88
ARG VERSION
99
WORKDIR /azure-ipam
@@ -18,7 +18,7 @@ COPY --from=azure-ipam /azure-ipam/*.conflist /payload
1818
RUN cd /payload && sha256sum * > sum.txt
1919
RUN gzip --verbose --best --recursive /payload && for f in /payload/*.gz; do mv -- "$f" "${f%%.gz}"; done
2020

21-
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.21 AS dropgz
21+
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang:1.22 AS dropgz
2222
ARG DROPGZ_VERSION
2323
ARG OS
2424
ARG VERSION

‎build/tools/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/Azure/azure-container-networking/build/tools
22

3-
go 1.21
3+
go 1.22.7
44

55
require (
66
github.com/AlekSi/gocov-xml v1.1.0

0 commit comments

Comments
 (0)