Skip to content

Commit a45273e

Browse files
committed
Merge branch 'release/v1.5' of https://github.com/Azure/azure-container-networking into release/v1.5
2 parents b184664 + de0b85b commit a45273e

File tree

5 files changed

+62
-73
lines changed

5 files changed

+62
-73
lines changed

azure-ipam/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.23
44

55
require (
66
github.com/Azure/azure-container-networking v1.5.44
7-
github.com/containernetworking/cni v1.2.3
7+
github.com/containernetworking/cni v1.3.0
88
github.com/containernetworking/plugins v1.6.2
99
github.com/pkg/errors v0.9.1
1010
github.com/stretchr/testify v1.10.0

azure-ipam/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151X
4646
github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
4747
github.com/containerd/typeurl/v2 v2.2.0 h1:6NBDbQzr7I5LHgp34xAXYF5DOTQDn05X58lsPEmzLso=
4848
github.com/containerd/typeurl/v2 v2.2.0/go.mod h1:8XOOxnyatxSWuG8OfsZXVnAF4iZfedjS/8UHSPJnX4g=
49-
github.com/containernetworking/cni v1.2.3 h1:hhOcjNVUQTnzdRJ6alC5XF+wd9mfGIUaj8FuJbEslXM=
50-
github.com/containernetworking/cni v1.2.3/go.mod h1:DuLgF+aPd3DzcTQTtp/Nvl1Kim23oFKdm2okJzBQA5M=
49+
github.com/containernetworking/cni v1.3.0 h1:v6EpN8RznAZj9765HhXQrtXgX+ECGebEYEmnuFjskwo=
50+
github.com/containernetworking/cni v1.3.0/go.mod h1:Bs8glZjjFfGPHMw6hQu82RUgEPNGEaBb9KS5KtNMnJ4=
5151
github.com/containernetworking/plugins v1.6.2 h1:pqP8Mq923TLyef5g97XfJ/xpDeVek4yF8A4mzy9Tc4U=
5252
github.com/containernetworking/plugins v1.6.2/go.mod h1:SP5UG3jDO9LtmfbBJdP+nl3A1atOtbj2MBOYsnaxy64=
5353
github.com/coreos/go-iptables v0.8.0 h1:MPc2P89IhuVpLI7ETL/2tx3XZ61VeICZjYqDEgNsPRc=

go.mod

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ module github.com/Azure/azure-container-networking
33
go 1.23.0
44

55
require (
6-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.1
7-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2
6+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0
7+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.9.0
88
github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets v0.12.0
99
github.com/Masterminds/semver v1.5.0
1010
github.com/Microsoft/go-winio v0.6.1
1111
github.com/Microsoft/hcsshim v0.12.0
1212
github.com/avast/retry-go/v3 v3.1.1
1313
github.com/avast/retry-go/v4 v4.6.1
1414
github.com/billgraziano/dpapi v0.5.0
15-
github.com/containernetworking/cni v1.2.3
15+
github.com/containernetworking/cni v1.3.0
1616
github.com/docker/libnetwork v0.8.0-dev.2.0.20210525090646-64b7a4574d14
1717
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
1818
github.com/go-logr/zapr v1.2.4 // indirect
@@ -26,20 +26,20 @@ require (
2626
github.com/microsoft/ApplicationInsights-Go v0.4.4
2727
github.com/nxadm/tail v1.4.11
2828
github.com/onsi/ginkgo v1.16.5
29-
github.com/onsi/gomega v1.33.1
29+
github.com/onsi/gomega v1.34.1
3030
github.com/patrickmn/go-cache v2.1.0+incompatible
3131
github.com/pkg/errors v0.9.1
32-
github.com/prometheus/client_golang v1.21.1
33-
github.com/prometheus/client_model v0.6.1
32+
github.com/prometheus/client_golang v1.22.0
33+
github.com/prometheus/client_model v0.6.2
3434
github.com/spf13/cobra v1.9.1
3535
github.com/spf13/pflag v1.0.6
3636
github.com/spf13/viper v1.20.1
3737
github.com/stretchr/testify v1.10.0
3838
go.uber.org/zap v1.27.0
3939
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f
40-
golang.org/x/sys v0.31.0
40+
golang.org/x/sys v0.32.0
4141
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
42-
google.golang.org/grpc v1.71.0
42+
google.golang.org/grpc v1.71.1
4343
google.golang.org/protobuf v1.36.6
4444
gopkg.in/natefinch/lumberjack.v2 v2.2.1
4545
k8s.io/api v0.29.12
@@ -54,17 +54,17 @@ require (
5454

5555
require (
5656
code.cloudfoundry.org/clock v1.0.0 // indirect
57-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
57+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 // indirect
5858
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 // indirect
59-
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.3 // indirect
59+
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
6060
github.com/beorn7/perks v1.0.1 // indirect
6161
github.com/cespare/xxhash/v2 v2.3.0 // indirect
6262
github.com/coreos/go-iptables v0.8.0
6363
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
6464
github.com/docker/docker v27.1.2+incompatible // indirect
6565
github.com/docker/go-connections v0.4.0 // indirect
6666
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
67-
github.com/fsnotify/fsnotify v1.8.0
67+
github.com/fsnotify/fsnotify v1.9.0
6868
github.com/go-logr/logr v1.4.2 // indirect
6969
github.com/go-openapi/jsonpointer v0.20.0 // indirect
7070
github.com/go-openapi/jsonreference v0.20.2 // indirect
@@ -104,11 +104,11 @@ require (
104104
github.com/vishvananda/netns v0.0.5
105105
go.opencensus.io v0.24.0 // indirect
106106
go.uber.org/multierr v1.11.0 // indirect
107-
golang.org/x/crypto v0.36.0
108-
golang.org/x/net v0.37.0 // indirect
107+
golang.org/x/crypto v0.37.0
108+
golang.org/x/net v0.38.0 // indirect
109109
golang.org/x/oauth2 v0.25.0 // indirect
110-
golang.org/x/term v0.30.0 // indirect
111-
golang.org/x/text v0.23.0 // indirect
110+
golang.org/x/term v0.31.0 // indirect
111+
golang.org/x/text v0.24.0 // indirect
112112
golang.org/x/time v0.11.0
113113
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
114114
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
@@ -129,7 +129,7 @@ require (
129129
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor v0.11.0
130130
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v5 v5.2.0
131131
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0
132-
golang.org/x/sync v0.12.0
132+
golang.org/x/sync v0.13.0
133133
gotest.tools/v3 v3.5.2
134134
k8s.io/kubectl v0.28.5
135135
sigs.k8s.io/yaml v1.4.0
@@ -141,9 +141,8 @@ require (
141141
github.com/containerd/log v0.1.0 // indirect
142142
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
143143
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
144-
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
144+
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
145145
github.com/gorilla/websocket v1.5.0 // indirect
146-
github.com/klauspost/compress v1.17.11 // indirect
147146
github.com/moby/sys/userns v0.1.0 // indirect
148147
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
149148
github.com/sagikazarmark/locafero v0.7.0 // indirect

0 commit comments

Comments
 (0)