Skip to content

Commit f910a41

Browse files
authored
chore(deps): update dependencies in release/v1.5 (#3294)
* chore(deps): update dependencies in release/v1.5 * go mod tidy * update go version * update golangci.yaml * update .golangci.yml * update go version * update kind * update Dockerfile go version * update cyclonus-netpol-test.yaml * merge conflict --------- Signed-off-by: Quang Nguyen <[email protected]>
1 parent c2100d5 commit f910a41

24 files changed

+102
-100
lines changed

.github/workflows/codeql.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Setup go
3636
uses: actions/setup-go@v5
3737
with:
38-
go-version: "1.22"
38+
go-version: "1.23"
3939
check-latest: true
4040
- name: Checkout repository
4141
uses: actions/checkout@v4

.github/workflows/crdgen.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
crdgen:
1515
strategy:
1616
matrix:
17-
go-version: ["1.21", "1.22"]
17+
go-version: ["1.22", "1.23"]
1818
os: [ubuntu-latest]
1919
name: CRDs are Generated
2020
runs-on: ${{ matrix.os }}

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

+5-10
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.22"
36+
go-version: '^1.23'
3737

3838
- name: Setup Kind
3939
uses: helm/kind-action@v1
@@ -46,11 +46,9 @@ jobs:
4646
- name: Check Kind
4747
run: |
4848
kubectl get po -owide -A
49-
5049
- name: Make NPM image
5150
run: |
5251
make npm-image NPM_PLATFORM_TAG=cyclonus PLATFORM=linux/amd64 CONTAINER_BUILDER=docker BUILDX_ACTION='--load'
53-
5452
- name: Install Azure NPM
5553
# set the ConfigMap based on the build matrix
5654
# currently have to restart the daemonset because changing the ConfigMap doesn't restart NPM
@@ -61,13 +59,11 @@ jobs:
6159
echo "Applying profile: ${{ matrix.profile }}"
6260
kubectl apply -f ./npm/profiles/${{ matrix.profile }}
6361
kubectl rollout restart ds azure-npm -n kube-system
64-
6562
- name: Check Cluster Components
6663
run: |
6764
sleep 10
6865
kubectl get po -owide -A
6966
kubectl describe ds azure-npm -n kube-system
70-
7167
- name: Run Cyclonus network policy test
7268
run: make test-cyclonus
7369

@@ -76,8 +72,7 @@ jobs:
7672
run: |
7773
kubectl logs -n kube-system -l k8s-app=azure-npm --tail -1 --prefix > npm-logs_${{ matrix.profile }}.txt
7874
mv ./test/cyclonus/cyclonus-test.txt ./cyclonus-test_${{ matrix.profile }}.txt
79-
80-
- name: "Upload Logs"
75+
- name: 'Upload Logs'
8176
uses: actions/upload-artifact@v4
8277
if: always()
8378
with:

.github/workflows/golangci.yaml

+12-12
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", "1.22.x"]
18+
go-version: ['1.22.x', '1.23.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@v6
31+
with:
32+
version: v1.61
33+
args: --new-from-rev=origin/release/v1.5 --config=.golangci.yml --timeout=25m

.golangci.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
issues:
22
max-same-issues: 0
33
max-issues-per-linter: 0
4-
new-from-rev: origin/master
54
linters:
65
presets:
76
- bugs

azure-ipam/go.mod

+17-15
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module github.com/Azure/azure-container-networking/azure-ipam
22

3-
go 1.22.7
3+
go 1.23
44

55
require (
66
github.com/Azure/azure-container-networking v1.5.40
77
github.com/containernetworking/cni v1.2.3
8-
github.com/containernetworking/plugins v1.5.0
8+
github.com/containernetworking/plugins v1.6.1
99
github.com/pkg/errors v0.9.1
1010
github.com/stretchr/testify v1.10.0
1111
go.uber.org/zap v1.27.0
@@ -22,18 +22,20 @@ require (
2222
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
2323
github.com/Masterminds/semver v1.5.0 // indirect
2424
github.com/Microsoft/go-winio v0.6.2 // indirect
25-
github.com/Microsoft/hcsshim v0.12.3 // indirect
25+
github.com/Microsoft/hcsshim v0.12.9 // indirect
2626
github.com/avast/retry-go/v3 v3.1.1 // indirect
2727
github.com/beorn7/perks v1.0.1 // indirect
2828
github.com/billgraziano/dpapi v0.5.0 // indirect
2929
github.com/cespare/xxhash/v2 v2.3.0 // indirect
30-
github.com/containerd/cgroups/v3 v3.0.2 // indirect
31-
github.com/containerd/errdefs v0.1.0 // indirect
32-
github.com/coreos/go-iptables v0.7.0 // indirect
30+
github.com/containerd/cgroups/v3 v3.0.3 // indirect
31+
github.com/containerd/errdefs v0.3.0 // indirect
32+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
33+
github.com/containerd/typeurl/v2 v2.2.0 // indirect
34+
github.com/coreos/go-iptables v0.8.0 // indirect
3335
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3436
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
3537
github.com/fsnotify/fsnotify v1.7.0 // indirect
36-
github.com/go-logr/logr v1.4.1 // indirect
38+
github.com/go-logr/logr v1.4.2 // indirect
3739
github.com/go-openapi/jsonpointer v0.20.0 // indirect
3840
github.com/go-openapi/jsonreference v0.20.2 // indirect
3941
github.com/go-openapi/swag v0.22.4 // indirect
@@ -57,23 +59,23 @@ require (
5759
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
5860
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
5961
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
60-
github.com/prometheus/client_golang v1.18.0 // indirect
62+
github.com/prometheus/client_golang v1.20.2 // indirect
6163
github.com/prometheus/client_model v0.6.1 // indirect
62-
github.com/prometheus/common v0.46.0 // indirect
63-
github.com/prometheus/procfs v0.12.0 // indirect
64+
github.com/prometheus/common v0.55.0 // indirect
65+
github.com/prometheus/procfs v0.15.1 // indirect
6466
github.com/sirupsen/logrus v1.9.3 // indirect
6567
github.com/spf13/pflag v1.0.5 // indirect
6668
github.com/vishvananda/netns v0.0.4 // indirect
6769
go.opencensus.io v0.24.0 // indirect
6870
go.uber.org/multierr v1.11.0 // indirect
69-
golang.org/x/crypto v0.29.0 // indirect
71+
golang.org/x/crypto v0.32.0 // indirect
7072
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
7173
golang.org/x/net v0.31.0 // indirect
7274
golang.org/x/oauth2 v0.23.0 // indirect
73-
golang.org/x/sync v0.9.0 // indirect
74-
golang.org/x/sys v0.27.0 // indirect
75-
golang.org/x/term v0.26.0 // indirect
76-
golang.org/x/text v0.20.0 // indirect
75+
golang.org/x/sync v0.10.0 // indirect
76+
golang.org/x/sys v0.29.0 // indirect
77+
golang.org/x/term v0.28.0 // indirect
78+
golang.org/x/text v0.21.0 // indirect
7779
golang.org/x/time v0.5.0 // indirect
7880
google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f // indirect
7981
google.golang.org/grpc v1.68.0 // indirect

0 commit comments

Comments
 (0)