Skip to content

Commit 0ab889c

Browse files
aggarwal0009aggarwal0009
authored
Upgrade to go1.22.7 (#3040)
* add comment * upgrade to v1.22 * upgrade to v1.22 * upgrade npm to v1.22 * upgrade to 1.22.7 * upgrade to 1.22.7 * remove unnecessary comment * drop patch version * version change
1 parent d57e6c5 commit 0ab889c

28 files changed

+93
-93
lines changed

‎.devcontainer/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG VARIANT="1.21"
1+
ARG VARIANT="1.22"
22
FROM mcr.microsoft.com/vscode/devcontainers/go:${VARIANT}
33
RUN apt-get update && \
44
export DEBIAN_FRONTEND=noninteractive && \

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"build": {
66
"dockerfile": "Dockerfile",
77
"args": {
8-
"VARIANT": "1.21-bullseye",
8+
"VARIANT": "1.22-bullseye",
99
"NODE_VERSION": "none"
1010
}
1111
},

‎.github/workflows/codeql.yaml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ name: "CodeQL"
22
on:
33
push:
44
branches:
5-
- master
6-
- release/*
5+
- master
6+
- release/*
77
pull_request:
88
branches:
9-
- master
10-
- release/*
9+
- master
10+
- release/*
1111
types:
1212
- opened
1313
- reopened
@@ -32,20 +32,20 @@ jobs:
3232
contents: read
3333
security-events: write
3434
steps:
35-
- name: Setup go
36-
uses: actions/setup-go@v5
37-
with:
38-
go-version: '1.21'
39-
check-latest: true
40-
- name: Checkout repository
41-
uses: actions/checkout@v4
42-
- name: Initialize CodeQL
43-
uses: github/codeql-action/init@v3
44-
with:
45-
languages: ${{ matrix.language }}
46-
- name: Autobuild
47-
uses: github/codeql-action/autobuild@v3
48-
- name: Perform CodeQL Analysis
49-
uses: github/codeql-action/analyze@v3
50-
with:
51-
category: "/language:${{matrix.language}}"
35+
- name: Setup go
36+
uses: actions/setup-go@v5
37+
with:
38+
go-version: "1.22"
39+
check-latest: true
40+
- name: Checkout repository
41+
uses: actions/checkout@v4
42+
- name: Initialize CodeQL
43+
uses: github/codeql-action/init@v3
44+
with:
45+
languages: ${{ matrix.language }}
46+
- name: Autobuild
47+
uses: github/codeql-action/autobuild@v3
48+
- name: Perform CodeQL Analysis
49+
uses: github/codeql-action/analyze@v3
50+
with:
51+
category: "/language:${{matrix.language}}"

‎.github/workflows/crdgen.yaml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,33 @@ 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
merge_group:
1111
types:
1212
- checks_requested
1313
jobs:
1414
crdgen:
1515
strategy:
1616
matrix:
17-
go-version: ['1.21']
17+
go-version: ["1.21", "1.22"]
1818
os: [ubuntu-latest]
1919
name: CRDs are Generated
2020
runs-on: ${{ matrix.os }}
2121
steps:
22-
- uses: actions/checkout@v4
23-
with:
24-
fetch-depth: 0
25-
- uses: actions/setup-go@v5
26-
with:
27-
go-version: ${{ matrix.go-version }}
28-
- name: Regenerate NodeNetworkConfig CRD
29-
run: make -C crd/nodenetworkconfig
30-
- name: Regenerate MultitenantNetworkContainer CRD
31-
run: make -C crd/multitenantnetworkcontainer
32-
- name: Regenerate Multitenancy CRDs
33-
run: make -C crd/multitenancy
34-
- name: Fail if the tree is dirty
35-
run: test -z "$(git status --porcelain)"
22+
- uses: actions/checkout@v4
23+
with:
24+
fetch-depth: 0
25+
- uses: actions/setup-go@v5
26+
with:
27+
go-version: ${{ matrix.go-version }}
28+
- name: Regenerate NodeNetworkConfig CRD
29+
run: make -C crd/nodenetworkconfig
30+
- name: Regenerate MultitenantNetworkContainer CRD
31+
run: make -C crd/multitenantnetworkcontainer
32+
- name: Regenerate Multitenancy CRDs
33+
run: make -C crd/multitenancy
34+
- name: Fail if the tree is dirty
35+
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
@@ -26,7 +26,7 @@ jobs:
2626

2727
- uses: actions/setup-go@v5
2828
with:
29-
go-version: "^1.21"
29+
go-version: "^1.22"
3030

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

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ on:
88
- release/*
99
pull_request:
1010
paths:
11-
- 'npm/**'
12-
- '.github/**'
11+
- "npm/**"
12+
- ".github/**"
1313
schedule:
1414
# run once a day at midnight
15-
- cron: '0 0 * * *'
15+
- cron: "0 0 * * *"
1616

1717
jobs:
1818
cyclonus-test:
@@ -33,7 +33,7 @@ jobs:
3333

3434
- uses: actions/setup-go@v5
3535
with:
36-
go-version: '^1.21'
36+
go-version: "^1.22"
3737

3838
- name: Setup Kind
3939
uses: helm/kind-action@v1
@@ -77,7 +77,7 @@ jobs:
7777
kubectl logs -n kube-system -l k8s-app=azure-npm --tail -1 --prefix > npm-logs_${{ matrix.profile }}.txt
7878
mv ./test/cyclonus/cyclonus-test.txt ./cyclonus-test_${{ matrix.profile }}.txt
7979
80-
- name: 'Upload Logs'
80+
- name: "Upload Logs"
8181
uses: actions/upload-artifact@v4
8282
if: always()
8383
with:

‎.github/workflows/golangci.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
go-version: ['1.21.x']
18+
go-version: ["1.21.x", "1.22.x"]
1919
os: [ubuntu-latest, windows-latest]
2020
name: Lint
2121
runs-on: ${{ matrix.os }}
2222
steps:
23-
- uses: actions/setup-go@v5
24-
with:
25-
go-version: ${{ matrix.go-version }}
26-
- uses: actions/checkout@v4
27-
with:
28-
fetch-depth: 0
29-
- name: golangci-lint
30-
uses: golangci/golangci-lint-action@v5
31-
with:
32-
version: v1.55
33-
args: --new-from-rev=origin/release/v1.5 --config=.golangci.yml --timeout=25m
23+
- uses: actions/setup-go@v5
24+
with:
25+
go-version: ${{ matrix.go-version }}
26+
- uses: actions/checkout@v4
27+
with:
28+
fetch-depth: 0
29+
- name: golangci-lint
30+
uses: golangci/golangci-lint-action@v5
31+
with:
32+
version: v1.55
33+
args: --new-from-rev=origin/release/v1.5 --config=.golangci.yml --timeout=25m

‎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/Azure/azure-container-networking v1.5.21

‎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

0 commit comments

Comments
 (0)