Skip to content

Commit 08db41f

Browse files
milantracygvisor-bot
authored andcommitted
Implement shim/extension in containerd v2 APIs.
Sharable structs like RestoreConfig are moved to pkg/shim. PiperOrigin-RevId: 735503178
1 parent b019448 commit 08db41f

File tree

15 files changed

+273
-62
lines changed

15 files changed

+273
-62
lines changed

WORKSPACE

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2649,6 +2649,22 @@ go_repository(
26492649
version = "v1.6.36",
26502650
)
26512651

2652+
go_repository(
2653+
name = "com_github_containerd_containerd_api",
2654+
build_file_proto_mode = "disable",
2655+
importpath = "github.com/containerd/containerd/api",
2656+
sum = "h1:hVTNJKR8fMc/2Tiw60ZRijntNMd1U+JVMyTRdsD2bS0=",
2657+
version = "v1.8.0",
2658+
)
2659+
2660+
go_repository(
2661+
name = "com_github_containerd_containerd_v2",
2662+
build_file_proto_mode = "disable",
2663+
importpath = "github.com/containerd/containerd/v2",
2664+
sum = "h1:GmH/tRBlTvrXOLwSpWE2vNAm8+MqI6nmxKpKBNKY8Wc=",
2665+
version = "v2.0.2",
2666+
)
2667+
26522668
go_repository(
26532669
name = "com_github_cenkalti_backoff",
26542670
importpath = "github.com/cenkalti/backoff",
@@ -2803,6 +2819,13 @@ go_repository(
28032819
version = "v27.3.0+incompatible",
28042820
)
28052821

2822+
go_repository(
2823+
name = "com_github_moby_sys_userns",
2824+
importpath = "github.com/moby/sys/userns",
2825+
sum = "h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g=",
2826+
version = "v0.1.0",
2827+
)
2828+
28062829
go_repository(
28072830
name = "com_github_docker_docker",
28082831
importpath = "github.com/docker/docker",
@@ -2998,8 +3021,8 @@ go_repository(
29983021
go_repository(
29993022
name = "com_github_containerd_ttrpc",
30003023
importpath = "github.com/containerd/ttrpc",
3001-
sum = "h1:GbtyLRxb0gOLR0TYQWt3O6B0NvT8tMdorEHqIQo/lWI=",
3002-
version = "v1.1.0",
3024+
sum = "h1:qIrroQvuOL9HQ1X6KHe2ohc7p+HP/0VE6XPU7elJRqQ=",
3025+
version = "v1.2.7",
30033026
)
30043027

30053028
go_repository(

go.mod

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ require (
77
github.com/bazelbuild/rules_go v0.44.2
88
github.com/cenkalti/backoff v2.2.1+incompatible
99
github.com/cilium/ebpf v0.12.3
10-
github.com/containerd/cgroups v1.0.4
11-
github.com/containerd/console v1.0.3
12-
github.com/containerd/containerd v1.6.36
13-
github.com/containerd/fifo v1.0.0
14-
github.com/containerd/go-runc v1.0.0
10+
github.com/containerd/cgroups v1.1.0
11+
github.com/containerd/console v1.0.4
12+
github.com/containerd/containerd v1.7.23
13+
github.com/containerd/containerd/api v1.8.0
14+
github.com/containerd/containerd/v2 v2.0.2
15+
github.com/containerd/fifo v1.1.0
16+
github.com/containerd/go-runc v1.1.0
1517
github.com/containerd/typeurl v1.0.2
1618
github.com/coreos/go-systemd/v22 v22.5.0
1719
github.com/godbus/dbus/v5 v5.1.0
@@ -22,80 +24,80 @@ require (
2224
github.com/kr/pty v1.1.5
2325
github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a
2426
github.com/mohae/deepcopy v0.0.0-20170308212314-bb9b5e7adda9
25-
github.com/opencontainers/runtime-spec v1.1.0-rc.1
27+
github.com/opencontainers/runtime-spec v1.2.0
2628
github.com/sirupsen/logrus v1.9.3
2729
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
28-
github.com/vishvananda/netlink v1.1.1-0.20211118161826-650dca95af54
30+
github.com/vishvananda/netlink v1.3.0
2931
golang.org/x/mod v0.21.0
3032
golang.org/x/sync v0.8.0
3133
golang.org/x/sys v0.26.0
3234
golang.org/x/time v0.7.0
3335
golang.org/x/tools v0.26.0
34-
google.golang.org/protobuf v1.33.0
35-
k8s.io/api v0.23.16
36-
k8s.io/apimachinery v0.23.16
37-
k8s.io/client-go v0.23.16
36+
google.golang.org/protobuf v1.35.1
37+
k8s.io/api v0.31.2
38+
k8s.io/apimachinery v0.31.2
39+
k8s.io/client-go v0.31.2
3840
)
3941

4042
require (
41-
github.com/Microsoft/go-winio v0.6.0 // indirect
42-
github.com/Microsoft/hcsshim v0.9.12 // indirect
43-
github.com/containerd/continuity v0.3.0 // indirect
44-
github.com/containerd/errdefs v0.1.0 // indirect
43+
github.com/Microsoft/go-winio v0.6.2 // indirect
44+
github.com/Microsoft/hcsshim v0.12.9 // indirect
45+
github.com/containerd/continuity v0.4.4 // indirect
46+
github.com/containerd/errdefs v1.0.0 // indirect
4547
github.com/containerd/log v0.1.0 // indirect
46-
github.com/containerd/ttrpc v1.1.2 // indirect
47-
github.com/davecgh/go-spew v1.1.1 // indirect
48+
github.com/containerd/ttrpc v1.2.7 // indirect
49+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4850
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
49-
github.com/docker/go-units v0.4.0 // indirect
50-
github.com/go-logr/logr v1.3.0 // indirect
51+
github.com/docker/go-units v0.5.0 // indirect
52+
github.com/go-logr/logr v1.4.2 // indirect
5153
github.com/gogo/googleapis v1.4.0 // indirect
5254
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5355
github.com/golang/mock v1.7.0-rc.1 // indirect
5456
github.com/golang/protobuf v1.5.4 // indirect
5557
github.com/google/go-cmp v0.6.0 // indirect
5658
github.com/google/go-github/v56 v56.0.0 // indirect
5759
github.com/google/gofuzz v1.2.0 // indirect
58-
github.com/google/uuid v1.3.1 // indirect
60+
github.com/google/uuid v1.6.0 // indirect
5961
github.com/googleapis/gnostic v0.5.5 // indirect
6062
github.com/hanwen/go-fuse/v2 v2.3.0 // indirect
6163
github.com/hashicorp/errwrap v1.1.0 // indirect
6264
github.com/hashicorp/go-multierror v1.1.1 // indirect
6365
github.com/json-iterator/go v1.1.12 // indirect
64-
github.com/klauspost/compress v1.15.9 // indirect
66+
github.com/klauspost/compress v1.17.11 // indirect
6567
github.com/moby/locker v1.0.1 // indirect
66-
github.com/moby/sys/mountinfo v0.6.2 // indirect
67-
github.com/moby/sys/signal v0.6.0 // indirect
68-
github.com/moby/sys/user v0.1.0 // indirect
68+
github.com/moby/sys/mountinfo v0.7.2 // indirect
69+
github.com/moby/sys/signal v0.7.1 // indirect
70+
github.com/moby/sys/user v0.3.0 // indirect
6971
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7072
github.com/modern-go/reflect2 v1.0.2 // indirect
7173
github.com/opencontainers/go-digest v1.0.0 // indirect
7274
github.com/opencontainers/image-spec v1.1.0 // indirect
73-
github.com/opencontainers/selinux v1.10.1 // indirect
75+
github.com/opencontainers/selinux v1.11.1 // indirect
7476
github.com/pkg/errors v0.9.1 // indirect
75-
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
77+
github.com/vishvananda/netns v0.0.4 // indirect
7678
go.opencensus.io v0.24.0 // indirect
7779
golang.org/x/crypto v0.28.0 // indirect
78-
golang.org/x/exp v0.0.0-20230725093048-515e97ebf090 // indirect
80+
golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611 // indirect
7981
golang.org/x/net v0.30.0 // indirect
8082
golang.org/x/oauth2 v0.23.0 // indirect
8183
golang.org/x/term v0.25.0 // indirect
8284
golang.org/x/text v0.19.0 // indirect
8385
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
8486
google.golang.org/appengine v1.6.7 // indirect
85-
google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13 // indirect
86-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
87-
google.golang.org/grpc v1.59.0 // indirect
88-
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0 // indirect
87+
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
88+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
89+
google.golang.org/grpc v1.67.1 // indirect
90+
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 // indirect
8991
gopkg.in/inf.v0 v0.9.1 // indirect
9092
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
9193
gopkg.in/yaml.v2 v2.4.0 // indirect
9294
gopkg.in/yaml.v3 v3.0.1 // indirect
9395
gotest.tools/v3 v3.4.0 // indirect
9496
honnef.co/go/tools v0.5.1 // indirect
95-
k8s.io/klog/v2 v2.30.0 // indirect
96-
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
97-
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
98-
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
99-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
100-
sigs.k8s.io/yaml v1.2.0 // indirect
97+
k8s.io/klog/v2 v2.130.1 // indirect
98+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
99+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
100+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
101+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
102+
sigs.k8s.io/yaml v1.4.0 // indirect
101103
)

0 commit comments

Comments
 (0)