Skip to content

Commit

Permalink
Omnibus dependency update
Browse files Browse the repository at this point in the history
Dependebot PRs:

 - hcsshim/2134
 - hcsshim/2140
 - hcsshim/2145
 - hcsshim/2146
 - hcsshim/2149
 - hcsshim/2153
 - hcsshim/2154
 - hcsshim/2159
 - hcsshim/2160
 - hcsshim/2161

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.

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
  • Loading branch information
helsaawy committed Jun 13, 2024
1 parent efb0296 commit 926f140
Show file tree
Hide file tree
Showing 163 changed files with 7,450 additions and 1,842 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
- name: Install protoc
shell: powershell
run: |
gh release download -R protocolbuffers/protobuf -p 'protoc-*-win32.zip' -O protoc.zip 'v23.2'
gh release download -R protocolbuffers/protobuf -p 'protoc-*-win32.zip' -O protoc.zip 'v26.0'
if ( $LASTEXITCODE ) {
Write-Output '::error::Could not download protoc.'
exit $LASTEXITCODE
Expand Down
4 changes: 2 additions & 2 deletions cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions cmd/containerd-shim-runhcs-v1/stats/stats.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions cmd/ncproxy/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,12 @@ func run(clicontext *cli.Context) error {
var cancel context.CancelFunc
dialCtx, cancel = context.WithTimeout(ctx, time.Duration(conf.Timeout)*time.Second)
defer cancel()
//nolint:staticcheck // SA1019: grpc.WithBlock is deprecated
opts = append(opts, grpc.WithBlock())
}

// TODO: use grpc.NewClient here instead
//nolint:staticcheck // SA1019: grpc.DialContext is deprecated, replace with grpc.NewClient
client, err := grpc.DialContext(dialCtx, conf.NodeNetSvcAddr, opts...)
if err != nil {
return fmt.Errorf("failed to connect to NodeNetworkService at address %s", conf.NodeNetSvcAddr)
Expand Down
32 changes: 16 additions & 16 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ require (
github.com/cenkalti/backoff/v4 v4.3.0
github.com/containerd/cgroups/v3 v3.0.3
github.com/containerd/console v1.0.4
github.com/containerd/containerd v1.7.16
github.com/containerd/containerd v1.7.18
github.com/containerd/errdefs v0.1.0
github.com/containerd/go-runc v1.0.0
github.com/containerd/protobuild v0.3.0
github.com/containerd/ttrpc v1.2.3
github.com/containerd/ttrpc v1.2.4
github.com/containerd/typeurl/v2 v2.1.1
github.com/docker/docker v26.1.1+incompatible
github.com/docker/docker v26.1.4+incompatible
github.com/google/go-cmp v0.6.0
github.com/google/go-containerregistry v0.19.1
github.com/josephspurrier/goversioninfo v1.4.0
github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3
github.com/mattn/go-shellwords v1.0.12
github.com/open-policy-agent/opa v0.64.1
github.com/open-policy-agent/opa v0.65.0
github.com/opencontainers/runc v1.1.12
github.com/opencontainers/runtime-spec v1.2.0
github.com/pelletier/go-toml v1.9.5
Expand All @@ -31,14 +31,14 @@ require (
github.com/urfave/cli v1.22.15
github.com/vishvananda/netlink v1.2.1-beta.2
github.com/vishvananda/netns v0.0.4
go.etcd.io/bbolt v1.3.9
go.etcd.io/bbolt v1.3.10
go.opencensus.io v0.24.0
go.uber.org/mock v0.4.0
golang.org/x/sync v0.7.0
golang.org/x/sys v0.20.0
google.golang.org/grpc v1.63.2
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
google.golang.org/protobuf v1.33.0
golang.org/x/sys v0.21.0
google.golang.org/grpc v1.64.0
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.4.0
google.golang.org/protobuf v1.34.1
)

require (
Expand All @@ -65,7 +65,7 @@ require (
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fxamacker/cbor/v2 v2.4.0 // indirect
github.com/go-ini/ini v1.67.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/goccy/go-json v0.10.2 // indirect
Expand All @@ -87,8 +87,8 @@ require (
github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/moby/sys/sequential v0.5.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc6 // indirect
github.com/prometheus/client_golang v1.19.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
Expand All @@ -106,13 +106,13 @@ require (
go.opentelemetry.io/otel/metric v1.21.0 // indirect
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
go.opentelemetry.io/otel/trace v1.21.0 // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/crypto v0.23.0 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/text v0.15.0 // indirect
golang.org/x/tools v0.15.0 // indirect
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Loading

0 comments on commit 926f140

Please sign in to comment.