Skip to content

Commit 261b16c

Browse files
authored
Merge branch 'master' into change_gw_address
2 parents 5424d04 + f91ab26 commit 261b16c

22 files changed

+1236
-314
lines changed

azure-ipam/go.mod

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ toolchain go1.23.2
77
require (
88
github.com/Azure/azure-container-networking v1.5.21
99
github.com/containernetworking/cni v1.2.3
10-
github.com/containernetworking/plugins v1.5.1
10+
github.com/containernetworking/plugins v1.6.0
1111
github.com/pkg/errors v0.9.1
1212
github.com/stretchr/testify v1.9.0
1313
go.uber.org/zap v1.27.0
@@ -24,26 +24,26 @@ require (
2424
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
2525
github.com/Masterminds/semver v1.5.0 // indirect
2626
github.com/Microsoft/go-winio v0.6.2 // indirect
27-
github.com/Microsoft/hcsshim v0.12.3 // indirect
27+
github.com/Microsoft/hcsshim v0.12.7 // indirect
2828
github.com/avast/retry-go/v3 v3.1.1 // indirect
2929
github.com/beorn7/perks v1.0.1 // indirect
3030
github.com/billgraziano/dpapi v0.5.0 // indirect
31-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
32-
github.com/containerd/cgroups/v3 v3.0.2 // indirect
31+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
32+
github.com/containerd/cgroups/v3 v3.0.3 // indirect
3333
github.com/containerd/errdefs v0.1.0 // indirect
34-
github.com/coreos/go-iptables v0.7.0 // indirect
34+
github.com/coreos/go-iptables v0.8.0 // indirect
3535
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3636
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
3737
github.com/fsnotify/fsnotify v1.7.0 // indirect
38-
github.com/go-logr/logr v1.4.1 // indirect
38+
github.com/go-logr/logr v1.4.2 // indirect
3939
github.com/go-openapi/jsonpointer v0.20.0 // indirect
4040
github.com/go-openapi/jsonreference v0.20.2 // indirect
4141
github.com/go-openapi/swag v0.22.4 // indirect
4242
github.com/gofrs/uuid v4.4.0+incompatible // indirect
4343
github.com/gogo/protobuf v1.3.2 // indirect
4444
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
4545
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
46-
github.com/golang/protobuf v1.5.3 // indirect
46+
github.com/golang/protobuf v1.5.4 // indirect
4747
github.com/google/gnostic-models v0.6.8 // indirect
4848
github.com/google/gofuzz v1.2.0 // indirect
4949
github.com/google/uuid v1.6.0 // indirect
@@ -59,28 +59,27 @@ require (
5959
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
6060
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
6161
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
62-
github.com/prometheus/client_golang v1.18.0 // indirect
63-
github.com/prometheus/client_model v0.5.0 // indirect
64-
github.com/prometheus/common v0.46.0 // indirect
65-
github.com/prometheus/procfs v0.12.0 // indirect
62+
github.com/prometheus/client_golang v1.20.2 // indirect
63+
github.com/prometheus/client_model v0.6.1 // indirect
64+
github.com/prometheus/common v0.55.0 // indirect
65+
github.com/prometheus/procfs v0.15.1 // indirect
6666
github.com/sirupsen/logrus v1.9.3 // indirect
6767
github.com/spf13/pflag v1.0.5 // indirect
6868
github.com/vishvananda/netns v0.0.4 // indirect
6969
go.opencensus.io v0.24.0 // indirect
7070
go.uber.org/multierr v1.11.0 // indirect
71-
golang.org/x/crypto v0.24.0 // indirect
71+
golang.org/x/crypto v0.26.0 // indirect
7272
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
73-
golang.org/x/net v0.26.0 // indirect
74-
golang.org/x/oauth2 v0.16.0 // indirect
75-
golang.org/x/sync v0.7.0 // indirect
76-
golang.org/x/sys v0.21.0 // indirect
77-
golang.org/x/term v0.21.0 // indirect
78-
golang.org/x/text v0.16.0 // indirect
73+
golang.org/x/net v0.28.0 // indirect
74+
golang.org/x/oauth2 v0.21.0 // indirect
75+
golang.org/x/sync v0.8.0 // indirect
76+
golang.org/x/sys v0.26.0 // indirect
77+
golang.org/x/term v0.23.0 // indirect
78+
golang.org/x/text v0.17.0 // indirect
7979
golang.org/x/time v0.5.0 // indirect
80-
google.golang.org/appengine v1.6.8 // indirect
81-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
82-
google.golang.org/grpc v1.62.0 // indirect
83-
google.golang.org/protobuf v1.33.0 // indirect
80+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
81+
google.golang.org/grpc v1.66.0 // indirect
82+
google.golang.org/protobuf v1.34.2 // indirect
8483
gopkg.in/inf.v0 v0.9.1 // indirect
8584
gopkg.in/yaml.v2 v2.4.0 // indirect
8685
gopkg.in/yaml.v3 v3.0.1 // indirect

azure-ipam/go.sum

Lines changed: 52 additions & 72 deletions
Large diffs are not rendered by default.

build/tools/go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ toolchain go1.23.2
66

77
require (
88
github.com/AlekSi/gocov-xml v1.1.0
9-
github.com/axw/gocov v1.1.0
9+
github.com/axw/gocov v1.2.1
1010
github.com/golang/mock v1.6.0
1111
github.com/golangci/golangci-lint v1.61.0
1212
github.com/jstemmer/go-junit-report v1.0.0
@@ -120,7 +120,6 @@ require (
120120
github.com/mattn/go-colorable v0.1.13 // indirect
121121
github.com/mattn/go-isatty v0.0.20 // indirect
122122
github.com/mattn/go-runewidth v0.0.16 // indirect
123-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
124123
github.com/mgechev/revive v1.4.0 // indirect
125124
github.com/mitchellh/go-homedir v1.1.0 // indirect
126125
github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -172,7 +171,6 @@ require (
172171
github.com/stretchr/objx v0.5.2 // indirect
173172
github.com/stretchr/testify v1.9.0 // indirect
174173
github.com/subosito/gotenv v1.6.0 // indirect
175-
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
176174
github.com/tdakkota/asciicheck v0.2.0 // indirect
177175
github.com/tetafro/godot v1.4.18 // indirect
178176
github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a // indirect

0 commit comments

Comments
 (0)