Skip to content

Commit 75428d1

Browse files
helsaawyhelsaawy
authored
Omnibus dependency update (microsoft#2166)
Dependebot PRs: - hcsshim/2140 - hcsshim/2145 - hcsshim/2146 - hcsshim/2149 - hcsshim/2153 - hcsshim/2154 - hcsshim/2159 - hcsshim/2161 - hcsshim/2174 - hcsshim/2175 - hcsshim/2176 Update protobuf files. `google.golang.org/grpc v1.64.0` deprecated `Dial[Context]` and `WithBlock`. Replacing either is non-trivial, and left for a future PR. Update dependabot file to ignore patch updates: they rarely provide bug fixes and increase repo churn. Signed-off-by: Hamza El-Saawy <[email protected]>
1 parent efb0296 commit 75428d1

244 files changed

Lines changed: 9160 additions & 2873 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/dependabot.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ updates:
1515
# only do patch updates for containerd and co: don't bump anything else
1616
- dependency-name: "github.com/containerd/*"
1717
update-types: ["version-update:semver-major", "version-update:semver-minor"]
18+
# ignore patch version increment updates to avoid churn
19+
- dependency-name: "*"
20+
update-types: ["version-update:semver-patch"]
1821
# allow more PRs to clear queue faster
1922
open-pull-requests-limit: 10
2023

@@ -30,7 +33,6 @@ updates:
3033
ignore:
3134
# keep containerd and related dependencies in sync with the shim/the root repo
3235
- dependency-name: "github.com/containerd/*"
33-
# ignore patch version increment updates in test; they shouldn't be critical
3436
- dependency-name: "*"
3537
update-types: ["version-update:semver-patch"]
3638
open-pull-requests-limit: 5

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
- name: Install protoc
8787
shell: powershell
8888
run: |
89-
gh release download -R protocolbuffers/protobuf -p 'protoc-*-win32.zip' -O protoc.zip 'v23.2'
89+
gh release download -R protocolbuffers/protobuf -p 'protoc-*-win32.zip' -O protoc.zip 'v26.0'
9090
if ( $LASTEXITCODE ) {
9191
Write-Output '::error::Could not download protoc.'
9292
exit $LASTEXITCODE

‎cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/containerd-shim-runhcs-v1/stats/stats.pb.go‎

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/ncproxy/run.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,12 @@ func run(clicontext *cli.Context) error {
232232
var cancel context.CancelFunc
233233
dialCtx, cancel = context.WithTimeout(ctx, time.Duration(conf.Timeout)*time.Second)
234234
defer cancel()
235+
//nolint:staticcheck // SA1019: grpc.WithBlock is deprecated
235236
opts = append(opts, grpc.WithBlock())
236237
}
238+
239+
// TODO: use grpc.NewClient here instead
240+
//nolint:staticcheck // SA1019: grpc.DialContext is deprecated, replace with grpc.NewClient
237241
client, err := grpc.DialContext(dialCtx, conf.NodeNetSvcAddr, opts...)
238242
if err != nil {
239243
return fmt.Errorf("failed to connect to NodeNetworkService at address %s", conf.NodeNetSvcAddr)

‎go.mod‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ require (
1010
github.com/cenkalti/backoff/v4 v4.3.0
1111
github.com/containerd/cgroups/v3 v3.0.3
1212
github.com/containerd/console v1.0.4
13-
github.com/containerd/containerd v1.7.16
13+
github.com/containerd/containerd v1.7.18
1414
github.com/containerd/errdefs v0.1.0
1515
github.com/containerd/go-runc v1.0.0
1616
github.com/containerd/protobuild v0.3.0
17-
github.com/containerd/ttrpc v1.2.3
17+
github.com/containerd/ttrpc v1.2.4
1818
github.com/containerd/typeurl/v2 v2.1.1
19-
github.com/docker/docker v26.1.1+incompatible
19+
github.com/docker/docker v27.0.0+incompatible
2020
github.com/google/go-cmp v0.6.0
21-
github.com/google/go-containerregistry v0.19.1
21+
github.com/google/go-containerregistry v0.19.2
2222
github.com/josephspurrier/goversioninfo v1.4.0
2323
github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3
2424
github.com/mattn/go-shellwords v1.0.12
25-
github.com/open-policy-agent/opa v0.64.1
25+
github.com/open-policy-agent/opa v0.65.0
2626
github.com/opencontainers/runc v1.1.12
2727
github.com/opencontainers/runtime-spec v1.2.0
2828
github.com/pelletier/go-toml v1.9.5
@@ -31,14 +31,14 @@ require (
3131
github.com/urfave/cli v1.22.15
3232
github.com/vishvananda/netlink v1.2.1-beta.2
3333
github.com/vishvananda/netns v0.0.4
34-
go.etcd.io/bbolt v1.3.9
34+
go.etcd.io/bbolt v1.3.10
3535
go.opencensus.io v0.24.0
3636
go.uber.org/mock v0.4.0
3737
golang.org/x/sync v0.7.0
38-
golang.org/x/sys v0.20.0
39-
google.golang.org/grpc v1.63.2
40-
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
41-
google.golang.org/protobuf v1.33.0
38+
golang.org/x/sys v0.21.0
39+
google.golang.org/grpc v1.64.0
40+
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.4.0
41+
google.golang.org/protobuf v1.34.2
4242
)
4343

4444
require (
@@ -65,7 +65,7 @@ require (
6565
github.com/felixge/httpsnoop v1.0.4 // indirect
6666
github.com/fxamacker/cbor/v2 v2.4.0 // indirect
6767
github.com/go-ini/ini v1.67.0 // indirect
68-
github.com/go-logr/logr v1.4.1 // indirect
68+
github.com/go-logr/logr v1.4.2 // indirect
6969
github.com/go-logr/stdr v1.2.2 // indirect
7070
github.com/gobwas/glob v0.2.3 // indirect
7171
github.com/goccy/go-json v0.10.2 // indirect
@@ -87,8 +87,8 @@ require (
8787
github.com/moby/sys/mountinfo v0.6.2 // indirect
8888
github.com/moby/sys/sequential v0.5.0 // indirect
8989
github.com/opencontainers/go-digest v1.0.0 // indirect
90-
github.com/opencontainers/image-spec v1.1.0-rc6 // indirect
91-
github.com/prometheus/client_golang v1.19.0 // indirect
90+
github.com/opencontainers/image-spec v1.1.0 // indirect
91+
github.com/prometheus/client_golang v1.19.1 // indirect
9292
github.com/prometheus/client_model v0.6.1 // indirect
9393
github.com/prometheus/common v0.48.0 // indirect
9494
github.com/prometheus/procfs v0.12.0 // indirect
@@ -106,13 +106,13 @@ require (
106106
go.opentelemetry.io/otel/metric v1.21.0 // indirect
107107
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
108108
go.opentelemetry.io/otel/trace v1.21.0 // indirect
109-
golang.org/x/crypto v0.22.0 // indirect
109+
golang.org/x/crypto v0.23.0 // indirect
110110
golang.org/x/mod v0.14.0 // indirect
111-
golang.org/x/net v0.24.0 // indirect
112-
golang.org/x/text v0.14.0 // indirect
111+
golang.org/x/net v0.25.0 // indirect
112+
golang.org/x/text v0.15.0 // indirect
113113
golang.org/x/tools v0.15.0 // indirect
114114
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
115-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
115+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
116116
gopkg.in/yaml.v2 v2.4.0 // indirect
117117
sigs.k8s.io/yaml v1.4.0 // indirect
118118
)

0 commit comments

Comments
 (0)