Merge pull request #6835 from kzys/proto-upgrade-5

Prepare for google.golang.org/protobuf
This commit is contained in:
Phil Estes 2022-04-21 14:24:04 +01:00 committed by GitHub
commit 320ef912bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 72 additions and 40 deletions

View File

@ -48,6 +48,9 @@ file {
type: TYPE_BOOL type: TYPE_BOOL
json_name: "fieldpath" json_name: "fieldpath"
} }
options {
go_package: "github.com/containerd/containerd/protobuf/plugin"
}
} }
file { file {
name: "github.com/containerd/containerd/api/events/container.proto" name: "github.com/containerd/containerd/api/events/container.proto"
@ -1214,6 +1217,9 @@ file {
number: 5 number: 5
} }
} }
options {
go_package: "github.com/containerd/containerd/api/types/task"
}
syntax: "proto3" syntax: "proto3"
} }
file { file {

View File

@ -166,36 +166,37 @@ func init() {
} }
var fileDescriptor_391ef18c8ab0dc16 = []byte{ var fileDescriptor_391ef18c8ab0dc16 = []byte{
// 461 bytes of a gzipped FileDescriptorProto // 469 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0x4f, 0x6b, 0xdb, 0x30, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0x4f, 0x8b, 0xda, 0x40,
0x18, 0xc6, 0x2b, 0x27, 0x71, 0x12, 0x79, 0x7f, 0x8c, 0x16, 0x8a, 0x96, 0x81, 0x63, 0x7a, 0x32, 0x18, 0xc6, 0x9d, 0xa8, 0x51, 0xdf, 0xf4, 0x4f, 0x98, 0xca, 0x92, 0x5a, 0x88, 0xb2, 0xa7, 0xd0,
0x3b, 0xd8, 0x2c, 0x3d, 0x0c, 0x76, 0x4b, 0xeb, 0x30, 0xcc, 0xc0, 0x0d, 0x4a, 0xc2, 0x8e, 0xc1, 0x43, 0x42, 0xdd, 0x43, 0xa1, 0x37, 0x77, 0x23, 0x25, 0x14, 0xb2, 0x32, 0x2a, 0x85, 0x5e, 0x24,
0x89, 0x14, 0x4f, 0xac, 0xb1, 0x8c, 0xad, 0x8c, 0xe5, 0xb6, 0x8f, 0xd7, 0xe3, 0x8e, 0x3d, 0x95, 0x9a, 0x31, 0x1d, 0xba, 0x66, 0x42, 0x32, 0x96, 0x7a, 0xeb, 0xc7, 0xdb, 0x63, 0x8f, 0x7b, 0x5a,
0xd5, 0x9f, 0x64, 0x48, 0x76, 0xd2, 0xb1, 0xed, 0x62, 0xde, 0xe7, 0x79, 0x7f, 0xe8, 0x7d, 0xfc, 0xba, 0xf9, 0x24, 0x65, 0x26, 0xd1, 0x2d, 0x6d, 0x2f, 0xbd, 0x84, 0xf7, 0x79, 0xde, 0x1f, 0x33,
0xc0, 0x0f, 0x29, 0x97, 0x5f, 0xf6, 0x6b, 0x7f, 0x23, 0x76, 0xc1, 0x46, 0x64, 0x32, 0xe1, 0x19, 0x4f, 0x1e, 0x06, 0xde, 0x25, 0x4c, 0x7c, 0xde, 0xaf, 0xdd, 0x0d, 0xdf, 0x79, 0x1b, 0x9e, 0x8a,
0x2b, 0xe8, 0x9f, 0x63, 0x92, 0xf3, 0x40, 0x1e, 0x72, 0x56, 0x06, 0x32, 0x29, 0xbf, 0xea, 0x8f, 0x88, 0xa5, 0x34, 0x8f, 0x7f, 0x1f, 0xa3, 0x8c, 0x79, 0xe2, 0x90, 0xd1, 0xc2, 0x13, 0x51, 0xf1,
0x9f, 0x17, 0x42, 0x0a, 0xf4, 0xea, 0x89, 0xf2, 0xbf, 0xbd, 0xf3, 0x35, 0x34, 0x1c, 0xa4, 0x22, 0x45, 0x7d, 0xdc, 0x2c, 0xe7, 0x82, 0xe3, 0x17, 0x8f, 0x94, 0xfb, 0xf5, 0x8d, 0xab, 0xa0, 0x41,
0x15, 0x7a, 0x1f, 0xa8, 0xa9, 0x46, 0x87, 0xa3, 0x54, 0x88, 0xf4, 0x96, 0x05, 0x5a, 0xad, 0xf7, 0x3f, 0xe1, 0x09, 0x57, 0x7b, 0x4f, 0x4e, 0x15, 0x3a, 0x18, 0x26, 0x9c, 0x27, 0x37, 0xd4, 0x53,
0xdb, 0x40, 0xf2, 0x1d, 0x2b, 0x65, 0xb2, 0xcb, 0x1b, 0xe0, 0xf5, 0xdf, 0x40, 0x92, 0x1d, 0xea, 0x6a, 0xbd, 0xdf, 0x7a, 0x82, 0xed, 0x68, 0x21, 0xa2, 0x5d, 0x56, 0x03, 0x2f, 0xff, 0x04, 0xa2,
0xd5, 0xc5, 0xbd, 0x01, 0xbb, 0xb3, 0x42, 0x6c, 0x58, 0x59, 0xa2, 0x31, 0x7c, 0x76, 0x3a, 0xba, 0xf4, 0x50, 0xad, 0xce, 0xef, 0x34, 0xe8, 0xcc, 0x72, 0xbe, 0xa1, 0x45, 0x81, 0xc7, 0xf0, 0xe4,
0xe2, 0x14, 0x03, 0x17, 0x78, 0xfd, 0xab, 0x97, 0xd5, 0xc3, 0xc8, 0xba, 0x3e, 0xfa, 0x51, 0x48, 0x74, 0xe9, 0x8a, 0xc5, 0x16, 0x1a, 0x21, 0xa7, 0x77, 0xf9, 0xbc, 0xbc, 0x1f, 0x1a, 0x57, 0x47,
0xac, 0x13, 0x14, 0x51, 0x74, 0x0e, 0x0d, 0x4e, 0xb1, 0xa1, 0x49, 0xb3, 0x7a, 0x18, 0x19, 0x51, 0x3f, 0xf0, 0x89, 0x71, 0x82, 0x82, 0x18, 0x9f, 0x81, 0xc6, 0x62, 0x4b, 0x53, 0xa4, 0x5e, 0xde,
0x48, 0x0c, 0x4e, 0x91, 0x0d, 0x5b, 0x39, 0xa7, 0xb8, 0xe5, 0x02, 0xef, 0x39, 0x51, 0x23, 0xba, 0x0f, 0xb5, 0xc0, 0x27, 0x1a, 0x8b, 0xb1, 0x09, 0xcd, 0x8c, 0xc5, 0x56, 0x73, 0x84, 0x9c, 0xa7,
0x84, 0x66, 0x29, 0x13, 0xb9, 0x2f, 0x71, 0xdb, 0x05, 0xde, 0x8b, 0xf1, 0x1b, 0xff, 0x3f, 0x7f, 0x44, 0x8e, 0xf8, 0x02, 0xf4, 0x42, 0x44, 0x62, 0x5f, 0x58, 0xad, 0x11, 0x72, 0x9e, 0x8d, 0x5f,
0xe8, 0xcf, 0x35, 0x42, 0x1a, 0x14, 0x0d, 0x60, 0xa7, 0x94, 0x94, 0x67, 0xb8, 0xa3, 0x2e, 0x90, 0xb9, 0xff, 0xf8, 0x43, 0x77, 0xae, 0x10, 0x52, 0xa3, 0xb8, 0x0f, 0xed, 0x42, 0xc4, 0x2c, 0xb5,
0x5a, 0xa0, 0x73, 0xf5, 0x14, 0x15, 0x7b, 0x89, 0x4d, 0x6d, 0x37, 0xaa, 0xf1, 0x59, 0x51, 0xe0, 0xda, 0xf2, 0x06, 0x52, 0x09, 0x7c, 0x26, 0x8f, 0x8a, 0xf9, 0x5e, 0x58, 0xba, 0xb2, 0x6b, 0x55,
0xee, 0xc9, 0x67, 0x45, 0x81, 0x86, 0xb0, 0x27, 0x59, 0xb1, 0xe3, 0x59, 0x72, 0x8b, 0x7b, 0x2e, 0xfb, 0x34, 0xcf, 0xad, 0xce, 0xc9, 0xa7, 0x79, 0x8e, 0x07, 0xd0, 0x15, 0x34, 0xdf, 0xb1, 0x34,
0xf0, 0x7a, 0xe4, 0xa4, 0xd1, 0x08, 0x5a, 0xec, 0x3b, 0x97, 0xab, 0x26, 0x5b, 0x5f, 0x07, 0x86, 0xba, 0xb1, 0xba, 0x23, 0xe4, 0x74, 0xc9, 0x49, 0xe3, 0x21, 0x18, 0xf4, 0x1b, 0x13, 0xab, 0x3a,
0xca, 0xaa, 0xa3, 0xa0, 0xf7, 0xb0, 0xaf, 0x14, 0xa3, 0xab, 0x44, 0x62, 0xe8, 0x02, 0xcf, 0x1a, 0x5b, 0x4f, 0x05, 0x06, 0x69, 0x55, 0x51, 0xf0, 0x5b, 0xe8, 0x49, 0x45, 0xe3, 0x55, 0x24, 0x2c,
0x0f, 0xfd, 0xba, 0x50, 0xff, 0x58, 0xa8, 0xbf, 0x38, 0x36, 0x4e, 0x7a, 0x35, 0x3c, 0x91, 0x17, 0x18, 0x21, 0xc7, 0x18, 0x0f, 0xdc, 0xaa, 0x50, 0xf7, 0x58, 0xa8, 0xbb, 0x38, 0x36, 0x4e, 0xba,
0x11, 0xb4, 0x9a, 0x66, 0xa3, 0x6c, 0x2b, 0x8e, 0x8d, 0x80, 0xa7, 0x46, 0x3c, 0xd8, 0xe6, 0xd9, 0x15, 0x3c, 0x11, 0xe7, 0x01, 0x18, 0x75, 0xb3, 0x41, 0xba, 0xe5, 0xc7, 0x46, 0xd0, 0x63, 0x23,
0x56, 0xe8, 0xf6, 0xac, 0xf1, 0xe0, 0x9f, 0x47, 0x27, 0xd9, 0x81, 0x68, 0xe2, 0xed, 0x12, 0x9a, 0x0e, 0xb4, 0x58, 0xba, 0xe5, 0xaa, 0x3d, 0x63, 0xdc, 0xff, 0xeb, 0xd0, 0x49, 0x7a, 0x20, 0x8a,
0x4d, 0x1a, 0x0b, 0x76, 0x97, 0xf1, 0xa7, 0xf8, 0xe6, 0x73, 0x6c, 0x9f, 0x29, 0x71, 0x4d, 0xa6, 0x78, 0xbd, 0x04, 0xbd, 0x4e, 0x63, 0x40, 0x67, 0x19, 0x7e, 0x08, 0xaf, 0x3f, 0x86, 0x66, 0x43,
0x93, 0xc5, 0x34, 0xb4, 0x81, 0x12, 0x64, 0x19, 0xc7, 0x51, 0xfc, 0xd1, 0x36, 0x94, 0x98, 0x2f, 0x8a, 0x2b, 0x32, 0x9d, 0x2c, 0xa6, 0xbe, 0x89, 0xa4, 0x20, 0xcb, 0x30, 0x0c, 0xc2, 0xf7, 0xa6,
0x6e, 0x66, 0xb3, 0x69, 0x68, 0xb7, 0x10, 0x84, 0xe6, 0x6c, 0xb2, 0x9c, 0x4f, 0x43, 0xbb, 0xad, 0x26, 0xc5, 0x7c, 0x71, 0x3d, 0x9b, 0x4d, 0x7d, 0xb3, 0x89, 0x01, 0xf4, 0xd9, 0x64, 0x39, 0x9f,
0x16, 0x6a, 0x56, 0x54, 0xe7, 0x0a, 0xdf, 0x3d, 0x3a, 0x67, 0xf7, 0x8f, 0xce, 0xd9, 0x8f, 0xca, 0xfa, 0x66, 0x4b, 0x2e, 0xe4, 0x2c, 0xa9, 0xf6, 0x65, 0x70, 0xfb, 0x60, 0x37, 0xee, 0x1e, 0xec,
0x01, 0x77, 0x95, 0x03, 0x7e, 0x56, 0x0e, 0xf8, 0x55, 0x39, 0x60, 0x6d, 0xea, 0x10, 0x97, 0xbf, 0xc6, 0xf7, 0xd2, 0x46, 0xb7, 0xa5, 0x8d, 0x7e, 0x94, 0x36, 0xfa, 0x59, 0xda, 0xe8, 0x93, 0xf7,
0x03, 0x00, 0x00, 0xff, 0xff, 0x60, 0xe5, 0xd9, 0x31, 0xc2, 0x02, 0x00, 0x00, 0x9f, 0x2f, 0x77, 0xad, 0xab, 0xd4, 0x17, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xc0, 0x3c, 0x50,
0x5f, 0xf3, 0x02, 0x00, 0x00,
} }
func (m *Process) Marshal() (dAtA []byte, err error) { func (m *Process) Marshal() (dAtA []byte, err error) {

View File

@ -22,6 +22,8 @@ import "gogoproto/gogo.proto";
import "google/protobuf/timestamp.proto"; import "google/protobuf/timestamp.proto";
import "google/protobuf/any.proto"; import "google/protobuf/any.proto";
option go_package = "github.com/containerd/containerd/api/types/task";
enum Status { enum Status {
UNKNOWN = 0; UNKNOWN = 0;
CREATED = 1; CREATED = 1;

View File

@ -39,6 +39,7 @@ import (
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/pkg/process" "github.com/containerd/containerd/pkg/process"
"github.com/containerd/containerd/protobuf" "github.com/containerd/containerd/protobuf"
"github.com/containerd/containerd/protobuf/proto"
ptypes "github.com/containerd/containerd/protobuf/types" ptypes "github.com/containerd/containerd/protobuf/types"
shimlog "github.com/containerd/containerd/runtime/v1" shimlog "github.com/containerd/containerd/runtime/v1"
"github.com/containerd/containerd/runtime/v1/shim" "github.com/containerd/containerd/runtime/v1/shim"
@ -305,7 +306,7 @@ func (l *remoteEventsPublisher) Publish(ctx context.Context, topic string, event
if err != nil { if err != nil {
return err return err
} }
data, err := encoded.Marshal() data, err := proto.Marshal(encoded)
if err != nil { if err != nil {
return err return err
} }

View File

@ -28,6 +28,7 @@ import (
"github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/pkg/dialer" "github.com/containerd/containerd/pkg/dialer"
"github.com/containerd/containerd/protobuf/proto"
"github.com/containerd/containerd/protobuf/types" "github.com/containerd/containerd/protobuf/types"
"github.com/urfave/cli" "github.com/urfave/cli"
"google.golang.org/grpc" "google.golang.org/grpc"
@ -78,7 +79,7 @@ func getEventPayload(r io.Reader) (*types.Any, error) {
return nil, err return nil, err
} }
var any types.Any var any types.Any
if err := any.Unmarshal(data); err != nil { if err := proto.Unmarshal(data, &any); err != nil {
return nil, err return nil, err
} }
return &any, nil return &any, nil

View File

@ -29,6 +29,7 @@ import (
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"
"github.com/containerd/containerd/platforms" "github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/protobuf" "github.com/containerd/containerd/protobuf"
"github.com/containerd/containerd/protobuf/proto"
"github.com/containerd/containerd/rootfs" "github.com/containerd/containerd/rootfs"
"github.com/containerd/containerd/runtime/v2/runc/options" "github.com/containerd/containerd/runtime/v2/runc/options"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
@ -79,7 +80,7 @@ func WithCheckpointTask(ctx context.Context, client *Client, c *containers.Conta
}) })
} }
// save copts // save copts
data, err := any.Marshal() data, err := proto.Marshal(any)
if err != nil { if err != nil {
return err return err
} }
@ -99,7 +100,8 @@ func WithCheckpointTask(ctx context.Context, client *Client, c *containers.Conta
// WithCheckpointRuntime includes the container runtime info // WithCheckpointRuntime includes the container runtime info
func WithCheckpointRuntime(ctx context.Context, client *Client, c *containers.Container, index *imagespec.Index, copts *options.CheckpointOptions) error { func WithCheckpointRuntime(ctx context.Context, client *Client, c *containers.Container, index *imagespec.Index, copts *options.CheckpointOptions) error {
if c.Runtime.Options != nil && c.Runtime.Options.GetValue() != nil { if c.Runtime.Options != nil && c.Runtime.Options.GetValue() != nil {
data, err := protobuf.FromAny(c.Runtime.Options).Marshal() any := protobuf.FromAny(c.Runtime.Options)
data, err := proto.Marshal(any)
if err != nil { if err != nil {
return err return err
} }

View File

@ -32,6 +32,7 @@ var empty = &ptypes.Empty{}
type service struct { type service struct {
sn snapshots.Snapshotter sn snapshots.Snapshotter
snapshotsapi.UnimplementedSnapshotsServer
} }
// FromSnapshotter returns a Snapshot API server from a containerd snapshotter // FromSnapshotter returns a Snapshot API server from a containerd snapshotter

View File

@ -49,7 +49,7 @@ func init() {
} }
var fileDescriptor_604a244430167409 = []byte{ var fileDescriptor_604a244430167409 = []byte{
// 203 bytes of a gzipped FileDescriptorProto // 208 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x48, 0xcf, 0x2c, 0xc9, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x48, 0xcf, 0x2c, 0xc9,
0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d,
0x4a, 0x41, 0x66, 0x16, 0x14, 0xe5, 0x97, 0xe4, 0x27, 0x95, 0xa6, 0xe9, 0x17, 0xe4, 0x94, 0xa6, 0x4a, 0x41, 0x66, 0x16, 0x14, 0xe5, 0x97, 0xe4, 0x27, 0x95, 0xa6, 0xe9, 0x17, 0xe4, 0x94, 0xa6,
@ -60,7 +60,7 @@ var fileDescriptor_604a244430167409 = []byte{
0x65, 0xe6, 0xa4, 0xfa, 0x17, 0x94, 0x64, 0xe6, 0xe7, 0x15, 0x4b, 0x1c, 0x79, 0xc7, 0xac, 0xc0, 0x65, 0xe6, 0xa4, 0xfa, 0x17, 0x94, 0x64, 0xe6, 0xe7, 0x15, 0x4b, 0x1c, 0x79, 0xc7, 0xac, 0xc0,
0xa8, 0xc1, 0x11, 0xc4, 0x03, 0xd7, 0xe4, 0x98, 0x93, 0x63, 0x65, 0xcf, 0xc5, 0x09, 0xe7, 0x0b, 0xa8, 0xc1, 0x11, 0xc4, 0x03, 0xd7, 0xe4, 0x98, 0x93, 0x63, 0x65, 0xcf, 0xc5, 0x09, 0xe7, 0x0b,
0xc9, 0x63, 0x18, 0xe0, 0x9b, 0x5a, 0x5c, 0x9c, 0x98, 0x0e, 0x37, 0x63, 0xc2, 0x77, 0x88, 0x19, 0xc9, 0x63, 0x18, 0xe0, 0x9b, 0x5a, 0x5c, 0x9c, 0x98, 0x0e, 0x37, 0x63, 0xc2, 0x77, 0x88, 0x19,
0x08, 0x3d, 0x4e, 0x12, 0x27, 0x1e, 0xca, 0x31, 0xdc, 0x78, 0x28, 0xc7, 0xd0, 0xf0, 0x48, 0x8e, 0x08, 0x3d, 0x4e, 0x5e, 0x27, 0x1e, 0xca, 0x31, 0xdc, 0x78, 0x28, 0xc7, 0xd0, 0xf0, 0x48, 0x8e,
0xf1, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x04, 0x04, 0x00, 0xf1, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x8c, 0x32, 0x20,
0x00, 0xff, 0xff, 0xd6, 0x21, 0x2a, 0xb6, 0x17, 0x01, 0x00, 0x00, 0x35, 0x58, 0x00, 0x01, 0x00, 0x00, 0xff, 0xff, 0xaa, 0x81, 0x40, 0x89, 0x49, 0x01, 0x00, 0x00,
} }

View File

@ -31,6 +31,8 @@ package containerd.plugin;
import "google/protobuf/descriptor.proto"; import "google/protobuf/descriptor.proto";
option go_package = "github.com/containerd/containerd/protobuf/plugin";
extend google.protobuf.FileOptions { extend google.protobuf.FileOptions {
optional bool fieldpath_all = 63300; optional bool fieldpath_all = 63300;
} }

View File

@ -30,6 +30,7 @@ import (
"github.com/containerd/containerd/log" "github.com/containerd/containerd/log"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/protobuf" "github.com/containerd/containerd/protobuf"
"github.com/containerd/containerd/protobuf/proto"
"github.com/containerd/containerd/protobuf/types" "github.com/containerd/containerd/protobuf/types"
"github.com/containerd/containerd/runtime" "github.com/containerd/containerd/runtime"
client "github.com/containerd/containerd/runtime/v2/shim" client "github.com/containerd/containerd/runtime/v2/shim"
@ -185,7 +186,7 @@ func (b *binary) Delete(ctx context.Context) (*runtime.Exit, error) {
log.G(ctx).Warnf("cleanup warnings %s", s) log.G(ctx).Warnf("cleanup warnings %s", s)
} }
var response task.DeleteResponse var response task.DeleteResponse
if err := response.Unmarshal(out.Bytes()); err != nil { if err := proto.Unmarshal(out.Bytes(), &response); err != nil {
return nil, err return nil, err
} }
if err := b.bundle.Delete(); err != nil { if err := b.bundle.Delete(); err != nil {

View File

@ -55,6 +55,7 @@ func init() {
type service struct { type service struct {
local api.ContainersClient local api.ContainersClient
api.UnimplementedContainersServer
} }
var _ api.ContainersServer = &service{} var _ api.ContainersServer = &service{}

View File

@ -38,6 +38,7 @@ import (
type service struct { type service struct {
store content.Store store content.Store
api.UnimplementedContentServer
} }
var bufPool = sync.Pool{ var bufPool = sync.Pool{

View File

@ -53,6 +53,7 @@ func init() {
type service struct { type service struct {
local diffapi.DiffClient local diffapi.DiffClient
diffapi.UnimplementedDiffServer
} }
var _ diffapi.DiffServer = &service{} var _ diffapi.DiffServer = &service{}

View File

@ -52,6 +52,7 @@ func init() {
type service struct { type service struct {
ttService *ttrpcService ttService *ttrpcService
events *exchange.Exchange events *exchange.Exchange
api.UnimplementedEventsServer
} }
// NewService returns the GRPC events server // NewService returns the GRPC events server

View File

@ -54,6 +54,7 @@ func init() {
type service struct { type service struct {
local imagesapi.ImagesClient local imagesapi.ImagesClient
imagesapi.UnimplementedImagesServer
} }
var _ imagesapi.ImagesServer = &service{} var _ imagesapi.ImagesServer = &service{}

View File

@ -62,6 +62,7 @@ func init() {
type server struct { type server struct {
local api.IntrospectionClient local api.IntrospectionClient
api.UnimplementedIntrospectionServer
} }
var _ = (api.IntrospectionServer)(&server{}) var _ = (api.IntrospectionServer)(&server{})

View File

@ -47,6 +47,7 @@ func init() {
type service struct { type service struct {
lm leases.Manager lm leases.Manager
api.UnimplementedLeasesServer
} }
func (s *service) Register(server *grpc.Server) error { func (s *service) Register(server *grpc.Server) error {

View File

@ -54,6 +54,7 @@ func init() {
type service struct { type service struct {
local api.NamespacesClient local api.NamespacesClient
api.UnimplementedNamespacesServer
} }
var _ api.NamespacesServer = &service{} var _ api.NamespacesServer = &service{}

View File

@ -59,6 +59,7 @@ func init() {
type controllerService struct { type controllerService struct {
local api.ControllerClient local api.ControllerClient
api.UnimplementedControllerServer
} }
var _ api.ControllerServer = (*controllerService)(nil) var _ api.ControllerServer = (*controllerService)(nil)

View File

@ -55,6 +55,7 @@ func init() {
type sandboxService struct { type sandboxService struct {
local api.StoreClient local api.StoreClient
api.UnimplementedStoreServer
} }
var _ api.StoreServer = (*sandboxService)(nil) var _ api.StoreServer = (*sandboxService)(nil)

View File

@ -48,6 +48,7 @@ var empty = &ptypes.Empty{}
type service struct { type service struct {
ss map[string]snapshots.Snapshotter ss map[string]snapshots.Snapshotter
snapshotsapi.UnimplementedSnapshotsServer
} }
func newService(ic *plugin.InitContext) (interface{}, error) { func newService(ic *plugin.InitContext) (interface{}, error) {

View File

@ -42,6 +42,7 @@ import (
"github.com/containerd/containerd/pkg/timeout" "github.com/containerd/containerd/pkg/timeout"
"github.com/containerd/containerd/plugin" "github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/protobuf" "github.com/containerd/containerd/protobuf"
"github.com/containerd/containerd/protobuf/proto"
ptypes "github.com/containerd/containerd/protobuf/types" ptypes "github.com/containerd/containerd/protobuf/types"
"github.com/containerd/containerd/runtime" "github.com/containerd/containerd/runtime"
"github.com/containerd/containerd/runtime/linux/runctypes" "github.com/containerd/containerd/runtime/linux/runctypes"
@ -579,7 +580,8 @@ func (l *local) Checkpoint(ctx context.Context, r *api.CheckpointTaskRequest, _
return nil, err return nil, err
} }
// write the config to the content store // write the config to the content store
data, err := protobuf.FromAny(container.Spec).Marshal() pbany := protobuf.FromAny(container.Spec)
data, err := proto.Marshal(pbany)
if err != nil { if err != nil {
return nil, err return nil, err
} }

View File

@ -58,6 +58,7 @@ func init() {
type service struct { type service struct {
local api.TasksClient local api.TasksClient
api.UnimplementedTasksServer
} }
func (s *service) Register(server *grpc.Server) error { func (s *service) Register(server *grpc.Server) error {

View File

@ -41,6 +41,7 @@ func initFunc(ic *plugin.InitContext) (interface{}, error) {
} }
type service struct { type service struct {
api.UnimplementedVersionServer
} }
func (s *service) Register(server *grpc.Server) error { func (s *service) Register(server *grpc.Server) error {