Skip to content

Commit fe7f0ae

Browse files
fuweidfuweid
authored
Merge pull request #6827 from mxpv/renames
2 parents 809549e + bd90ce0 commit fe7f0ae

22 files changed

Lines changed: 1402 additions & 368 deletions

File tree

‎Protobuild.toml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ plugins = ["grpc", "fieldpath"]
3333

3434
[[overrides]]
3535
# enable ttrpc and disable fieldpath and grpc for the shim
36-
prefixes = ["github.com/containerd/containerd/runtime/v1/shim/v1", "github.com/containerd/containerd/runtime/v2/task"]
36+
prefixes = [
37+
"github.com/containerd/containerd/runtime/v1/shim/v1",
38+
"github.com/containerd/containerd/api/runtime/task/v2",
39+
"github.com/containerd/containerd/api/runtime/sandbox/v1",
40+
]
3741
plugins = ["ttrpc"]
3842

3943
# Lock down runc config

‎api/Protobuild.toml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@ plugins = ["ttrpc", "fieldpath"]
4141

4242
[[overrides]]
4343
# enable ttrpc and disable fieldpath and grpc for the shim
44-
prefixes = ["github.com/containerd/containerd/runtime/v1/shim/v1", "github.com/containerd/containerd/runtime/v2/task"]
44+
prefixes = [
45+
"github.com/containerd/containerd/runtime/v1/shim/v1",
46+
"github.com/containerd/containerd/api/runtime/task/v2",
47+
"github.com/containerd/containerd/api/runtime/sandbox/v1",
48+
]
4549
plugins = ["ttrpc"]
4650

4751
# Aggregrate the API descriptors to lock down API changes.

0 commit comments

Comments
 (0)