Skip to content

Commit e69179a

Browse files
pacoxudims
authored andcommitted
bump containerd related deps: api v1.8.0; errdefs v1.0.0; ttrpc v1.2.6
1 parent 255cff7 commit e69179a

File tree

6 files changed

+104
-110
lines changed

6 files changed

+104
-110
lines changed

Diff for: .github/workflows/test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
test:
55
strategy:
66
matrix:
7-
go-versions: ['1.22', '1.21']
7+
go-versions: ['1.23', '1.22']
88
platform: [ubuntu-22.04]
99
environment-variables: [build/config/plain.sh, build/config/libpfm4.sh, build/config/libipmctl.sh]
1010
runs-on: ${{ matrix.platform }}
@@ -31,7 +31,7 @@ jobs:
3131
test-integration:
3232
strategy:
3333
matrix:
34-
go-versions: ['1.22', '1.21']
34+
go-versions: ['1.23', '1.22']
3535
platform: [ubuntu-22.04]
3636
environment-variables: [build/config/plain.sh, build/config/libpfm4.sh, build/config/libipmctl.sh]
3737
runs-on: ${{ matrix.platform }}

Diff for: cmd/go.mod

+18-17
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/google/cadvisor/cmd
22

3-
go 1.21
3+
go 1.22
4+
5+
toolchain go1.22.10
46

57
// Record that the cmd module requires the cadvisor library module.
68
// The github.com/google/cadvisor/cmd module is built using the Makefile
@@ -24,16 +26,15 @@ require (
2426
github.com/pquerna/ffjson v0.0.0-20190930134022-aa0246cd15f7 // indirect
2527
github.com/prometheus/client_golang v1.14.0
2628
github.com/stretchr/testify v1.9.0
27-
golang.org/x/oauth2 v0.18.0
29+
golang.org/x/oauth2 v0.22.0
2830
google.golang.org/api v0.169.0
2931
gopkg.in/olivere/elastic.v2 v2.0.61
3032
k8s.io/klog/v2 v2.100.1
3133
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
3234
)
3335

3436
require (
35-
cloud.google.com/go/compute v1.25.1 // indirect
36-
cloud.google.com/go/compute/metadata v0.2.3 // indirect
37+
cloud.google.com/go/compute/metadata v0.5.0 // indirect
3738
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
3839
github.com/Microsoft/go-winio v0.6.2 // indirect
3940
github.com/aws/aws-sdk-go-v2 v1.30.1 // indirect
@@ -52,12 +53,14 @@ require (
5253
github.com/beorn7/perks v1.0.1 // indirect
5354
github.com/blang/semver/v4 v4.0.0 // indirect
5455
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
55-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
56+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5657
github.com/cilium/ebpf v0.7.0 // indirect
57-
github.com/containerd/containerd/api v1.7.19 // indirect
58-
github.com/containerd/errdefs v0.1.0 // indirect
58+
github.com/containerd/containerd/api v1.8.0 // indirect
59+
github.com/containerd/errdefs v1.0.0 // indirect
60+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
5961
github.com/containerd/log v0.1.0 // indirect
60-
github.com/containerd/ttrpc v1.2.5 // indirect
62+
github.com/containerd/ttrpc v1.2.6 // indirect
63+
github.com/containerd/typeurl/v2 v2.2.2 // indirect
6164
github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534 // indirect
6265
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
6366
github.com/davecgh/go-spew v1.1.1 // indirect
@@ -117,14 +120,12 @@ require (
117120
go.opentelemetry.io/otel/metric v1.27.0 // indirect
118121
go.opentelemetry.io/otel/trace v1.27.0 // indirect
119122
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
120-
golang.org/x/crypto v0.24.0 // indirect
121-
golang.org/x/net v0.26.0 // indirect
122-
golang.org/x/sys v0.21.0 // indirect
123-
golang.org/x/text v0.16.0 // indirect
124-
google.golang.org/appengine v1.6.8 // indirect
125-
google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8 // indirect
126-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 // indirect
127-
google.golang.org/grpc v1.64.1 // indirect
128-
google.golang.org/protobuf v1.34.1 // indirect
123+
golang.org/x/crypto v0.26.0 // indirect
124+
golang.org/x/net v0.28.0 // indirect
125+
golang.org/x/sys v0.24.0 // indirect
126+
golang.org/x/text v0.17.0 // indirect
127+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
128+
google.golang.org/grpc v1.67.0 // indirect
129+
google.golang.org/protobuf v1.34.2 // indirect
129130
gopkg.in/yaml.v3 v3.0.1 // indirect
130131
)

0 commit comments

Comments
 (0)