From 5db3da6c2c09a7472ad939807d16bea039b530be Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Fri, 17 Feb 2017 09:53:26 -0800 Subject: [PATCH] Change shim proto package This is not really a service like the other rpcs that we expose so lets change the import paths for it. Signed-off-by: Michael Crosby --- api/services/execution/execution.pb.go | 2 +- api/services/shim/shim.pb.go | 188 ++++++++++++------------- api/services/shim/shim.proto | 2 +- api/types/container/container.pb.go | 2 +- api/types/mount/mount.pb.go | 2 +- 5 files changed, 98 insertions(+), 98 deletions(-) diff --git a/api/services/execution/execution.pb.go b/api/services/execution/execution.pb.go index d804c37..65a8611 100644 --- a/api/services/execution/execution.pb.go +++ b/api/services/execution/execution.pb.go @@ -1785,7 +1785,7 @@ func init() { var fileDescriptorExecution = []byte{ // 569 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x53, 0x4d, 0x6f, 0xd3, 0x40, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x4d, 0x6f, 0xd3, 0x40, 0x10, 0xad, 0x93, 0xd6, 0x0d, 0x93, 0xa6, 0x54, 0xab, 0x28, 0x32, 0x46, 0x72, 0x23, 0x53, 0x4a, 0x4e, 0x36, 0x84, 0x0b, 0xe2, 0x80, 0xa0, 0x69, 0x84, 0x2a, 0x51, 0x24, 0x9c, 0x03, 0x47, 0xe4, 0xd8, 0xd3, 0xb0, 0x22, 0xf1, 0x9a, 0xdd, 0x75, 0xd4, 0xdc, 0xe0, 0x87, 0xf0, 0x7f, 0x7a, 0xe4, diff --git a/api/services/shim/shim.pb.go b/api/services/shim/shim.pb.go index e0cfed0..3b73ace 100644 --- a/api/services/shim/shim.pb.go +++ b/api/services/shim/shim.pb.go @@ -198,21 +198,21 @@ func (*ExitRequest) ProtoMessage() {} func (*ExitRequest) Descriptor() ([]byte, []int) { return fileDescriptorShim, []int{14} } func init() { - proto.RegisterType((*CreateRequest)(nil), "containerd.v1.services.CreateRequest") - proto.RegisterType((*CreateResponse)(nil), "containerd.v1.services.CreateResponse") - proto.RegisterType((*StartRequest)(nil), "containerd.v1.services.StartRequest") - proto.RegisterType((*DeleteRequest)(nil), "containerd.v1.services.DeleteRequest") - proto.RegisterType((*DeleteResponse)(nil), "containerd.v1.services.DeleteResponse") - proto.RegisterType((*ExecRequest)(nil), "containerd.v1.services.ExecRequest") - proto.RegisterType((*Rlimit)(nil), "containerd.v1.services.Rlimit") - proto.RegisterType((*ExecResponse)(nil), "containerd.v1.services.ExecResponse") - proto.RegisterType((*PtyRequest)(nil), "containerd.v1.services.PtyRequest") - proto.RegisterType((*EventsRequest)(nil), "containerd.v1.services.EventsRequest") - proto.RegisterType((*StateRequest)(nil), "containerd.v1.services.StateRequest") - proto.RegisterType((*StateResponse)(nil), "containerd.v1.services.StateResponse") - proto.RegisterType((*PauseRequest)(nil), "containerd.v1.services.PauseRequest") - proto.RegisterType((*ResumeRequest)(nil), "containerd.v1.services.ResumeRequest") - proto.RegisterType((*ExitRequest)(nil), "containerd.v1.services.ExitRequest") + proto.RegisterType((*CreateRequest)(nil), "containerd.v1.services.shim.CreateRequest") + proto.RegisterType((*CreateResponse)(nil), "containerd.v1.services.shim.CreateResponse") + proto.RegisterType((*StartRequest)(nil), "containerd.v1.services.shim.StartRequest") + proto.RegisterType((*DeleteRequest)(nil), "containerd.v1.services.shim.DeleteRequest") + proto.RegisterType((*DeleteResponse)(nil), "containerd.v1.services.shim.DeleteResponse") + proto.RegisterType((*ExecRequest)(nil), "containerd.v1.services.shim.ExecRequest") + proto.RegisterType((*Rlimit)(nil), "containerd.v1.services.shim.Rlimit") + proto.RegisterType((*ExecResponse)(nil), "containerd.v1.services.shim.ExecResponse") + proto.RegisterType((*PtyRequest)(nil), "containerd.v1.services.shim.PtyRequest") + proto.RegisterType((*EventsRequest)(nil), "containerd.v1.services.shim.EventsRequest") + proto.RegisterType((*StateRequest)(nil), "containerd.v1.services.shim.StateRequest") + proto.RegisterType((*StateResponse)(nil), "containerd.v1.services.shim.StateResponse") + proto.RegisterType((*PauseRequest)(nil), "containerd.v1.services.shim.PauseRequest") + proto.RegisterType((*ResumeRequest)(nil), "containerd.v1.services.shim.ResumeRequest") + proto.RegisterType((*ExitRequest)(nil), "containerd.v1.services.shim.ExitRequest") } // Reference imports to suppress errors if they are not otherwise used. @@ -248,7 +248,7 @@ func NewShimClient(cc *grpc.ClientConn) ShimClient { func (c *shimClient) Create(ctx context.Context, in *CreateRequest, opts ...grpc.CallOption) (*CreateResponse, error) { out := new(CreateResponse) - err := grpc.Invoke(ctx, "/containerd.v1.services.Shim/Create", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/containerd.v1.services.shim.Shim/Create", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -257,7 +257,7 @@ func (c *shimClient) Create(ctx context.Context, in *CreateRequest, opts ...grpc func (c *shimClient) Start(ctx context.Context, in *StartRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) { out := new(google_protobuf.Empty) - err := grpc.Invoke(ctx, "/containerd.v1.services.Shim/Start", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/containerd.v1.services.shim.Shim/Start", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -266,7 +266,7 @@ func (c *shimClient) Start(ctx context.Context, in *StartRequest, opts ...grpc.C func (c *shimClient) Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error) { out := new(DeleteResponse) - err := grpc.Invoke(ctx, "/containerd.v1.services.Shim/Delete", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/containerd.v1.services.shim.Shim/Delete", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -275,7 +275,7 @@ func (c *shimClient) Delete(ctx context.Context, in *DeleteRequest, opts ...grpc func (c *shimClient) Exec(ctx context.Context, in *ExecRequest, opts ...grpc.CallOption) (*ExecResponse, error) { out := new(ExecResponse) - err := grpc.Invoke(ctx, "/containerd.v1.services.Shim/Exec", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/containerd.v1.services.shim.Shim/Exec", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -284,7 +284,7 @@ func (c *shimClient) Exec(ctx context.Context, in *ExecRequest, opts ...grpc.Cal func (c *shimClient) Pty(ctx context.Context, in *PtyRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) { out := new(google_protobuf.Empty) - err := grpc.Invoke(ctx, "/containerd.v1.services.Shim/Pty", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/containerd.v1.services.shim.Shim/Pty", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -292,7 +292,7 @@ func (c *shimClient) Pty(ctx context.Context, in *PtyRequest, opts ...grpc.CallO } func (c *shimClient) Events(ctx context.Context, in *EventsRequest, opts ...grpc.CallOption) (Shim_EventsClient, error) { - stream, err := grpc.NewClientStream(ctx, &_Shim_serviceDesc.Streams[0], c.cc, "/containerd.v1.services.Shim/Events", opts...) + stream, err := grpc.NewClientStream(ctx, &_Shim_serviceDesc.Streams[0], c.cc, "/containerd.v1.services.shim.Shim/Events", opts...) if err != nil { return nil, err } @@ -325,7 +325,7 @@ func (x *shimEventsClient) Recv() (*containerd_v1_types1.Event, error) { func (c *shimClient) State(ctx context.Context, in *StateRequest, opts ...grpc.CallOption) (*StateResponse, error) { out := new(StateResponse) - err := grpc.Invoke(ctx, "/containerd.v1.services.Shim/State", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/containerd.v1.services.shim.Shim/State", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -334,7 +334,7 @@ func (c *shimClient) State(ctx context.Context, in *StateRequest, opts ...grpc.C func (c *shimClient) Pause(ctx context.Context, in *PauseRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) { out := new(google_protobuf.Empty) - err := grpc.Invoke(ctx, "/containerd.v1.services.Shim/Pause", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/containerd.v1.services.shim.Shim/Pause", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -343,7 +343,7 @@ func (c *shimClient) Pause(ctx context.Context, in *PauseRequest, opts ...grpc.C func (c *shimClient) Resume(ctx context.Context, in *ResumeRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) { out := new(google_protobuf.Empty) - err := grpc.Invoke(ctx, "/containerd.v1.services.Shim/Resume", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/containerd.v1.services.shim.Shim/Resume", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -352,7 +352,7 @@ func (c *shimClient) Resume(ctx context.Context, in *ResumeRequest, opts ...grpc func (c *shimClient) Exit(ctx context.Context, in *ExitRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) { out := new(google_protobuf.Empty) - err := grpc.Invoke(ctx, "/containerd.v1.services.Shim/Exit", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/containerd.v1.services.shim.Shim/Exit", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -388,7 +388,7 @@ func _Shim_Create_Handler(srv interface{}, ctx context.Context, dec func(interfa } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.services.Shim/Create", + FullMethod: "/containerd.v1.services.shim.Shim/Create", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShimServer).Create(ctx, req.(*CreateRequest)) @@ -406,7 +406,7 @@ func _Shim_Start_Handler(srv interface{}, ctx context.Context, dec func(interfac } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.services.Shim/Start", + FullMethod: "/containerd.v1.services.shim.Shim/Start", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShimServer).Start(ctx, req.(*StartRequest)) @@ -424,7 +424,7 @@ func _Shim_Delete_Handler(srv interface{}, ctx context.Context, dec func(interfa } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.services.Shim/Delete", + FullMethod: "/containerd.v1.services.shim.Shim/Delete", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShimServer).Delete(ctx, req.(*DeleteRequest)) @@ -442,7 +442,7 @@ func _Shim_Exec_Handler(srv interface{}, ctx context.Context, dec func(interface } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.services.Shim/Exec", + FullMethod: "/containerd.v1.services.shim.Shim/Exec", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShimServer).Exec(ctx, req.(*ExecRequest)) @@ -460,7 +460,7 @@ func _Shim_Pty_Handler(srv interface{}, ctx context.Context, dec func(interface{ } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.services.Shim/Pty", + FullMethod: "/containerd.v1.services.shim.Shim/Pty", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShimServer).Pty(ctx, req.(*PtyRequest)) @@ -499,7 +499,7 @@ func _Shim_State_Handler(srv interface{}, ctx context.Context, dec func(interfac } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.services.Shim/State", + FullMethod: "/containerd.v1.services.shim.Shim/State", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShimServer).State(ctx, req.(*StateRequest)) @@ -517,7 +517,7 @@ func _Shim_Pause_Handler(srv interface{}, ctx context.Context, dec func(interfac } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.services.Shim/Pause", + FullMethod: "/containerd.v1.services.shim.Shim/Pause", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShimServer).Pause(ctx, req.(*PauseRequest)) @@ -535,7 +535,7 @@ func _Shim_Resume_Handler(srv interface{}, ctx context.Context, dec func(interfa } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.services.Shim/Resume", + FullMethod: "/containerd.v1.services.shim.Shim/Resume", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShimServer).Resume(ctx, req.(*ResumeRequest)) @@ -553,7 +553,7 @@ func _Shim_Exit_Handler(srv interface{}, ctx context.Context, dec func(interface } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/containerd.v1.services.Shim/Exit", + FullMethod: "/containerd.v1.services.shim.Shim/Exit", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShimServer).Exit(ctx, req.(*ExitRequest)) @@ -562,7 +562,7 @@ func _Shim_Exit_Handler(srv interface{}, ctx context.Context, dec func(interface } var _Shim_serviceDesc = grpc.ServiceDesc{ - ServiceName: "containerd.v1.services.Shim", + ServiceName: "containerd.v1.services.shim.Shim", HandlerType: (*ShimServer)(nil), Methods: []grpc.MethodDesc{ { @@ -3382,63 +3382,63 @@ func init() { } var fileDescriptorShim = []byte{ - // 918 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x55, 0xc1, 0x6f, 0xe3, 0xc4, - 0x17, 0x5e, 0x27, 0xa9, 0x9b, 0xbc, 0xc4, 0xed, 0xfe, 0x46, 0xab, 0x6a, 0x36, 0x3f, 0x94, 0x0d, - 0xde, 0x5d, 0x54, 0x90, 0x70, 0xd8, 0x72, 0x59, 0x38, 0xc1, 0x6e, 0x2b, 0x84, 0xb4, 0x8b, 0x82, - 0x0b, 0xe2, 0x18, 0x39, 0xf1, 0x6b, 0x32, 0xc2, 0xf6, 0x98, 0x99, 0x71, 0xda, 0xde, 0x38, 0x23, - 0x21, 0xfe, 0x15, 0xfe, 0x8c, 0x3d, 0x72, 0xe4, 0x84, 0xd8, 0xfc, 0x25, 0x68, 0x66, 0xec, 0xa4, - 0x81, 0xb8, 0x85, 0x4b, 0xf4, 0xde, 0x97, 0x6f, 0x66, 0xde, 0x7c, 0xef, 0x9b, 0x67, 0xf8, 0x64, - 0xce, 0xd4, 0xa2, 0x98, 0x06, 0x33, 0x9e, 0x8e, 0x62, 0x3e, 0xfb, 0x1e, 0xc5, 0x68, 0xc6, 0x33, - 0x15, 0xb1, 0x0c, 0x45, 0x3c, 0x8a, 0x72, 0x36, 0x92, 0x28, 0x96, 0x6c, 0x86, 0x72, 0x24, 0x17, - 0x2c, 0x35, 0x3f, 0x41, 0x2e, 0xb8, 0xe2, 0xe4, 0x68, 0x43, 0x0c, 0x96, 0xcf, 0x82, 0x8a, 0xd7, - 0xff, 0xff, 0x9c, 0xf3, 0x79, 0x82, 0x23, 0xc3, 0x9a, 0x16, 0x17, 0x23, 0x4c, 0x73, 0x75, 0x6d, - 0x17, 0xf5, 0x1f, 0xcc, 0xf9, 0x9c, 0x9b, 0x70, 0xa4, 0xa3, 0x12, 0x7d, 0x7e, 0x67, 0x15, 0xea, - 0x3a, 0x47, 0x39, 0x4a, 0x79, 0x91, 0x29, 0xfb, 0x5b, 0xae, 0xfc, 0xec, 0x5f, 0xae, 0x5c, 0x83, - 0x9b, 0xc8, 0xee, 0xe0, 0xff, 0xd4, 0x00, 0xef, 0xa5, 0xc0, 0x48, 0x61, 0x88, 0x3f, 0x14, 0x28, - 0x15, 0x39, 0x82, 0x06, 0x8b, 0xa9, 0x33, 0x74, 0x8e, 0x3b, 0x2f, 0xdc, 0xd5, 0x1f, 0x8f, 0x1a, - 0x5f, 0x9e, 0x86, 0x0d, 0x16, 0x93, 0x23, 0x70, 0xa7, 0x45, 0x16, 0x27, 0x48, 0x1b, 0xfa, 0xbf, - 0xb0, 0xcc, 0x08, 0x85, 0x7d, 0x51, 0x64, 0x8a, 0xa5, 0x48, 0x9b, 0xe6, 0x8f, 0x2a, 0x25, 0x0f, - 0xa1, 0x9d, 0xf1, 0x49, 0xce, 0x96, 0x5c, 0xd1, 0xd6, 0xd0, 0x39, 0x6e, 0x87, 0xfb, 0x19, 0x1f, - 0xeb, 0x94, 0xf4, 0xa1, 0xad, 0x50, 0xa4, 0x2c, 0x8b, 0x12, 0xba, 0x67, 0xfe, 0x5a, 0xe7, 0xe4, - 0x01, 0xec, 0x49, 0x15, 0xb3, 0x8c, 0xba, 0x66, 0x3b, 0x9b, 0xe8, 0xe3, 0xa5, 0x8a, 0x79, 0xa1, - 0xe8, 0xbe, 0x3d, 0xde, 0x66, 0x25, 0x8e, 0x42, 0xd0, 0xf6, 0x1a, 0x47, 0x21, 0xc8, 0x09, 0xb8, - 0x82, 0x73, 0x75, 0x21, 0x69, 0x67, 0xd8, 0x3c, 0xee, 0x9e, 0xf4, 0x83, 0xed, 0x86, 0x19, 0x61, - 0x82, 0xd7, 0x5a, 0xcc, 0xb0, 0x64, 0xfa, 0x3e, 0x1c, 0x54, 0x5a, 0xc8, 0x9c, 0x67, 0x12, 0xc9, - 0x7d, 0x68, 0xe6, 0xa5, 0x1a, 0x5e, 0xa8, 0x43, 0xff, 0x00, 0x7a, 0xe7, 0x2a, 0x12, 0xaa, 0x94, - 0xcb, 0x7f, 0x17, 0xbc, 0x53, 0x4c, 0x70, 0xa3, 0xdf, 0x3f, 0x97, 0x3c, 0x83, 0x83, 0x8a, 0x52, - 0x6e, 0xfb, 0x08, 0xba, 0x78, 0xc5, 0xd4, 0x44, 0xaa, 0x48, 0x15, 0xb2, 0xe4, 0x82, 0x86, 0xce, - 0x0d, 0xe2, 0xff, 0xda, 0x84, 0xee, 0xd9, 0x15, 0xce, 0xaa, 0x4d, 0x6f, 0xea, 0xe5, 0xd4, 0xe9, - 0xd5, 0xd8, 0xad, 0x57, 0xb3, 0x46, 0xaf, 0xd6, 0x96, 0x5e, 0x8f, 0xc1, 0x93, 0x98, 0xb0, 0xac, - 0xb8, 0x9a, 0x24, 0xd1, 0x14, 0x6d, 0x5b, 0x3a, 0x61, 0xaf, 0x04, 0x5f, 0x69, 0x8c, 0x7c, 0x08, - 0xad, 0x42, 0xa2, 0x30, 0x9d, 0xe9, 0x9e, 0x3c, 0xdc, 0x29, 0xe9, 0xb7, 0x12, 0x45, 0x68, 0x68, - 0x84, 0x40, 0x2b, 0x12, 0x73, 0x49, 0xf7, 0x87, 0xcd, 0xe3, 0x4e, 0x68, 0x62, 0x2d, 0x0f, 0x66, - 0x4b, 0xda, 0x36, 0x90, 0x0e, 0x35, 0x32, 0xbb, 0x8c, 0x69, 0xc7, 0x9c, 0xa7, 0x43, 0xe2, 0x43, - 0x6f, 0x16, 0xe5, 0xd1, 0x94, 0x25, 0x4c, 0x31, 0x94, 0x14, 0x0c, 0x79, 0x0b, 0x23, 0xcf, 0x61, - 0x5f, 0x24, 0x2c, 0x65, 0x4a, 0xd2, 0xae, 0x69, 0xf0, 0x20, 0xd8, 0xfd, 0x22, 0x83, 0xd0, 0xd0, - 0xc2, 0x8a, 0x4e, 0x3e, 0x80, 0xff, 0x65, 0x7c, 0x92, 0xe1, 0xe5, 0x24, 0x17, 0x6c, 0xc9, 0x12, - 0x9c, 0xa3, 0xa4, 0x3d, 0x23, 0xea, 0x61, 0xc6, 0xbf, 0xc2, 0xcb, 0xf1, 0x1a, 0x26, 0xef, 0xc3, - 0xfd, 0x28, 0xcf, 0x23, 0x91, 0x72, 0x31, 0xc9, 0x05, 0xbf, 0x60, 0x09, 0x52, 0xcf, 0x14, 0x7a, - 0x58, 0xe1, 0x63, 0x0b, 0xfb, 0xa7, 0xe0, 0xda, 0x93, 0xf4, 0xb5, 0xb5, 0x14, 0xf6, 0x0d, 0x85, - 0x26, 0xd6, 0xd8, 0x22, 0x12, 0xb1, 0xe9, 0x51, 0x2b, 0x34, 0xb1, 0xc6, 0x24, 0xbf, 0xb0, 0x0d, - 0x6a, 0x85, 0x26, 0xf6, 0x87, 0xd0, 0xb3, 0x7d, 0xaf, 0x35, 0xe0, 0x2b, 0x80, 0xb1, 0xba, 0xae, - 0x75, 0x9b, 0xb6, 0xc3, 0x25, 0x8b, 0xd5, 0xc2, 0x1c, 0xe5, 0x85, 0x36, 0xd1, 0x6d, 0x5f, 0x20, - 0x9b, 0x2f, 0xec, 0x69, 0x5e, 0x58, 0x66, 0xfe, 0x21, 0x78, 0x67, 0x4b, 0xcc, 0x94, 0xac, 0xfc, - 0x6c, 0xfd, 0xbd, 0xb6, 0xb3, 0xff, 0xb3, 0x03, 0x5e, 0x09, 0x94, 0x25, 0xfd, 0xd7, 0x01, 0x51, - 0x96, 0xd8, 0xdc, 0x94, 0xf8, 0x29, 0x74, 0x72, 0xc1, 0x67, 0x28, 0x25, 0x4a, 0xda, 0x32, 0xdd, - 0x7b, 0x67, 0xa7, 0x97, 0xc6, 0x96, 0x15, 0x6e, 0xe8, 0xba, 0xbe, 0x71, 0x54, 0xc8, 0x75, 0x7d, - 0x87, 0xe0, 0x85, 0x28, 0x8b, 0x74, 0x0d, 0x78, 0xfa, 0xe5, 0xb0, 0xea, 0x7d, 0x9e, 0xfc, 0xe2, - 0x42, 0xeb, 0x7c, 0xc1, 0x52, 0xf2, 0x1d, 0xb8, 0xf6, 0x71, 0x93, 0xa7, 0x75, 0x4e, 0xd9, 0x1a, - 0x84, 0xfd, 0xf7, 0xee, 0xa2, 0x95, 0x7a, 0x9c, 0xc1, 0x9e, 0x99, 0x08, 0xe4, 0x49, 0xdd, 0x82, - 0x9b, 0x03, 0xa3, 0x7f, 0x14, 0xd8, 0x2f, 0x44, 0x50, 0x7d, 0x21, 0x82, 0x33, 0xfd, 0x85, 0xd0, - 0xf5, 0xd9, 0x29, 0x51, 0x5f, 0xdf, 0xd6, 0xa0, 0xa9, 0xaf, 0xef, 0x6f, 0xc3, 0xe6, 0x6b, 0x68, - 0x69, 0x4b, 0x91, 0xc7, 0x75, 0xfc, 0x1b, 0x83, 0xa6, 0xff, 0xe4, 0x76, 0x52, 0xb9, 0xe5, 0xe7, - 0xd0, 0x1c, 0xab, 0x6b, 0xe2, 0xd7, 0x91, 0x37, 0x06, 0xad, 0xbd, 0xee, 0x6b, 0x70, 0xad, 0xf1, - 0xea, 0xaf, 0xbb, 0x65, 0xcc, 0xfe, 0xee, 0x01, 0x6e, 0x38, 0x1f, 0x39, 0xe4, 0x1b, 0xd3, 0x04, - 0x85, 0xb7, 0x36, 0x61, 0xa3, 0xdd, 0xd3, 0x3b, 0x58, 0x9b, 0xd6, 0x1a, 0xb3, 0xd5, 0xef, 0x7a, - 0xd3, 0x8b, 0xb5, 0x77, 0xfd, 0x02, 0x5c, 0xeb, 0xd1, 0xfa, 0xbb, 0x6e, 0x79, 0xb8, 0x76, 0xa3, - 0x97, 0xba, 0x95, 0x4c, 0xdd, 0xd6, 0x4a, 0x76, 0x97, 0xd1, 0x5e, 0xd0, 0x37, 0x6f, 0x07, 0xf7, - 0x7e, 0x7f, 0x3b, 0xb8, 0xf7, 0xe3, 0x6a, 0xe0, 0xbc, 0x59, 0x0d, 0x9c, 0xdf, 0x56, 0x03, 0xe7, - 0xcf, 0xd5, 0xc0, 0x99, 0xba, 0x86, 0xf9, 0xf1, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xb2, 0x82, - 0x40, 0x80, 0x17, 0x09, 0x00, 0x00, + // 922 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0x41, 0x6f, 0xe3, 0x44, + 0x14, 0x5e, 0x27, 0xa9, 0xdb, 0xbc, 0xc6, 0xed, 0x32, 0x5a, 0x55, 0xde, 0x2c, 0xca, 0x06, 0xef, + 0x81, 0xb4, 0x08, 0x87, 0x2d, 0x17, 0x40, 0x42, 0x42, 0x4b, 0x8b, 0x00, 0x15, 0x14, 0x4d, 0xc5, + 0x09, 0x89, 0xc8, 0x89, 0x5f, 0x93, 0x11, 0xb6, 0xc7, 0xcc, 0x8c, 0xd3, 0xf6, 0xc6, 0x19, 0x89, + 0x9f, 0xc3, 0x7f, 0xd8, 0x23, 0x17, 0x24, 0x4e, 0x88, 0xcd, 0x2f, 0x41, 0x33, 0x63, 0x27, 0x0d, + 0x34, 0x49, 0xb9, 0x58, 0x6f, 0x3e, 0x7f, 0x6f, 0xe6, 0xf9, 0x7b, 0xdf, 0x3c, 0xc3, 0xc7, 0x13, + 0xa6, 0xa6, 0xc5, 0x28, 0x1c, 0xf3, 0xb4, 0x1f, 0xf3, 0xf1, 0x8f, 0x28, 0xfa, 0x63, 0x9e, 0xa9, + 0x88, 0x65, 0x28, 0xe2, 0x7e, 0x94, 0xb3, 0xbe, 0x44, 0x31, 0x63, 0x63, 0x94, 0x7d, 0x39, 0x65, + 0xa9, 0x79, 0x84, 0xb9, 0xe0, 0x8a, 0x93, 0x67, 0x4b, 0x62, 0x38, 0x7b, 0x19, 0x56, 0xbc, 0x50, + 0x53, 0xda, 0xcf, 0x26, 0x9c, 0x4f, 0x12, 0xec, 0x1b, 0xea, 0xa8, 0xb8, 0xea, 0x63, 0x9a, 0xab, + 0x5b, 0x9b, 0xd9, 0x7e, 0x32, 0xe1, 0x13, 0x6e, 0xc2, 0xbe, 0x8e, 0x4a, 0xf4, 0xa3, 0xad, 0xa5, + 0xa8, 0xdb, 0x1c, 0x65, 0x3f, 0xe5, 0x45, 0xa6, 0xec, 0xb3, 0xcc, 0xfc, 0xec, 0x81, 0x99, 0x0b, + 0x70, 0x19, 0xd9, 0x1d, 0x82, 0x5f, 0x6a, 0xe0, 0x7d, 0x2e, 0x30, 0x52, 0x48, 0xf1, 0xa7, 0x02, + 0xa5, 0x22, 0x47, 0x50, 0x63, 0xb1, 0xef, 0x74, 0x9d, 0x5e, 0xf3, 0x95, 0x3b, 0xff, 0xeb, 0x79, + 0xed, 0xab, 0x33, 0x5a, 0x63, 0x31, 0x39, 0x02, 0x77, 0x54, 0x64, 0x71, 0x82, 0x7e, 0x4d, 0xbf, + 0xa3, 0xe5, 0x8a, 0xf8, 0xb0, 0x2b, 0x8a, 0x4c, 0xb1, 0x14, 0xfd, 0xba, 0x79, 0x51, 0x2d, 0xc9, + 0x53, 0xd8, 0xcb, 0xf8, 0x30, 0x67, 0x33, 0xae, 0xfc, 0x46, 0xd7, 0xe9, 0xed, 0xd1, 0xdd, 0x8c, + 0x0f, 0xf4, 0x92, 0xb4, 0x61, 0x4f, 0xa1, 0x48, 0x59, 0x16, 0x25, 0xfe, 0x8e, 0x79, 0xb5, 0x58, + 0x93, 0x27, 0xb0, 0x23, 0x55, 0xcc, 0x32, 0xdf, 0x35, 0xdb, 0xd9, 0x85, 0x3e, 0x5e, 0xaa, 0x98, + 0x17, 0xca, 0xdf, 0xb5, 0xc7, 0xdb, 0x55, 0x89, 0xa3, 0x10, 0xfe, 0xde, 0x02, 0x47, 0x21, 0xc8, + 0x29, 0xb8, 0x82, 0x73, 0x75, 0x25, 0xfd, 0x66, 0xb7, 0xde, 0xdb, 0x3f, 0x6d, 0x87, 0xab, 0x5d, + 0x33, 0xc2, 0x84, 0xdf, 0x68, 0x31, 0x69, 0xc9, 0x0c, 0x02, 0x38, 0xa8, 0xb4, 0x90, 0x39, 0xcf, + 0x24, 0x92, 0xc7, 0x50, 0xcf, 0x4b, 0x35, 0x3c, 0xaa, 0xc3, 0xe0, 0x00, 0x5a, 0x97, 0x2a, 0x12, + 0xaa, 0x94, 0x2b, 0x78, 0x07, 0xbc, 0x33, 0x4c, 0x70, 0xa9, 0xdf, 0x7f, 0x53, 0x5e, 0xc2, 0x41, + 0x45, 0x29, 0xb7, 0x7d, 0x0e, 0xfb, 0x78, 0xc3, 0xd4, 0x50, 0xaa, 0x48, 0x15, 0xb2, 0xe4, 0x82, + 0x86, 0x2e, 0x0d, 0x12, 0xfc, 0x56, 0x87, 0xfd, 0xf3, 0x1b, 0x1c, 0x57, 0x9b, 0xde, 0xd5, 0xcb, + 0x59, 0xa7, 0x57, 0xed, 0x7e, 0xbd, 0xea, 0x6b, 0xf4, 0x6a, 0xac, 0xe8, 0xf5, 0x02, 0x3c, 0x89, + 0x09, 0xcb, 0x8a, 0x9b, 0x61, 0x12, 0x8d, 0xd0, 0xb6, 0xa5, 0x49, 0x5b, 0x25, 0x78, 0xa1, 0x31, + 0xf2, 0x3e, 0x34, 0x0a, 0x89, 0xc2, 0x74, 0x66, 0xff, 0xf4, 0xe9, 0xbd, 0x92, 0x7e, 0x27, 0x51, + 0x50, 0x43, 0x23, 0x04, 0x1a, 0x91, 0x98, 0x48, 0x7f, 0xb7, 0x5b, 0xef, 0x35, 0xa9, 0x89, 0xb5, + 0x3c, 0x98, 0xcd, 0xfc, 0x3d, 0x03, 0xe9, 0x50, 0x23, 0xe3, 0xeb, 0xd8, 0x6f, 0x9a, 0xf3, 0x74, + 0x48, 0x02, 0x68, 0x8d, 0xa3, 0x3c, 0x1a, 0xb1, 0x84, 0x29, 0x86, 0xd2, 0x07, 0x43, 0x5e, 0xc1, + 0xc8, 0xa7, 0xb0, 0x2b, 0x12, 0x96, 0x32, 0x25, 0xfd, 0x7d, 0xd3, 0xe0, 0x17, 0xe1, 0x86, 0x6b, + 0x19, 0x52, 0xc3, 0xa5, 0x55, 0x0e, 0x39, 0x81, 0xb7, 0x32, 0x3e, 0xcc, 0xf0, 0x7a, 0x98, 0x0b, + 0x36, 0x63, 0x09, 0x4e, 0x50, 0xfa, 0x2d, 0xa3, 0xec, 0x61, 0xc6, 0xbf, 0xc5, 0xeb, 0xc1, 0x02, + 0x26, 0xc7, 0xf0, 0x38, 0xca, 0xf3, 0x48, 0xa4, 0x5c, 0x0c, 0x73, 0xc1, 0xaf, 0x58, 0x82, 0xbe, + 0x67, 0xaa, 0x3d, 0xac, 0xf0, 0x81, 0x85, 0x83, 0x33, 0x70, 0xed, 0x49, 0xfa, 0xdb, 0xb5, 0x1e, + 0xf6, 0x22, 0x51, 0x13, 0x6b, 0x6c, 0x1a, 0x89, 0xd8, 0x34, 0xaa, 0x41, 0x4d, 0xac, 0x31, 0xc9, + 0xaf, 0x6c, 0x97, 0x1a, 0xd4, 0xc4, 0x41, 0x17, 0x5a, 0xb6, 0xf9, 0x6b, 0x5d, 0x78, 0x01, 0x30, + 0x50, 0xb7, 0x6b, 0x2d, 0xa7, 0x3d, 0x71, 0xcd, 0x62, 0x35, 0x35, 0x47, 0x79, 0xd4, 0x2e, 0x74, + 0xef, 0xa7, 0xc8, 0x26, 0x53, 0x7b, 0x9a, 0x47, 0xcb, 0x55, 0x70, 0x08, 0xde, 0xf9, 0x0c, 0x33, + 0x25, 0x2b, 0x53, 0x5b, 0x93, 0x2f, 0x3c, 0x1d, 0xfc, 0xea, 0x80, 0x57, 0x02, 0x65, 0x49, 0xff, + 0x77, 0x4a, 0x94, 0x25, 0xd6, 0x97, 0x25, 0x7e, 0x02, 0xcd, 0x5c, 0xf0, 0x31, 0x4a, 0x89, 0xd2, + 0x6f, 0x98, 0x16, 0xbe, 0x7d, 0xaf, 0xa1, 0x06, 0x96, 0x45, 0x97, 0x74, 0x5d, 0xdf, 0x20, 0x2a, + 0xe4, 0xa2, 0xbe, 0x43, 0xf0, 0x28, 0xca, 0x22, 0x5d, 0x00, 0x9e, 0xbe, 0x3e, 0xac, 0xba, 0xa4, + 0xa7, 0x7f, 0xb8, 0xd0, 0xb8, 0x9c, 0xb2, 0x94, 0x44, 0xe0, 0xda, 0x1b, 0x4e, 0x4e, 0x36, 0xda, + 0x65, 0x65, 0x24, 0xb6, 0xdf, 0x7b, 0x10, 0xb7, 0x54, 0xe6, 0x6b, 0xd8, 0x31, 0x03, 0x82, 0x1c, + 0x6f, 0xcc, 0xba, 0x3b, 0x44, 0xda, 0x47, 0xa1, 0xfd, 0x6b, 0x84, 0xd5, 0x5f, 0x23, 0x3c, 0xd7, + 0x7f, 0x0d, 0x5d, 0xae, 0x9d, 0x1c, 0x5b, 0xca, 0x5d, 0x99, 0x40, 0x5b, 0xca, 0xfd, 0xd7, 0x28, + 0xfa, 0x1e, 0x1a, 0xda, 0x6b, 0xa4, 0xb7, 0x31, 0xe9, 0xce, 0x2c, 0x6a, 0x1f, 0x3f, 0x80, 0x59, + 0x6e, 0xfe, 0x05, 0xd4, 0x07, 0xea, 0x96, 0xbc, 0xbb, 0x31, 0x63, 0x69, 0xe4, 0xb5, 0x3a, 0x50, + 0x70, 0xad, 0x41, 0xb7, 0xe8, 0xb0, 0xe2, 0xe2, 0xf6, 0xfd, 0x23, 0xdf, 0x70, 0x3e, 0x70, 0xc8, + 0x0f, 0xa6, 0x4f, 0x0a, 0xb7, 0xf7, 0x69, 0xa9, 0xec, 0xc9, 0x43, 0xa8, 0x4b, 0x1f, 0x18, 0x8f, + 0x6e, 0xd9, 0xff, 0xae, 0x8f, 0xd7, 0x7e, 0xff, 0x05, 0xb8, 0xd6, 0xdf, 0x5b, 0xbe, 0x7f, 0xe5, + 0x12, 0xac, 0xdd, 0xed, 0x4b, 0xdd, 0x72, 0xa6, 0xb6, 0xb6, 0x9c, 0x6d, 0xf3, 0xe7, 0x2b, 0xff, + 0xf5, 0x9b, 0xce, 0xa3, 0x3f, 0xdf, 0x74, 0x1e, 0xfd, 0x3c, 0xef, 0x38, 0xaf, 0xe7, 0x1d, 0xe7, + 0xf7, 0x79, 0xc7, 0xf9, 0x7b, 0xde, 0x71, 0x46, 0xae, 0x61, 0x7e, 0xf8, 0x4f, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xec, 0x91, 0xac, 0xeb, 0x67, 0x09, 0x00, 0x00, } diff --git a/api/services/shim/shim.proto b/api/services/shim/shim.proto index 580dae2..6d2dde9 100644 --- a/api/services/shim/shim.proto +++ b/api/services/shim/shim.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package containerd.v1.services; +package containerd.v1.services.shim; import "google/protobuf/empty.proto"; import "gogoproto/gogo.proto"; diff --git a/api/types/container/container.pb.go b/api/types/container/container.pb.go index 7d063b4..652ad2e 100644 --- a/api/types/container/container.pb.go +++ b/api/types/container/container.pb.go @@ -1313,7 +1313,7 @@ func init() { var fileDescriptorContainer = []byte{ // 512 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x52, 0xc1, 0x6e, 0xd3, 0x40, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xc1, 0x6e, 0xd3, 0x40, 0x10, 0xcd, 0xda, 0x8e, 0x93, 0x4c, 0xd4, 0x60, 0x2d, 0x08, 0x99, 0x22, 0xb9, 0x56, 0x84, 0x84, 0x85, 0x84, 0x23, 0xd2, 0x0b, 0x12, 0x17, 0xd2, 0xd8, 0xaa, 0x72, 0x20, 0x09, 0x1b, 0x47, 0xea, 0x2d, 0x72, 0xb3, 0x2b, 0xb3, 0xd0, 0xda, 0x91, 0xbd, 0x09, 0xf4, 0xc6, 0xe7, 0xf5, 0xc8, 0x91, diff --git a/api/types/mount/mount.pb.go b/api/types/mount/mount.pb.go index c6bb9a6..bac88a7 100644 --- a/api/types/mount/mount.pb.go +++ b/api/types/mount/mount.pb.go @@ -473,7 +473,7 @@ func init() { var fileDescriptorMount = []byte{ // 204 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xb2, 0x48, 0xcf, 0x2c, 0xc9, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x48, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xc9, 0x4f, 0xce, 0x4e, 0x2d, 0xd2, 0x4f, 0xce, 0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d, 0x4a, 0xd1, 0x4f, 0x2c, 0xc8, 0xd4, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0xcf, 0xcd, 0x2f, 0xcd, 0x2b, 0x81, 0x90, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9,