Skip to content

Commit a7cec4e

Browse files
BigVanBigVan
authored
Merge pull request #329 from thaJeztah/containerd_stable
go.mod: update containerd dependency to stable v2.0.x
2 parents f00eb1f + 4b1788e commit a7cec4e

File tree

4 files changed

+209
-211
lines changed

4 files changed

+209
-211
lines changed

‎ci/e2e/go.mod‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
11
module github.com/containerd/accelerated-container-image/ci/e2e
22

3-
go 1.22.2
3+
go 1.23.0
44

55
require (
6-
github.com/containerd/containerd/v2 v2.0.0-rc.3
6+
github.com/containerd/containerd/v2 v2.0.7
77
github.com/opencontainers/image-spec v1.1.0
8-
github.com/stretchr/testify v1.9.0
8+
github.com/stretchr/testify v1.10.0
99
oras.land/oras-go/v2 v2.5.0
1010
)
1111

1212
require (
13-
github.com/containerd/errdefs v0.1.0 // indirect
13+
github.com/containerd/errdefs v1.0.0 // indirect
1414
github.com/containerd/log v0.1.0 // indirect
15-
github.com/containerd/platforms v0.2.1 // indirect
15+
github.com/containerd/platforms v1.0.0-rc.2 // indirect
1616
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
17-
github.com/klauspost/compress v1.17.8 // indirect
17+
github.com/klauspost/compress v1.17.11 // indirect
1818
github.com/opencontainers/go-digest v1.0.0 // indirect
1919
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
2020
github.com/sirupsen/logrus v1.9.3 // indirect
21-
golang.org/x/sync v0.7.0 // indirect
22-
golang.org/x/sys v0.21.0 // indirect
23-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
24-
google.golang.org/grpc v1.63.2 // indirect
25-
google.golang.org/protobuf v1.34.1 // indirect
21+
golang.org/x/sync v0.16.0 // indirect
22+
golang.org/x/sys v0.34.0 // indirect
2623
gopkg.in/yaml.v3 v3.0.1 // indirect
2724
)

‎ci/e2e/go.sum‎

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
1-
github.com/containerd/containerd/v2 v2.0.0-rc.3 h1:rRISeKYnunLx8Byw8FQ/a62mTMtcr6ESGptS4+MwLaQ=
2-
github.com/containerd/containerd/v2 v2.0.0-rc.3/go.mod h1:UBHR1DgWRQcEOINFkR94m0VC0MgKd3qg9LVPnudv9vs=
3-
github.com/containerd/errdefs v0.1.0 h1:m0wCRBiu1WJT/Fr+iOoQHMQS/eP5myQ8lCv4Dz5ZURM=
4-
github.com/containerd/errdefs v0.1.0/go.mod h1:YgWiiHtLmSeBrvpw+UfPijzbLaB77mEG1WwJTDETIV0=
1+
github.com/containerd/containerd/v2 v2.0.7 h1:55JsNhqP/L7VZOijyfq6Qn0O8Oeff0UizfRuP+2pc90=
2+
github.com/containerd/containerd/v2 v2.0.7/go.mod h1:su8B0Z1NFQMEIztOIbHwy7xtznbCms/kFlfsxIcQrZ8=
3+
github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
4+
github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
55
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
66
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
7-
github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A=
8-
github.com/containerd/platforms v0.2.1/go.mod h1:XHCb+2/hzowdiut9rkudds9bE5yJ7npe7dG/wG+uFPw=
7+
github.com/containerd/platforms v1.0.0-rc.2 h1:0SPgaNZPVWGEi4grZdV8VRYQn78y+nm6acgLGv/QzE4=
8+
github.com/containerd/platforms v1.0.0-rc.2/go.mod h1:J71L7B+aiM5SdIEqmd9wp6THLVRzJGXfNuWCZCllLA4=
99
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1010
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1111
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
1212
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
13-
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
14-
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
15-
github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU=
16-
github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
13+
github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
14+
github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
1715
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
1816
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
1917
github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
@@ -25,23 +23,13 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
2523
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
2624
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
2725
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
28-
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
29-
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
30-
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
31-
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
32-
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
33-
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
26+
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
27+
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
28+
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
29+
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
3430
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
35-
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
36-
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
37-
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
38-
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
39-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be h1:LG9vZxsWGOmUKieR8wPAUR3u3MpnYFQZROPIMaXh7/A=
40-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
41-
google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
42-
google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
43-
google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
44-
google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
31+
golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
32+
golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
4533
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
4634
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
4735
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎go.mod‎

Lines changed: 57 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,111 @@
11
module github.com/containerd/accelerated-container-image
22

3-
go 1.22.0
3+
go 1.23.0
44

55
require (
6-
github.com/containerd/containerd/api v1.8.0-rc.2
7-
github.com/containerd/containerd/v2 v2.0.0-rc.3
8-
github.com/containerd/continuity v0.4.3
9-
github.com/containerd/errdefs v0.1.0
10-
github.com/containerd/go-cni v1.1.9
6+
github.com/containerd/containerd/api v1.8.0
7+
github.com/containerd/containerd/v2 v2.0.7
8+
github.com/containerd/continuity v0.4.5
9+
github.com/containerd/errdefs v1.0.0
10+
github.com/containerd/go-cni v1.1.12
1111
github.com/containerd/log v0.1.0
12-
github.com/containerd/platforms v0.2.1
12+
github.com/containerd/platforms v1.0.0-rc.2
1313
github.com/data-accelerator/zdfs v0.1.5
1414
github.com/docker/go-units v0.5.0
1515
github.com/go-sql-driver/mysql v1.8.1
1616
github.com/moby/locker v1.0.1
17-
github.com/moby/sys/mountinfo v0.7.1
17+
github.com/moby/sys/mountinfo v0.7.2
1818
github.com/opencontainers/go-digest v1.0.0
1919
github.com/opencontainers/image-spec v1.1.0
2020
github.com/opencontainers/runtime-spec v1.2.0
21-
github.com/prometheus/client_golang v1.19.1
21+
github.com/prometheus/client_golang v1.20.5
2222
github.com/sirupsen/logrus v1.9.3
2323
github.com/spf13/cobra v1.8.1
24-
github.com/urfave/cli/v2 v2.27.2
25-
golang.org/x/sync v0.7.0
26-
golang.org/x/sys v0.26.0
27-
google.golang.org/grpc v1.63.2
24+
github.com/urfave/cli/v2 v2.27.5
25+
golang.org/x/sync v0.16.0
26+
golang.org/x/sys v0.34.0
27+
google.golang.org/grpc v1.68.1
2828
oras.land/oras-go/v2 v2.5.0
2929
)
3030

3131
require (
3232
filippo.io/edwards25519 v1.1.0 // indirect
33-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
34-
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 // indirect
35-
github.com/Masterminds/semver/v3 v3.2.1 // indirect
33+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
34+
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20231105174938-2b5cbb29f3e2 // indirect
3635
github.com/Microsoft/go-winio v0.6.2 // indirect
37-
github.com/Microsoft/hcsshim v0.12.4 // indirect
36+
github.com/Microsoft/hcsshim v0.12.9 // indirect
3837
github.com/beorn7/perks v1.0.1 // indirect
39-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
38+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4039
github.com/cilium/ebpf v0.11.0 // indirect
4140
github.com/containerd/cgroups/v3 v3.0.3 // indirect
4241
github.com/containerd/console v1.0.4 // indirect
42+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
4343
github.com/containerd/fifo v1.1.0 // indirect
4444
github.com/containerd/go-runc v1.1.0 // indirect
45-
github.com/containerd/plugin v0.1.0 // indirect
46-
github.com/containerd/ttrpc v1.2.4 // indirect
47-
github.com/containerd/typeurl/v2 v2.1.1 // indirect
48-
github.com/containernetworking/cni v1.2.0 // indirect
49-
github.com/containernetworking/plugins v1.4.1 // indirect
45+
github.com/containerd/plugin v1.0.0 // indirect
46+
github.com/containerd/ttrpc v1.2.7 // indirect
47+
github.com/containerd/typeurl/v2 v2.2.3 // indirect
48+
github.com/containernetworking/cni v1.2.3 // indirect
49+
github.com/containernetworking/plugins v1.5.1 // indirect
5050
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
51-
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
51+
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
5252
github.com/cyphar/filepath-securejoin v0.5.1 // indirect
5353
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5454
github.com/distribution/reference v0.6.0 // indirect
5555
github.com/felixge/httpsnoop v1.0.4 // indirect
5656
github.com/fsnotify/fsnotify v1.7.0 // indirect
57-
github.com/go-logr/logr v1.4.1 // indirect
57+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
58+
github.com/go-logr/logr v1.4.2 // indirect
5859
github.com/go-logr/stdr v1.2.2 // indirect
5960
github.com/godbus/dbus/v5 v5.1.0 // indirect
6061
github.com/gogo/protobuf v1.3.2 // indirect
6162
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6263
github.com/google/go-cmp v0.6.0 // indirect
6364
github.com/inconshreveable/mousetrap v1.1.0 // indirect
64-
github.com/intel/goresctrl v0.7.0 // indirect
65-
github.com/klauspost/compress v1.17.8 // indirect
65+
github.com/intel/goresctrl v0.8.0 // indirect
66+
github.com/klauspost/compress v1.17.11 // indirect
6667
github.com/mdlayher/socket v0.4.1 // indirect
6768
github.com/mdlayher/vsock v1.2.1 // indirect
68-
github.com/moby/sys/sequential v0.5.0 // indirect
69-
github.com/moby/sys/signal v0.7.0 // indirect
70-
github.com/moby/sys/symlink v0.2.0 // indirect
71-
github.com/moby/sys/user v0.1.0 // indirect
69+
github.com/moby/sys/sequential v0.6.0 // indirect
70+
github.com/moby/sys/signal v0.7.1 // indirect
71+
github.com/moby/sys/symlink v0.3.0 // indirect
72+
github.com/moby/sys/user v0.3.0 // indirect
73+
github.com/moby/sys/userns v0.1.0 // indirect
74+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7275
github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 // indirect
7376
github.com/opencontainers/selinux v1.13.1 // indirect
74-
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
77+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
78+
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
7579
github.com/pkg/errors v0.9.1 // indirect
7680
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
77-
github.com/prometheus/client_model v0.5.0 // indirect
78-
github.com/prometheus/common v0.48.0 // indirect
79-
github.com/prometheus/procfs v0.12.0 // indirect
81+
github.com/prometheus/client_model v0.6.1 // indirect
82+
github.com/prometheus/common v0.55.0 // indirect
83+
github.com/prometheus/procfs v0.15.1 // indirect
8084
github.com/russross/blackfriday/v2 v2.1.0 // indirect
85+
github.com/sasha-s/go-deadlock v0.3.5 // indirect
8186
github.com/spf13/pflag v1.0.5 // indirect
8287
github.com/stretchr/testify v1.11.1 // indirect
8388
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
84-
github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
85-
go.etcd.io/bbolt v1.3.10 // indirect
89+
github.com/x448/float16 v0.8.4 // indirect
90+
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
91+
go.etcd.io/bbolt v1.3.11 // indirect
8692
go.opencensus.io v0.24.0 // indirect
87-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect
88-
go.opentelemetry.io/otel v1.26.0 // indirect
89-
go.opentelemetry.io/otel/metric v1.26.0 // indirect
90-
go.opentelemetry.io/otel/trace v1.26.0 // indirect
91-
golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611 // indirect
92-
golang.org/x/mod v0.18.0 // indirect
93-
golang.org/x/net v0.25.0 // indirect
94-
golang.org/x/text v0.15.0 // indirect
95-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
96-
google.golang.org/protobuf v1.34.1 // indirect
93+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect
94+
go.opentelemetry.io/otel v1.31.0 // indirect
95+
go.opentelemetry.io/otel/metric v1.31.0 // indirect
96+
go.opentelemetry.io/otel/trace v1.31.0 // indirect
97+
golang.org/x/exp v0.0.0-20250711185948-6ae5c78190dc // indirect
98+
golang.org/x/mod v0.26.0 // indirect
99+
golang.org/x/net v0.42.0 // indirect
100+
golang.org/x/text v0.27.0 // indirect
101+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
102+
google.golang.org/protobuf v1.35.2 // indirect
97103
gopkg.in/inf.v0 v0.9.1 // indirect
98-
gopkg.in/yaml.v2 v2.4.0 // indirect
99104
gopkg.in/yaml.v3 v3.0.1 // indirect
100-
k8s.io/apimachinery v0.30.0 // indirect
101-
sigs.k8s.io/yaml v1.3.0 // indirect
102-
tags.cncf.io/container-device-interface v0.7.2 // indirect
103-
tags.cncf.io/container-device-interface/specs-go v0.7.0 // indirect
105+
k8s.io/apimachinery v0.31.2 // indirect
106+
sigs.k8s.io/yaml v1.4.0 // indirect
107+
tags.cncf.io/container-device-interface v1.0.1 // indirect
108+
tags.cncf.io/container-device-interface/specs-go v1.0.0 // indirect
104109
)
105110

106111
// v0.5.2 was retagged: 71d70d4e738679154f62e2869e94784558cb9b36 -> fd022b910830015d8665a7b497f47bba1f90dd18

0 commit comments

Comments
 (0)