api/services: update go packages and regenerate

Signed-off-by: Stephen J Day <stephen.day@docker.com>

api/services/containers/v1/containers.pb.go

@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-gogo.
-// source: github.com/containerd/containerd/api/services/containers/containers.proto
+// source: github.com/containerd/containerd/api/services/containers/v1/containers.proto
 // DO NOT EDIT!
 
 /*
 	Package containers is a generated protocol buffer package.
 
 	It is generated from these files:
-		github.com/containerd/containerd/api/services/containers/containers.proto
+		github.com/containerd/containerd/api/services/containers/v1/containers.proto
 
 	It has these top-level messages:
 		Container
@@ -410,7 +410,7 @@ var _Containers_serviceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "github.com/containerd/containerd/api/services/containers/containers.proto",
+	Metadata: "github.com/containerd/containerd/api/services/containers/v1/containers.proto",
 }
 
 func (m *Container) Marshal() (dAtA []byte, err error) {
@@ -2545,56 +2545,57 @@ var (
 )
 
 func init() {
-	proto.RegisterFile("github.com/containerd/containerd/api/services/containers/containers.proto", fileDescriptorContainers)
+	proto.RegisterFile("github.com/containerd/containerd/api/services/containers/v1/containers.proto", fileDescriptorContainers)
 }
 
 var fileDescriptorContainers = []byte{
-	// 745 bytes of a gzipped FileDescriptorProto
+	// 758 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcd, 0x6e, 0xda, 0x4a,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcd, 0x72, 0xda, 0x48,
-	0x14, 0x8e, 0x81, 0x98, 0x70, 0xb8, 0x8b, 0xab, 0xb9, 0x5c, 0xae, 0xaf, 0x2b, 0x01, 0x65, 0xc5,
+	0x10, 0xb6, 0x00, 0x0b, 0xd3, 0xec, 0x61, 0x6b, 0x96, 0x65, 0xb5, 0xda, 0x2a, 0x60, 0x39, 0x71,
-	0xa2, 0x35, 0x2d, 0xad, 0xda, 0x24, 0x5d, 0x41, 0xfe, 0x14, 0x29, 0x6d, 0xa3, 0x69, 0xbb, 0xca,
+	0xd8, 0x95, 0x62, 0x92, 0x4a, 0xfc, 0x73, 0x02, 0xdb, 0xb8, 0x52, 0xe5, 0x24, 0xae, 0x49, 0x72,
-	0x22, 0x32, 0x30, 0x10, 0x17, 0xe3, 0x71, 0x3d, 0x03, 0x12, 0xea, 0xa2, 0x7d, 0x84, 0xbe, 0x45,
+	0x89, 0x0f, 0x8e, 0x80, 0x01, 0x2b, 0x08, 0x8d, 0xa2, 0x19, 0xa8, 0xa2, 0x72, 0x48, 0x1e, 0x21,
-	0xde, 0xa0, 0xcf, 0x90, 0x65, 0x97, 0x5d, 0xa5, 0x09, 0x4f, 0x52, 0x79, 0x3c, 0x8e, 0x29, 0x38,
+	0x6f, 0xe1, 0x37, 0xc8, 0x33, 0xf8, 0x98, 0x63, 0x4e, 0x8e, 0xcd, 0x93, 0xa4, 0x34, 0x1a, 0x59,
-	0xaa, 0x41, 0xcd, 0xee, 0x4c, 0xe6, 0x7c, 0xdf, 0xf9, 0xe6, 0x3b, 0xe7, 0x38, 0xc0, 0x61, 0xdf,
+	0x04, 0x70, 0x05, 0x48, 0x7c, 0xeb, 0x76, 0xf7, 0xf7, 0x75, 0xcf, 0xd7, 0xdd, 0x58, 0x70, 0xd4,
-	0xe2, 0x67, 0xa3, 0xb6, 0xd1, 0xa1, 0xc3, 0x7a, 0x87, 0x3a, 0xdc, 0xb4, 0x1c, 0xe2, 0x75, 0x67,
+	0xb5, 0xf9, 0xd9, 0xa0, 0x69, 0xb4, 0x68, 0xdf, 0x6c, 0x51, 0x97, 0x5b, 0xb6, 0x4b, 0xfc, 0xf6,
-	0x43, 0xd3, 0xb5, 0xea, 0x8c, 0x78, 0x63, 0xab, 0x43, 0x58, 0xf4, 0xf7, 0xd9, 0xd0, 0x70, 0x3d,
+	0xa4, 0x69, 0x79, 0xb6, 0xc9, 0x88, 0x3f, 0xb4, 0x5b, 0x84, 0xc5, 0x7f, 0x67, 0xe6, 0x70, 0x73,
-	0xca, 0x29, 0xba, 0x1f, 0x81, 0x8c, 0x10, 0x60, 0xcc, 0x64, 0x8d, 0x1f, 0xeb, 0x85, 0x3e, 0xed,
+	0xc2, 0x33, 0x3c, 0x9f, 0x72, 0x8a, 0xfe, 0x8d, 0x71, 0x46, 0x84, 0x31, 0x26, 0xb2, 0x86, 0x9b,
-	0x53, 0x91, 0x5d, 0xf7, 0xa3, 0x00, 0xa8, 0xff, 0xdf, 0xa7, 0xb4, 0x6f, 0x93, 0xba, 0x38, 0xb5,
+	0x7a, 0xae, 0x4b, 0xbb, 0x54, 0x64, 0x9b, 0x81, 0x15, 0x02, 0xf5, 0xbf, 0xbb, 0x94, 0x76, 0x1d,
-	0x47, 0xbd, 0xba, 0xe9, 0x4c, 0xe4, 0xd5, 0xbd, 0xf9, 0x2b, 0x32, 0x74, 0x79, 0x78, 0x59, 0x99,
+	0x62, 0x0a, 0xaf, 0x39, 0xe8, 0x98, 0x96, 0x3b, 0x92, 0xa1, 0x7f, 0xa6, 0x43, 0xa4, 0xef, 0xf1,
-	0xbf, 0xec, 0x59, 0xc4, 0xee, 0x9e, 0x0e, 0x4d, 0x36, 0x90, 0x19, 0xe5, 0xf9, 0x0c, 0x6e, 0x0d,
+	0x28, 0x58, 0x9a, 0x0e, 0x76, 0x6c, 0xe2, 0xb4, 0x4f, 0xfb, 0x16, 0xeb, 0xc9, 0x8c, 0xe2, 0x74,
-	0x09, 0xe3, 0xe6, 0xd0, 0x95, 0x09, 0xfb, 0x89, 0x9e, 0xcf, 0x27, 0x2e, 0x61, 0xf5, 0x2e, 0x61,
+	0x06, 0xb7, 0xfb, 0x84, 0x71, 0xab, 0xef, 0xc9, 0x84, 0xc6, 0x42, 0x0a, 0xf0, 0x91, 0x47, 0x98,
-	0x1d, 0xcf, 0x72, 0x39, 0xf5, 0x66, 0xc2, 0x80, 0xa7, 0x7a, 0xbe, 0x0e, 0xb9, 0x9d, 0x10, 0x84,
+	0xd9, 0x26, 0xac, 0xe5, 0xdb, 0x1e, 0xa7, 0xfe, 0x84, 0x19, 0xf2, 0x94, 0xcf, 0xd7, 0x21, 0xb3,
-	0x8a, 0x90, 0xb2, 0xba, 0x9a, 0x52, 0x51, 0x6a, 0xb9, 0x96, 0x3a, 0xbd, 0x2c, 0xa7, 0x0e, 0x77,
+	0x17, 0x81, 0x50, 0x1e, 0x12, 0x76, 0x5b, 0x53, 0x4a, 0x4a, 0x25, 0x53, 0x57, 0xc7, 0x97, 0xc5,
-	0x71, 0xca, 0xea, 0xa2, 0x63, 0x50, 0x6d, 0xb3, 0x4d, 0x6c, 0xa6, 0xa5, 0x2a, 0xe9, 0x5a, 0xbe,
+	0xc4, 0xe3, 0x7d, 0x9c, 0xb0, 0xdb, 0xe8, 0x18, 0x54, 0xc7, 0x6a, 0x12, 0x87, 0x69, 0x89, 0x52,
-	0xb1, 0x69, 0xfc, 0xd6, 0x32, 0xe3, 0x86, 0xd5, 0x38, 0x12, 0xd0, 0x3d, 0x87, 0x7b, 0x13, 0x2c,
+	0xb2, 0x92, 0xad, 0x6e, 0x19, 0x3f, 0x94, 0xcc, 0xb8, 0x61, 0x35, 0x8e, 0x04, 0xf4, 0xc0, 0xe5,
-	0x79, 0x50, 0x01, 0xd6, 0xad, 0xa1, 0xd9, 0x27, 0x5a, 0xda, 0x2f, 0x86, 0x83, 0x03, 0x7a, 0x05,
+	0xfe, 0x08, 0x4b, 0x1e, 0x94, 0x83, 0x75, 0xbb, 0x6f, 0x75, 0x89, 0x96, 0x0c, 0x8a, 0xe1, 0xd0,
-	0x59, 0x6f, 0xe4, 0xf8, 0x6f, 0xd5, 0x32, 0x15, 0xa5, 0x96, 0x6f, 0x3c, 0x5d, 0xaa, 0x10, 0x0e,
+	0x41, 0x4f, 0x21, 0xed, 0x0f, 0xdc, 0xe0, 0xad, 0x5a, 0xaa, 0xa4, 0x54, 0xb2, 0xd5, 0x07, 0x4b,
-	0xb0, 0x38, 0x24, 0x41, 0x35, 0xc8, 0x30, 0x97, 0x74, 0xb4, 0x75, 0x41, 0x56, 0x30, 0x02, 0x57,
+	0x15, 0xc2, 0x21, 0x16, 0x47, 0x24, 0xa8, 0x02, 0x29, 0xe6, 0x91, 0x96, 0xb6, 0x2e, 0xc8, 0x72,
-	0x8d, 0xd0, 0x55, 0xa3, 0xe9, 0x4c, 0xb0, 0xc8, 0x40, 0x55, 0x50, 0x3d, 0x4a, 0x79, 0x8f, 0x69,
+	0x46, 0xa8, 0xaa, 0x11, 0xa9, 0x6a, 0xd4, 0xdc, 0x11, 0x16, 0x19, 0xa8, 0x0c, 0xaa, 0x4f, 0x29,
-	0xaa, 0x78, 0x3d, 0x4c, 0x2f, 0xcb, 0x2a, 0xa6, 0x94, 0xef, 0xbf, 0xc1, 0xf2, 0x06, 0xed, 0x00,
+	0xef, 0x30, 0x4d, 0x15, 0xaf, 0x87, 0xf1, 0x65, 0x51, 0xc5, 0x94, 0xf2, 0xc6, 0x73, 0x2c, 0x23,
-	0x74, 0x3c, 0x62, 0x72, 0xd2, 0x3d, 0x35, 0xb9, 0x96, 0x15, 0x9c, 0xfa, 0x02, 0xe7, 0xdb, 0xb0,
+	0x68, 0x0f, 0xa0, 0xe5, 0x13, 0x8b, 0x93, 0xf6, 0xa9, 0xc5, 0xb5, 0xb4, 0xe0, 0xd4, 0x67, 0x38,
-	0x53, 0xad, 0x8d, 0x8b, 0xcb, 0xf2, 0xda, 0x97, 0x1f, 0x65, 0x05, 0xe7, 0x24, 0xae, 0xc9, 0x7d,
+	0x5f, 0x44, 0x93, 0xaa, 0x6f, 0x5c, 0x5c, 0x16, 0xd7, 0x3e, 0x7e, 0x2d, 0x2a, 0x38, 0x23, 0x71,
-	0x92, 0x91, 0xdb, 0x0d, 0x49, 0x36, 0x96, 0x21, 0x91, 0xb8, 0x26, 0xd7, 0xb7, 0x20, 0x3f, 0x63,
+	0x35, 0x1e, 0x90, 0x0c, 0xbc, 0x76, 0x44, 0xb2, 0xb1, 0x0c, 0x89, 0xc4, 0xd5, 0xb8, 0xbe, 0x0d,
-	0x2a, 0xfa, 0x1b, 0xd2, 0x03, 0x32, 0x09, 0xfa, 0x86, 0xfd, 0xd0, 0xb7, 0x77, 0x6c, 0xda, 0x23,
+	0xd9, 0x09, 0x51, 0xd1, 0xef, 0x90, 0xec, 0x91, 0x51, 0x38, 0x37, 0x1c, 0x98, 0x81, 0xbc, 0x43,
-	0xa2, 0xa5, 0x02, 0x7b, 0xc5, 0x61, 0x3b, 0xb5, 0xa9, 0xe8, 0x5f, 0x15, 0xc8, 0x4a, 0x9f, 0x10,
+	0xcb, 0x19, 0x10, 0x2d, 0x11, 0xca, 0x2b, 0x9c, 0x9d, 0xc4, 0x96, 0xa2, 0x7f, 0x52, 0x20, 0x2d,
-	0x82, 0x8c, 0x63, 0x0e, 0x89, 0x04, 0x8a, 0x18, 0x9d, 0x40, 0x96, 0xba, 0xdc, 0xa2, 0x4e, 0xd8,
+	0x75, 0x42, 0x08, 0x52, 0xae, 0xd5, 0x27, 0x12, 0x28, 0x6c, 0x74, 0x02, 0x69, 0xea, 0x71, 0x9b,
-	0xeb, 0xe6, 0x2a, 0x2d, 0x30, 0x5e, 0x07, 0x1c, 0x41, 0xd3, 0x43, 0x46, 0x7d, 0x1b, 0xfe, 0x9a,
+	0xba, 0xd1, 0xac, 0x6b, 0xab, 0x8c, 0xc0, 0x78, 0x16, 0x72, 0x84, 0x43, 0x8f, 0x18, 0xf5, 0x1d,
-	0xbd, 0x58, 0x46, 0x78, 0xf5, 0x21, 0xfc, 0x73, 0x40, 0xf8, 0x4d, 0x25, 0x4c, 0x3e, 0x8c, 0x08,
+	0xf8, 0x6d, 0x32, 0xb0, 0x4c, 0xe3, 0xe5, 0xff, 0xe1, 0x8f, 0x43, 0xc2, 0x6f, 0x2a, 0x61, 0xf2,
-	0xe3, 0xb7, 0x8d, 0x6c, 0xf5, 0x0c, 0x0a, 0xbf, 0xa6, 0x33, 0x97, 0x3a, 0x8c, 0xa0, 0x63, 0xc8,
+	0x76, 0x40, 0x18, 0xbf, 0x6d, 0x65, 0xcb, 0x67, 0x90, 0xfb, 0x3e, 0x9d, 0x79, 0xd4, 0x65, 0x04,
-	0xdd, 0x68, 0x17, 0xb0, 0x7c, 0xe3, 0xc1, 0x32, 0x2f, 0x6c, 0x65, 0xfc, 0x86, 0xe0, 0x88, 0xa4,
+	0x1d, 0x43, 0xe6, 0xa6, 0x77, 0x01, 0xcb, 0x56, 0xff, 0x5b, 0xe6, 0x85, 0xf5, 0x54, 0x30, 0x10,
-	0x5a, 0x87, 0x7f, 0x8f, 0x2c, 0x16, 0x95, 0x62, 0x91, 0x34, 0xb5, 0x67, 0xd9, 0x5c, 0xd6, 0xc9,
+	0x1c, 0x93, 0x94, 0x4d, 0xf8, 0xf3, 0xc8, 0x66, 0x71, 0x29, 0x16, 0xb7, 0xa6, 0x76, 0x6c, 0x87,
-	0x61, 0x79, 0xaa, 0xda, 0x50, 0x9c, 0x07, 0x48, 0x71, 0x18, 0x20, 0x2a, 0xab, 0x29, 0xc2, 0xff,
+	0xcb, 0x3a, 0x19, 0x2c, 0xbd, 0xb2, 0x03, 0xf9, 0x69, 0x80, 0x6c, 0x0e, 0x03, 0xc4, 0x65, 0x35,
-	0x55, 0xd4, 0xcd, 0xb0, 0x54, 0xdf, 0x43, 0x71, 0x47, 0x4c, 0xdf, 0x82, 0x75, 0x7f, 0xde, 0x8a,
+	0x45, 0xe8, 0xbf, 0x4a, 0x77, 0x13, 0x2c, 0xe5, 0x37, 0x90, 0xdf, 0x13, 0xdb, 0x37, 0x23, 0xdd,
-	0x01, 0xfc, 0xb7, 0x50, 0xeb, 0xce, 0x7c, 0x3f, 0x57, 0xa0, 0xf8, 0x4e, 0xac, 0xc4, 0xdd, 0xbf,
+	0xaf, 0x97, 0xa2, 0x07, 0x7f, 0xcd, 0xd4, 0xba, 0x33, 0xdd, 0xcf, 0x15, 0xc8, 0xbf, 0x14, 0x27,
-	0x0c, 0xbd, 0x80, 0x7c, 0xb0, 0x7e, 0xe2, 0x2b, 0x2d, 0xa6, 0x33, 0x6e, 0x6f, 0xf7, 0xfd, 0x0f,
+	0x71, 0xf7, 0x2f, 0x43, 0xbb, 0x90, 0x0d, 0xcf, 0x4f, 0xfc, 0x4a, 0x8b, 0xed, 0x9c, 0x77, 0xb7,
-	0xf9, 0x4b, 0x93, 0x0d, 0xb0, 0xdc, 0x72, 0x3f, 0xf6, 0x6d, 0x59, 0x10, 0x7a, 0x67, 0xb6, 0x3c,
+	0x8d, 0xe0, 0x87, 0xfc, 0x89, 0xc5, 0x7a, 0x58, 0x5e, 0x79, 0x60, 0x07, 0xb2, 0xcc, 0x34, 0x7a,
-	0x82, 0xe2, 0x2e, 0xb1, 0x49, 0x8c, 0x2b, 0xb7, 0xac, 0x4a, 0xe3, 0x2a, 0x03, 0x10, 0x0d, 0x23,
+	0x67, 0xb2, 0xdc, 0x83, 0xfc, 0x3e, 0x71, 0xc8, 0x1c, 0x55, 0x6e, 0x39, 0x95, 0xea, 0x55, 0x0a,
-	0x1a, 0x43, 0xfa, 0x80, 0x70, 0xf4, 0x2c, 0x81, 0x8c, 0x98, 0x85, 0xd4, 0x9f, 0x2f, 0x8d, 0x93,
+	0x20, 0x5e, 0x46, 0x34, 0x84, 0xe4, 0x21, 0xe1, 0xe8, 0xe1, 0x02, 0x6d, 0xcc, 0x39, 0x48, 0xfd,
-	0x56, 0x7c, 0x84, 0x8c, 0xbf, 0x16, 0x28, 0xc9, 0x3f, 0x97, 0xd8, 0x85, 0xd3, 0xb7, 0x56, 0x40,
+	0xd1, 0xd2, 0x38, 0x29, 0xc5, 0x3b, 0x48, 0x05, 0x67, 0x81, 0x16, 0xf9, 0xe7, 0x32, 0xf7, 0xe0,
-	0xca, 0xe2, 0x9f, 0x40, 0x0d, 0x26, 0x17, 0x25, 0x21, 0x89, 0x5f, 0x28, 0x7d, 0x7b, 0x15, 0x68,
+	0xf4, 0xed, 0x15, 0x90, 0xb2, 0xf8, 0x7b, 0x50, 0xc3, 0xcd, 0x45, 0x8b, 0x90, 0xcc, 0x3f, 0x28,
-	0x24, 0x20, 0x98, 0x91, 0x44, 0x02, 0xe2, 0xe7, 0x3e, 0x91, 0x80, 0xdb, 0x26, 0xf1, 0x04, 0xd4,
+	0x7d, 0x67, 0x15, 0x68, 0xdc, 0x40, 0xb8, 0x23, 0x0b, 0x35, 0x30, 0x7f, 0xef, 0x17, 0x6a, 0xe0,
-	0x60, 0x6e, 0x12, 0x09, 0x88, 0x1f, 0x31, 0xbd, 0xb8, 0xb0, 0x11, 0x7b, 0xfe, 0xef, 0x9e, 0x96,
+	0xb6, 0x4d, 0x3c, 0x01, 0x35, 0xdc, 0x9b, 0x85, 0x1a, 0x98, 0xbf, 0x62, 0x7a, 0x7e, 0xe6, 0x22,
-	0x76, 0x71, 0x5d, 0x5a, 0xfb, 0x7e, 0x5d, 0x5a, 0xfb, 0x3c, 0x2d, 0x29, 0x17, 0xd3, 0x92, 0xf2,
+	0x0e, 0x82, 0xef, 0x9e, 0xfa, 0xeb, 0x8b, 0xeb, 0xc2, 0xda, 0x97, 0xeb, 0xc2, 0xda, 0x87, 0x71,
-	0x6d, 0x5a, 0x52, 0xae, 0xa6, 0x25, 0xa5, 0xad, 0x8a, 0xcc, 0x27, 0x3f, 0x03, 0x00, 0x00, 0xff,
+	0x41, 0xb9, 0x18, 0x17, 0x94, 0xcf, 0xe3, 0x82, 0x72, 0x35, 0x2e, 0x28, 0xaf, 0x1a, 0x3f, 0xf1,
-	0xff, 0xcd, 0xae, 0xd0, 0xb5, 0xd0, 0x09, 0x00, 0x00,
+	0x29, 0xb7, 0x1b, 0x7b, 0x4d, 0x55, 0x54, 0xbc, 0xff, 0x2d, 0x00, 0x00, 0xff, 0xff, 0x18, 0x2d,
+	0x7b, 0x47, 0x1b, 0x0a, 0x00, 0x00,
 }

api/services/containers/v1/containers.proto

@@ -9,6 +9,8 @@ import "google/protobuf/field_mask.proto";
 import "google/protobuf/timestamp.proto";
 import "github.com/containerd/containerd/api/types/descriptor/descriptor.proto";
 
+option go_package = "github.com/containerd/containerd/api/services/containers/v1;containers";
+
 // Containers provides metadata storage for containers used in the execution
 // service.
 //

api/services/content/v1/content.pb.go

@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-gogo.
-// source: github.com/containerd/containerd/api/services/content/content.proto
+// source: github.com/containerd/containerd/api/services/content/v1/content.proto
 // DO NOT EDIT!
 
 /*
 	Package content is a generated protocol buffer package.
 
 	It is generated from these files:
-		github.com/containerd/containerd/api/services/content/content.proto
+		github.com/containerd/containerd/api/services/content/v1/content.proto
 
 	It has these top-level messages:
 		Info
@@ -757,7 +757,7 @@ var _Content_serviceDesc = grpc.ServiceDesc{
 			ClientStreams: true,
 		},
 	},
-	Metadata: "github.com/containerd/containerd/api/services/content/content.proto",
+	Metadata: "github.com/containerd/containerd/api/services/content/v1/content.proto",
 }
 
 func (m *Info) Marshal() (dAtA []byte, err error) {
@@ -3282,64 +3282,65 @@ var (
 )
 
 func init() {
-	proto.RegisterFile("github.com/containerd/containerd/api/services/content/content.proto", fileDescriptorContent)
+	proto.RegisterFile("github.com/containerd/containerd/api/services/content/v1/content.proto", fileDescriptorContent)
 }
 
 var fileDescriptorContent = []byte{
-	// 866 bytes of a gzipped FileDescriptorProto
+	// 881 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4d, 0x6f, 0x2a, 0x55,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4f, 0x6f, 0xe3, 0x44,
-	0x18, 0xe6, 0xc0, 0x30, 0xb6, 0x2f, 0x78, 0xc5, 0x03, 0x36, 0x64, 0x8c, 0x03, 0x4e, 0x8c, 0x92,
+	0x14, 0xcf, 0x24, 0x8e, 0x69, 0x5f, 0xc2, 0x12, 0x26, 0xa1, 0x8a, 0x8c, 0x70, 0x82, 0x85, 0x20,
-	0x7b, 0xbd, 0x43, 0xa5, 0x77, 0x6d, 0x02, 0xb4, 0xd1, 0x1a, 0x5b, 0x93, 0x29, 0xda, 0xe8, 0xc6,
+	0xda, 0x65, 0x9d, 0x6e, 0xba, 0x37, 0x24, 0x44, 0x92, 0x5d, 0xa0, 0x88, 0x2e, 0x92, 0x37, 0xb0,
-	0x0c, 0x70, 0x18, 0x27, 0x81, 0x39, 0xd3, 0x99, 0x43, 0xa3, 0xae, 0xdc, 0x98, 0x98, 0xc6, 0x85,
+	0xa2, 0x17, 0xe4, 0x24, 0x13, 0x63, 0x29, 0xf1, 0x78, 0xed, 0x49, 0x04, 0x9c, 0xb8, 0x20, 0xa1,
-	0x7f, 0xa0, 0x1b, 0x75, 0xef, 0xde, 0x5f, 0xd0, 0xa5, 0x4b, 0xd3, 0x45, 0x6b, 0xf9, 0x21, 0xc6,
+	0x8a, 0x03, 0x5f, 0xa0, 0x17, 0xe0, 0xce, 0x9d, 0x4f, 0xd0, 0x23, 0x47, 0xb4, 0x87, 0x96, 0xe6,
-	0xcc, 0x99, 0x33, 0xc3, 0x50, 0x5a, 0x81, 0x96, 0xbb, 0xe2, 0x7c, 0xbc, 0xcf, 0xf3, 0x7e, 0x3d,
+	0x83, 0x20, 0xe4, 0xf1, 0xd8, 0x71, 0x9a, 0x96, 0xfc, 0x69, 0x38, 0xe5, 0x79, 0xfc, 0x7e, 0xbf,
-	0x73, 0x5e, 0xa0, 0x6d, 0xd9, 0xec, 0x9b, 0x71, 0x57, 0xef, 0xd1, 0x51, 0xbd, 0x47, 0x1d, 0x66,
+	0xf7, 0xef, 0x97, 0x79, 0x86, 0x0f, 0x2d, 0x9b, 0x7d, 0x3d, 0xee, 0xea, 0x3d, 0x3a, 0xaa, 0xf7,
-	0xda, 0x0e, 0xf1, 0xfa, 0xc9, 0xa5, 0xe9, 0xda, 0x75, 0x9f, 0x78, 0xa7, 0x76, 0x8f, 0xf8, 0xfc,
+	0xa8, 0xc3, 0x4c, 0xdb, 0x21, 0x5e, 0x3f, 0x69, 0x9a, 0xae, 0x5d, 0xf7, 0x89, 0x37, 0xb1, 0x7b,
-	0x9c, 0x38, 0x2c, 0xfa, 0xd5, 0x5d, 0x8f, 0x32, 0x8a, 0xd5, 0xa9, 0xb9, 0x1e, 0x99, 0xea, 0x91,
+	0xc4, 0xe7, 0xe7, 0xc4, 0x61, 0xf5, 0xc9, 0x83, 0xc8, 0xd4, 0x5d, 0x8f, 0x32, 0x8a, 0xd5, 0x19,
-	0xc9, 0xe9, 0x07, 0x4a, 0xc9, 0xa2, 0x16, 0xe5, 0xa6, 0xf5, 0x60, 0x15, 0xa2, 0x94, 0x8a, 0x45,
+	0x42, 0x8f, 0xbc, 0xf5, 0xc8, 0x65, 0xf2, 0x40, 0x29, 0x59, 0xd4, 0xa2, 0xdc, 0xb5, 0x1e, 0x58,
-	0xa9, 0x35, 0x24, 0x75, 0xbe, 0xeb, 0x8e, 0x07, 0x75, 0x66, 0x8f, 0x88, 0xcf, 0xcc, 0x91, 0x2b,
+	0x21, 0x4a, 0xa9, 0x58, 0x94, 0x5a, 0x43, 0x52, 0xe7, 0x4f, 0xdd, 0xf1, 0xa0, 0xce, 0xec, 0x11,
-	0x0c, 0xde, 0xbc, 0x6d, 0x40, 0x46, 0x2e, 0xfb, 0x2e, 0xbc, 0xd4, 0xfe, 0x40, 0x20, 0xed, 0x3b,
+	0xf1, 0x99, 0x39, 0x72, 0x85, 0xc3, 0xeb, 0x57, 0x1d, 0xc8, 0xc8, 0x65, 0xdf, 0x86, 0x2f, 0xb5,
-	0x03, 0x8a, 0x3f, 0x01, 0xb9, 0x6f, 0x5b, 0xc4, 0x67, 0x65, 0x54, 0x45, 0xb5, 0xcd, 0x56, 0xe3,
+	0xdf, 0x11, 0x48, 0x87, 0xce, 0x80, 0xe2, 0x4f, 0x40, 0xee, 0xdb, 0x16, 0xf1, 0x59, 0x19, 0x55,
-	0xe2, 0xaa, 0x92, 0xba, 0xbc, 0xaa, 0x3c, 0x4d, 0x64, 0x46, 0x5d, 0xe2, 0xc4, 0x31, 0xfa, 0x75,
+	0x51, 0x6d, 0xb7, 0xd5, 0x38, 0x3b, 0xaf, 0xa4, 0x5e, 0x9c, 0x57, 0xee, 0x26, 0x8a, 0xa3, 0x2e,
-	0x8b, 0x3e, 0x0f, 0x21, 0xfa, 0x2e, 0xff, 0x31, 0x04, 0x03, 0xc6, 0x20, 0xf9, 0xf6, 0xf7, 0xa4,
+	0x71, 0xe2, 0x1c, 0xfd, 0xba, 0x45, 0xef, 0x87, 0x10, 0xfd, 0x11, 0xff, 0x31, 0x04, 0x03, 0xc6,
-	0x9c, 0xae, 0xa2, 0x5a, 0xc6, 0xe0, 0x6b, 0xfc, 0x11, 0xe4, 0x7b, 0x74, 0x34, 0xb2, 0x19, 0x23,
+	0x20, 0xf9, 0xf6, 0x77, 0xa4, 0x9c, 0xae, 0xa2, 0x5a, 0xc6, 0xe0, 0x36, 0xfe, 0x08, 0xf2, 0x3d,
-	0xfd, 0xaf, 0x4d, 0x56, 0xce, 0x54, 0x51, 0x2d, 0xd7, 0x50, 0xf4, 0x30, 0x38, 0x3d, 0x0a, 0x4e,
+	0x3a, 0x1a, 0xd9, 0x8c, 0x91, 0xfe, 0x57, 0x26, 0x2b, 0x67, 0xaa, 0xa8, 0x96, 0x6b, 0x28, 0x7a,
-	0xef, 0x44, 0xd1, 0xb7, 0x36, 0x82, 0x08, 0x7e, 0xb9, 0xae, 0x20, 0x23, 0x17, 0x23, 0x9b, 0x4c,
+	0x98, 0x9c, 0x1e, 0x25, 0xa7, 0x77, 0xa2, 0xec, 0x5b, 0x3b, 0x41, 0x06, 0x3f, 0x5f, 0x54, 0x90,
-	0xfb, 0x12, 0x72, 0x41, 0xc0, 0x06, 0x39, 0x19, 0x07, 0xbe, 0xd6, 0x18, 0xb7, 0x76, 0x08, 0xf9,
+	0x91, 0x8b, 0x91, 0x4d, 0xa6, 0x7d, 0x09, 0xb9, 0x20, 0x61, 0x83, 0x3c, 0x1f, 0x07, 0xb1, 0xb6,
-	0x90, 0xda, 0x77, 0xa9, 0xe3, 0x13, 0xfc, 0x21, 0x48, 0xb6, 0x33, 0xa0, 0x9c, 0x39, 0xd7, 0x78,
+	0x98, 0xb7, 0xf6, 0x04, 0xf2, 0x21, 0xb5, 0xef, 0x52, 0xc7, 0x27, 0xf8, 0x7d, 0x90, 0x6c, 0x67,
-	0x47, 0xff, 0xff, 0xfe, 0xe8, 0x01, 0xb6, 0x25, 0x05, 0xfe, 0x0d, 0x8e, 0xd3, 0x4a, 0x80, 0x3f,
+	0x40, 0x39, 0x73, 0xae, 0xf1, 0x96, 0xfe, 0xdf, 0xf3, 0xd1, 0x03, 0x6c, 0x4b, 0x0a, 0xe2, 0x1b,
-	0xb5, 0x7d, 0xd6, 0x0e, 0x4d, 0x44, 0xc4, 0xda, 0xe7, 0x50, 0x9c, 0x39, 0x9d, 0x73, 0x96, 0x79,
+	0x1c, 0xa7, 0x95, 0x00, 0x7f, 0x6a, 0xfb, 0xac, 0x1d, 0xba, 0x88, 0x8c, 0xb5, 0xcf, 0xa1, 0x38,
-	0x90, 0xb3, 0x2e, 0x94, 0x76, 0xc9, 0x90, 0x30, 0x32, 0xeb, 0x6e, 0xad, 0x05, 0xfa, 0x19, 0x01,
+	0x77, 0xba, 0x10, 0x2c, 0xb3, 0x51, 0xb0, 0x2e, 0x94, 0x1e, 0x91, 0x21, 0x61, 0x64, 0x3e, 0xdc,
-	0x36, 0x88, 0xd9, 0x7f, 0x79, 0x2e, 0xf0, 0x16, 0xc8, 0x74, 0x30, 0xf0, 0x09, 0x13, 0xea, 0x11,
+	0x56, 0x1b, 0xf4, 0x13, 0x02, 0x6c, 0x10, 0xb3, 0xff, 0xff, 0x85, 0xc0, 0x7b, 0x20, 0xd3, 0xc1,
-	0xbb, 0x58, 0x53, 0x99, 0xa9, 0xa6, 0xb4, 0x26, 0x14, 0x67, 0xa2, 0x11, 0x95, 0x9c, 0x52, 0xa0,
+	0xc0, 0x27, 0x4c, 0xa8, 0x47, 0x3c, 0xc5, 0x9a, 0xca, 0xcc, 0x34, 0xa5, 0x35, 0xa1, 0x38, 0x97,
-	0xdb, 0x14, 0x7d, 0x93, 0x99, 0x9c, 0x38, 0x6f, 0xf0, 0xb5, 0xf6, 0x6b, 0x1a, 0xe4, 0x23, 0x66,
+	0x8d, 0xe8, 0xe4, 0x8c, 0x02, 0x5d, 0xa5, 0xe8, 0x9b, 0xcc, 0xe4, 0xc4, 0x79, 0x83, 0xdb, 0xda,
-	0xb2, 0xb1, 0x8f, 0xdb, 0x00, 0x3e, 0x33, 0x3d, 0xa1, 0x4f, 0xb4, 0x82, 0x3e, 0x37, 0x05, 0xae,
+	0x2f, 0x69, 0x90, 0x9f, 0x32, 0x93, 0x8d, 0x7d, 0xdc, 0x06, 0xf0, 0x99, 0xe9, 0x09, 0x7d, 0xa2,
-	0xc9, 0x02, 0x92, 0xb1, 0xdb, 0x37, 0x05, 0x49, 0x7a, 0x15, 0x12, 0x81, 0x6b, 0x32, 0x5c, 0x80,
+	0x35, 0xf4, 0xb9, 0x2b, 0x70, 0x4d, 0x16, 0x90, 0x8c, 0xdd, 0xbe, 0x29, 0x48, 0xd2, 0xeb, 0x90,
-	0x8c, 0x47, 0x06, 0x3c, 0xd5, 0x4d, 0x23, 0x58, 0x26, 0x52, 0x92, 0x66, 0x52, 0x2a, 0x41, 0x96,
+	0x08, 0x5c, 0x93, 0xe1, 0x02, 0x64, 0x3c, 0x32, 0xe0, 0xa5, 0xee, 0x1a, 0x81, 0x99, 0x28, 0x49,
-	0x51, 0x66, 0x0e, 0xcb, 0x59, 0x7e, 0x1c, 0x6e, 0xf0, 0x21, 0x6c, 0x90, 0x6f, 0x5d, 0xd2, 0x63,
+	0x9a, 0x2b, 0xa9, 0x04, 0x59, 0x46, 0x99, 0x39, 0x2c, 0x67, 0xf9, 0x71, 0xf8, 0x80, 0x9f, 0xc0,
-	0xa4, 0x5f, 0x96, 0x1f, 0xdc, 0x91, 0x98, 0x43, 0x7b, 0x0f, 0x5e, 0x0d, 0x6b, 0x14, 0x35, 0x7c,
+	0x0e, 0xf9, 0xc6, 0x25, 0x3d, 0x46, 0xfa, 0x65, 0x79, 0xe3, 0x89, 0xc4, 0x1c, 0xda, 0x3b, 0xf0,
-	0x0b, 0xe4, 0x81, 0x3d, 0x64, 0xc4, 0x0b, 0x1b, 0x6e, 0x88, 0x9d, 0xf6, 0x15, 0x3c, 0x89, 0x0c,
+	0x72, 0xd8, 0xa3, 0x68, 0xe0, 0x7b, 0x20, 0x0f, 0xec, 0x21, 0x23, 0x5e, 0x38, 0x70, 0x43, 0x3c,
-	0x45, 0x2f, 0x3e, 0x86, 0x0d, 0x9f, 0x9f, 0x10, 0x5f, 0x28, 0xfb, 0xdd, 0x45, 0xca, 0x0e, 0x19,
+	0x69, 0xc7, 0x70, 0x27, 0x72, 0x14, 0xb3, 0xf8, 0x18, 0x76, 0x7c, 0x7e, 0x42, 0x7c, 0xa1, 0xec,
-	0x84, 0xb6, 0x63, 0xb4, 0xf6, 0x2f, 0x82, 0xe2, 0xb1, 0x67, 0xcf, 0xe9, 0xbb, 0x0d, 0xb2, 0xd9,
+	0xb7, 0x97, 0x29, 0x3b, 0x64, 0x10, 0xda, 0x8e, 0xd1, 0xda, 0x3f, 0x08, 0x8a, 0xcf, 0x3c, 0x7b,
-	0x63, 0x36, 0x75, 0x78, 0x2c, 0x4f, 0x1a, 0xcf, 0x16, 0xf1, 0x73, 0x92, 0x26, 0x87, 0x18, 0x02,
+	0x41, 0xdf, 0x6d, 0x90, 0xcd, 0x1e, 0xb3, 0xa9, 0xc3, 0x73, 0xb9, 0xd3, 0xb8, 0xb7, 0x8c, 0x9f,
-	0x1a, 0x55, 0x3c, 0x3d, 0xad, 0x78, 0x5c, 0xd9, 0xcc, 0x7d, 0x95, 0x95, 0x1e, 0x5f, 0xd9, 0x44,
+	0x93, 0x34, 0x39, 0xc4, 0x10, 0xd0, 0xa8, 0xe3, 0xe9, 0x59, 0xc7, 0xe3, 0xce, 0x66, 0x6e, 0xea,
-	0x5f, 0xb3, 0x77, 0x4a, 0x55, 0x4e, 0x48, 0xf5, 0x3a, 0x0d, 0xa5, 0xd9, 0x02, 0x88, 0x1a, 0xaf,
+	0xac, 0x74, 0xfb, 0xce, 0x26, 0xe6, 0x9a, 0xbd, 0x56, 0xaa, 0x72, 0x42, 0xaa, 0x17, 0x69, 0x28,
-	0xa5, 0x02, 0xb3, 0xea, 0x4f, 0xaf, 0x43, 0xfd, 0x99, 0x87, 0xa9, 0x7f, 0x35, 0xad, 0x4f, 0xdf,
+	0xcd, 0x37, 0x40, 0xf4, 0x78, 0x2b, 0x1d, 0x98, 0x57, 0x7f, 0x7a, 0x1b, 0xea, 0xcf, 0x6c, 0xa6,
-	0x1e, 0xf9, 0xd1, 0xcf, 0x5b, 0x15, 0xf2, 0xcd, 0x2e, 0xf5, 0x62, 0x69, 0x09, 0x55, 0xa0, 0x58,
+	0xfe, 0xf5, 0xb4, 0x3e, 0xbb, 0x7b, 0xe4, 0x5b, 0x5f, 0x6f, 0x55, 0xc8, 0x37, 0xbb, 0xd4, 0x8b,
-	0x15, 0x4f, 0x7f, 0x44, 0x90, 0x4b, 0x54, 0x0f, 0xbf, 0x05, 0xd2, 0x51, 0xa7, 0xd9, 0x29, 0xa4,
+	0xa5, 0x25, 0x54, 0x81, 0x62, 0x55, 0xdc, 0xfd, 0x01, 0x41, 0x2e, 0xd1, 0x3d, 0xfc, 0x06, 0x48,
-	0x94, 0xe2, 0xd9, 0x79, 0xf5, 0xb5, 0xc4, 0x55, 0xa0, 0x62, 0x5c, 0x81, 0xec, 0xb1, 0xb1, 0xdf,
+	0x4f, 0x3b, 0xcd, 0x4e, 0x21, 0xa5, 0x14, 0x4f, 0x4e, 0xab, 0xaf, 0x24, 0x5e, 0x05, 0x2a, 0xc6,
-	0xd9, 0x2b, 0x20, 0xa5, 0x74, 0x76, 0x5e, 0x2d, 0x24, 0xee, 0xf9, 0x12, 0xbf, 0x0d, 0x72, 0xfb,
+	0x15, 0xc8, 0x3e, 0x33, 0x0e, 0x3b, 0x8f, 0x0b, 0x48, 0x29, 0x9d, 0x9c, 0x56, 0x0b, 0x89, 0xf7,
-	0xb3, 0x83, 0x83, 0xfd, 0x4e, 0x21, 0xad, 0xbc, 0x71, 0x76, 0x5e, 0x7d, 0x3d, 0x61, 0xd1, 0xe6,
+	0xdc, 0xc4, 0x6f, 0x82, 0xdc, 0xfe, 0xec, 0xe8, 0xe8, 0xb0, 0x53, 0x48, 0x2b, 0xaf, 0x9d, 0x9c,
-	0x43, 0x4f, 0x29, 0xfe, 0xf4, 0x9b, 0x9a, 0xfa, 0xf3, 0x77, 0x35, 0xe9, 0xb7, 0x71, 0x99, 0x85,
+	0x56, 0x5f, 0x4d, 0x78, 0xb4, 0xf9, 0xd2, 0x53, 0x8a, 0x3f, 0xfe, 0xaa, 0xa6, 0xfe, 0xf8, 0x4d,
-	0x57, 0x84, 0x0c, 0xb0, 0x29, 0x26, 0xf8, 0xb3, 0x65, 0x46, 0x86, 0x48, 0x4d, 0x79, 0x7f, 0x39,
+	0x4d, 0xc6, 0x6d, 0xbc, 0xc8, 0xc2, 0x4b, 0x42, 0x06, 0xd8, 0x14, 0x1b, 0xfc, 0xde, 0x2a, 0x2b,
-	0x63, 0xa1, 0xb0, 0x13, 0x90, 0x82, 0x91, 0x85, 0x1b, 0x8b, 0x50, 0xf3, 0xe3, 0x4e, 0xd9, 0x59,
+	0x43, 0x94, 0xa6, 0xbc, 0xbb, 0x9a, 0xb3, 0x50, 0xd8, 0x73, 0x90, 0x82, 0x95, 0x85, 0x1b, 0xcb,
-	0x09, 0x13, 0x3a, 0xdc, 0x46, 0xf8, 0x0b, 0x90, 0xc3, 0x71, 0x86, 0x5f, 0x2c, 0x22, 0xb8, 0x6b,
+	0x50, 0x8b, 0xeb, 0x4e, 0x39, 0x58, 0x0b, 0x13, 0x06, 0xdc, 0x47, 0xf8, 0x0b, 0x90, 0xc3, 0x75,
-	0xec, 0x29, 0x5b, 0x73, 0xb2, 0xdb, 0x0b, 0xfe, 0xf6, 0x04, 0xa9, 0x04, 0x33, 0x63, 0x71, 0x2a,
+	0x86, 0x1f, 0x2e, 0x23, 0xb8, 0x6e, 0xed, 0x29, 0x7b, 0x0b, 0xb2, 0x7b, 0x1c, 0x7c, 0xf6, 0x04,
-	0xf3, 0x73, 0x6e, 0x71, 0x2a, 0x77, 0x4c, 0xa3, 0x6d, 0x84, 0xad, 0x78, 0xc4, 0x3c, 0x5f, 0xee,
+	0xa5, 0x04, 0x3b, 0x63, 0x79, 0x29, 0x8b, 0x7b, 0x6e, 0x79, 0x29, 0xd7, 0x6c, 0xa3, 0x7d, 0x84,
-	0xed, 0x8b, 0xfc, 0xe9, 0xcb, 0x9a, 0x8b, 0x36, 0x9d, 0x42, 0x36, 0x94, 0xd5, 0xce, 0x52, 0x2f,
+	0xad, 0x78, 0xc5, 0xdc, 0x5f, 0xed, 0xee, 0x8b, 0xe2, 0xe9, 0xab, 0xba, 0x8b, 0x31, 0x4d, 0x20,
-	0xc0, 0xad, 0xec, 0x5e, 0xac, 0x06, 0x0a, 0x7d, 0xd6, 0xd0, 0x36, 0xc2, 0x07, 0x90, 0xe5, 0xdf,
+	0x1b, 0xca, 0xea, 0x60, 0xa5, 0x1b, 0xe0, 0x4a, 0x75, 0x0f, 0xd7, 0x03, 0x85, 0x31, 0x6b, 0x68,
-	0x0d, 0x5e, 0xa8, 0xaa, 0xe4, 0xe7, 0x75, 0x5f, 0x8b, 0x5a, 0xe5, 0x8b, 0x1b, 0x35, 0xf5, 0xf7,
+	0x1f, 0xe1, 0x23, 0xc8, 0xf2, 0xff, 0x0d, 0x5e, 0xaa, 0xaa, 0xe4, 0xdf, 0xeb, 0xa6, 0x11, 0xb5,
-	0x8d, 0x9a, 0xfa, 0x61, 0xa2, 0xa2, 0x8b, 0x89, 0x8a, 0xfe, 0x9a, 0xa8, 0xe8, 0x9f, 0x89, 0x8a,
+	0x8e, 0xcf, 0x2e, 0xd5, 0xd4, 0x5f, 0x97, 0x6a, 0xea, 0xfb, 0xa9, 0x8a, 0xce, 0xa6, 0x2a, 0xfa,
-	0xba, 0x32, 0xb7, 0xdc, 0xf9, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x80, 0xb2, 0x0e, 0x45, 0x6f, 0x0b,
+	0x73, 0xaa, 0xa2, 0xbf, 0xa7, 0x2a, 0x3a, 0xfe, 0x60, 0xd3, 0x2f, 0xed, 0xf7, 0x84, 0xd9, 0x95,
-	0x00, 0x00,
+	0x79, 0xac, 0x83, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x26, 0x49, 0x54, 0x8e, 0xb4, 0x0b, 0x00,
+	0x00,
 }

api/services/content/v1/content.proto

@@ -6,6 +6,8 @@ import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/empty.proto";
 
+option go_package = "github.com/containerd/containerd/api/services/content/v1;content";
+
 // Content provides access to a content addressable storage system.
 service Content {
 	// Info returns information about a committed object.

api/services/diff/v1/diff.pb.go

@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-gogo.
-// source: github.com/containerd/containerd/api/services/diff/diff.proto
+// source: github.com/containerd/containerd/api/services/diff/v1/diff.proto
 // DO NOT EDIT!
 
 /*
 	Package diff is a generated protocol buffer package.
 
 	It is generated from these files:
-		github.com/containerd/containerd/api/services/diff/diff.proto
+		github.com/containerd/containerd/api/services/diff/v1/diff.proto
 
 	It has these top-level messages:
 		ApplyRequest
@@ -214,7 +214,7 @@ var _Diff_serviceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "github.com/containerd/containerd/api/services/diff/diff.proto",
+	Metadata: "github.com/containerd/containerd/api/services/diff/v1/diff.proto",
 }
 
 func (m *ApplyRequest) Marshal() (dAtA []byte, err error) {
@@ -1077,36 +1077,37 @@ var (
 )
 
 func init() {
-	proto.RegisterFile("github.com/containerd/containerd/api/services/diff/diff.proto", fileDescriptorDiff)
+	proto.RegisterFile("github.com/containerd/containerd/api/services/diff/v1/diff.proto", fileDescriptorDiff)
 }
 
 var fileDescriptorDiff = []byte{
-	// 420 bytes of a gzipped FileDescriptorProto
+	// 434 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0x31, 0x8f, 0x94, 0x40,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0xbf, 0x6f, 0xd4, 0x30,
-	0x14, 0xc7, 0x6f, 0x64, 0xf7, 0xcc, 0xcd, 0x9e, 0x89, 0x99, 0x58, 0x10, 0x2e, 0x72, 0x1b, 0x2a,
+	0x14, 0xc7, 0x6b, 0xee, 0xae, 0xa8, 0xbe, 0x22, 0x21, 0x8b, 0x21, 0x4a, 0x45, 0x7a, 0xba, 0xe9,
-	0xce, 0x62, 0xf0, 0xb8, 0xca, 0x44, 0x0b, 0xf5, 0x62, 0x61, 0x62, 0x43, 0xec, 0x4c, 0x34, 0x2c,
+	0xca, 0x60, 0x73, 0xe9, 0xc4, 0x8f, 0x81, 0x1f, 0x15, 0x03, 0x12, 0x4b, 0xd4, 0x09, 0x24, 0x50,
-	0x3c, 0xb8, 0x49, 0x80, 0x19, 0x99, 0x61, 0x0d, 0x9d, 0x1f, 0xc5, 0xef, 0x62, 0x73, 0xa5, 0xa5,
+	0x2e, 0x79, 0x49, 0x2d, 0x25, 0xb1, 0x89, 0x9d, 0xa0, 0x6c, 0xfc, 0x29, 0xfc, 0x2f, 0x2c, 0x1d,
-	0xa5, 0xcb, 0x27, 0x31, 0x0c, 0x83, 0x12, 0x63, 0xf6, 0xd8, 0x66, 0xf2, 0x98, 0xf7, 0x7b, 0xef,
+	0x19, 0x19, 0x69, 0xfe, 0x12, 0x14, 0xc7, 0x81, 0x08, 0xa1, 0x92, 0xb2, 0xc4, 0x2f, 0x7e, 0x9f,
-	0xfd, 0xdf, 0x9f, 0xc1, 0x2f, 0x72, 0xa6, 0x6e, 0x9a, 0x0d, 0x4d, 0x78, 0x19, 0x24, 0xbc, 0x52,
+	0xf7, 0xfc, 0x7d, 0xdf, 0x38, 0xf8, 0x59, 0xca, 0xf5, 0x45, 0xb5, 0xa3, 0x91, 0xc8, 0x59, 0x24,
-	0x31, 0xab, 0xa0, 0x4e, 0xa7, 0x61, 0x2c, 0x58, 0x20, 0xa1, 0xde, 0xb2, 0x04, 0x64, 0x90, 0xb2,
+	0x0a, 0x1d, 0xf2, 0x02, 0xca, 0x78, 0x1c, 0x86, 0x92, 0x33, 0x05, 0x65, 0xcd, 0x23, 0x50, 0x2c,
-	0x2c, 0xd3, 0x07, 0x15, 0x35, 0x57, 0x9c, 0x9c, 0xfd, 0x05, 0xe9, 0x08, 0x51, 0x9d, 0xdf, 0x5e,
+	0xe6, 0x49, 0xc2, 0xea, 0xad, 0x59, 0xa9, 0x2c, 0x85, 0x16, 0xe4, 0xe8, 0x37, 0x4b, 0x07, 0x8e,
-	0x3a, 0x8f, 0x72, 0x9e, 0x73, 0xcd, 0x05, 0x7d, 0x34, 0x94, 0x38, 0x67, 0x39, 0xe7, 0x79, 0x01,
+	0x9a, 0x7c, 0xbd, 0x75, 0xef, 0xa5, 0x22, 0x15, 0x86, 0x63, 0x5d, 0xd4, 0x97, 0xb8, 0x47, 0xa9,
-	0x81, 0xfe, 0xda, 0x34, 0x59, 0x00, 0xa5, 0x50, 0xad, 0x49, 0x9e, 0xff, 0x9b, 0x54, 0xac, 0x04,
+	0x10, 0x69, 0x06, 0xcc, 0xbc, 0xed, 0xaa, 0x84, 0x41, 0x2e, 0x75, 0x63, 0x93, 0xc7, 0x7f, 0x26,
-	0xa9, 0xe2, 0x52, 0x18, 0xe0, 0xf9, 0x2c, 0xbd, 0xaa, 0x15, 0x20, 0x83, 0x92, 0x37, 0x95, 0x1a,
+	0x35, 0xcf, 0x41, 0xe9, 0x30, 0x97, 0x16, 0x78, 0x3a, 0x49, 0xb2, 0x6e, 0x24, 0x28, 0x96, 0x8b,
-	0x4e, 0x53, 0xfd, 0xe6, 0x80, 0xea, 0x14, 0x64, 0x52, 0x33, 0xa1, 0x78, 0x3d, 0x09, 0x87, 0x3e,
+	0xaa, 0xd0, 0xfd, 0xd3, 0x56, 0xbf, 0xba, 0x41, 0x75, 0x0c, 0x2a, 0x2a, 0xb9, 0xd4, 0xa2, 0x1c,
-	0xde, 0x17, 0x7c, 0xfa, 0x52, 0x88, 0xa2, 0x8d, 0xe0, 0x73, 0x03, 0x52, 0x91, 0x2b, 0xbc, 0xe8,
+	0x85, 0x7d, 0x9f, 0xf5, 0x27, 0x7c, 0xf8, 0x5c, 0xca, 0xac, 0x09, 0xe0, 0x63, 0x05, 0x4a, 0x93,
-	0x97, 0xb6, 0xd1, 0x1a, 0xf9, 0xab, 0xf0, 0x9c, 0x4e, 0x5c, 0xd9, 0x5e, 0x52, 0xdd, 0x8f, 0x5e,
+	0x53, 0x3c, 0xef, 0x86, 0x76, 0xd0, 0x0a, 0x6d, 0x96, 0xfe, 0x31, 0x1d, 0xb9, 0x52, 0x6f, 0xa9,
-	0xff, 0x69, 0x12, 0x69, 0x98, 0x84, 0xf8, 0x58, 0x6b, 0x93, 0xf6, 0xbd, 0xb5, 0xe5, 0xaf, 0x42,
+	0xe9, 0x47, 0xcf, 0x7e, 0x35, 0x09, 0x0c, 0x4c, 0x7c, 0xbc, 0x6f, 0xb4, 0x29, 0xe7, 0xd6, 0x6a,
-	0xe7, 0xbf, 0x65, 0xef, 0x7a, 0x24, 0x32, 0xa4, 0xf7, 0x16, 0x3f, 0x30, 0x83, 0xa5, 0xe0, 0x95,
+	0xb6, 0x59, 0xfa, 0xee, 0x5f, 0xcb, 0xde, 0x74, 0x48, 0x60, 0xc9, 0xf5, 0x6b, 0x7c, 0xc7, 0x1e,
-	0x04, 0xf2, 0x0c, 0xdf, 0x8f, 0x85, 0x28, 0x18, 0xa4, 0x73, 0x87, 0x8f, 0xbc, 0xf7, 0x0d, 0xe1,
+	0xac, 0xa4, 0x28, 0x14, 0x90, 0x47, 0xf8, 0x76, 0x28, 0x65, 0xc6, 0x21, 0x9e, 0x7a, 0xf8, 0xc0,
-	0xd5, 0x35, 0xcb, 0xb2, 0x71, 0x09, 0x8a, 0x17, 0x05, 0x64, 0xca, 0x46, 0x77, 0xaa, 0xd1, 0x1c,
+	0xaf, 0xbf, 0x20, 0xbc, 0x3c, 0xe3, 0x49, 0x32, 0x0c, 0x41, 0xf1, 0x3c, 0x83, 0x44, 0x3b, 0xe8,
-	0x79, 0x8a, 0x97, 0x35, 0xcb, 0x6f, 0xd4, 0x0c, 0xf9, 0x03, 0x48, 0x1e, 0x63, 0x5c, 0x42, 0xca,
+	0x9f, 0x6a, 0x0c, 0x47, 0x1e, 0xe2, 0x45, 0xc9, 0xd3, 0x0b, 0x3d, 0x41, 0x7e, 0x0f, 0x92, 0xfb,
-	0xe2, 0x4f, 0x7d, 0xce, 0xb6, 0xd6, 0xc8, 0x3f, 0x89, 0x4e, 0xf4, 0xcd, 0xfb, 0x56, 0x00, 0x79,
+	0x18, 0xe7, 0x10, 0xf3, 0xf0, 0x43, 0x97, 0x73, 0x66, 0x2b, 0xb4, 0x39, 0x08, 0x0e, 0xcc, 0xce,
-	0x88, 0xad, 0x1a, 0x32, 0x7b, 0xa9, 0xef, 0xfb, 0xd0, 0x7b, 0x8d, 0x4f, 0x07, 0x85, 0x66, 0xdb,
+	0x79, 0x23, 0x81, 0xdc, 0xc5, 0xb3, 0x12, 0x12, 0x67, 0x61, 0xf6, 0xbb, 0x70, 0xfd, 0x12, 0x1f,
-	0xd1, 0x67, 0xeb, 0x00, 0x9f, 0xc3, 0xef, 0x08, 0x2f, 0xfa, 0x2e, 0xe4, 0x23, 0x5e, 0x6a, 0xf3,
+	0xf6, 0x0a, 0xed, 0xb4, 0x83, 0xcf, 0xb3, 0x1b, 0xf8, 0xec, 0x7f, 0x45, 0x78, 0xde, 0x75, 0x21,
-	0xc8, 0x05, 0xdd, 0xf3, 0x6c, 0xe9, 0xf4, 0xcf, 0x3a, 0x4f, 0xe6, 0xa0, 0x46, 0xdd, 0x07, 0x33,
+	0xef, 0xf1, 0xc2, 0x98, 0x47, 0x4e, 0xe8, 0x35, 0xd7, 0x96, 0x8e, 0xbf, 0xac, 0xfb, 0x60, 0x0a,
-	0xc7, 0xdf, 0x5b, 0x33, 0xb1, 0xdc, 0xb9, 0x98, 0x41, 0x0e, 0xcd, 0x5f, 0xd9, 0xb7, 0x3b, 0xf7,
+	0x6a, 0xd5, 0xbd, 0xb3, 0xe7, 0x6c, 0xae, 0xad, 0x19, 0x59, 0xee, 0x9e, 0x4c, 0x20, 0xfb, 0xe6,
-	0xe8, 0xe7, 0xce, 0x3d, 0xfa, 0xda, 0xb9, 0xe8, 0xb6, 0x73, 0xd1, 0x8f, 0xce, 0x45, 0xbf, 0x3a,
+	0x2f, 0xce, 0x2f, 0xaf, 0xbc, 0xbd, 0xef, 0x57, 0xde, 0xde, 0xe7, 0xd6, 0x43, 0x97, 0xad, 0x87,
-	0x17, 0x6d, 0x8e, 0xf5, 0x9b, 0xbc, 0xfa, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x7f, 0xee, 0xae, 0xcf,
+	0xbe, 0xb5, 0x1e, 0xfa, 0xd1, 0x7a, 0xe8, 0xed, 0xe3, 0xff, 0xfa, 0x8b, 0x9f, 0x74, 0xeb, 0x6e,
-	0xcb, 0x03, 0x00, 0x00,
+	0xdf, 0xdc, 0xe7, 0xd3, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x63, 0x74, 0x0f, 0x69, 0x0a, 0x04,
+	0x00, 0x00,
 }

api/services/diff/v1/diff.proto

@@ -8,6 +8,8 @@ import "google/protobuf/timestamp.proto";
 import "github.com/containerd/containerd/api/types/mount/mount.proto";
 import "github.com/containerd/containerd/api/types/descriptor/descriptor.proto";
 
+option go_package = "github.com/containerd/containerd/api/services/diff/v1;diff";
+
 // Diff service creates and applies diffs
 service Diff {
 	// Apply applies the content associated with the provided digests onto

api/services/events/v1/events.pb.go

@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-gogo.
-// source: github.com/containerd/containerd/api/services/events/events.proto
+// source: github.com/containerd/containerd/api/services/events/v1/events.proto
 // DO NOT EDIT!
 
 /*
 	Package events is a generated protocol buffer package.
 
 	It is generated from these files:
-		github.com/containerd/containerd/api/services/events/events.proto
+		github.com/containerd/containerd/api/services/events/v1/events.proto
 
 	It has these top-level messages:
 		StreamEventsRequest
@@ -146,7 +146,7 @@ var _Events_serviceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
-	Metadata: "github.com/containerd/containerd/api/services/events/events.proto",
+	Metadata: "github.com/containerd/containerd/api/services/events/v1/events.proto",
 }
 
 func (m *StreamEventsRequest) Marshal() (dAtA []byte, err error) {
@@ -386,22 +386,22 @@ var (
 )
 
 func init() {
-	proto.RegisterFile("github.com/containerd/containerd/api/services/events/events.proto", fileDescriptorEvents)
+	proto.RegisterFile("github.com/containerd/containerd/api/services/events/v1/events.proto", fileDescriptorEvents)
 }
 
 var fileDescriptorEvents = []byte{
-	// 194 bytes of a gzipped FileDescriptorProto
+	// 205 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x4c, 0xcf, 0x2c, 0xc9,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x49, 0xcf, 0x2c, 0xc9,
 	0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d,
 	0x4a, 0x41, 0x66, 0x26, 0x16, 0x64, 0xea, 0x17, 0xa7, 0x16, 0x95, 0x65, 0x26, 0xa7, 0x16, 0xeb,
-	0xa7, 0x96, 0xa5, 0xe6, 0x95, 0xc0, 0x28, 0xbd, 0x82, 0xa2, 0xfc, 0x92, 0x7c, 0x21, 0x59, 0x84,
+	0xa7, 0x96, 0xa5, 0xe6, 0x95, 0x14, 0xeb, 0x97, 0x19, 0x42, 0x59, 0x7a, 0x05, 0x45, 0xf9, 0x25,
-	0x62, 0x3d, 0x98, 0x42, 0x3d, 0xa8, 0x8a, 0x32, 0x43, 0x29, 0x1b, 0xa2, 0x6c, 0x28, 0xa9, 0x2c,
+	0xf9, 0x42, 0xb2, 0x08, 0xf5, 0x7a, 0x30, 0xb5, 0x7a, 0x50, 0x15, 0x65, 0x86, 0x52, 0x36, 0x44,
-	0x80, 0x19, 0x0f, 0x21, 0x21, 0x86, 0x2b, 0x89, 0x72, 0x09, 0x07, 0x97, 0x14, 0xa5, 0x26, 0xe6,
+	0x59, 0x52, 0x52, 0x59, 0x00, 0xb3, 0x01, 0x42, 0x42, 0x0c, 0x57, 0x12, 0xe5, 0x12, 0x0e, 0x2e,
-	0xba, 0x82, 0x0d, 0x0c, 0x4a, 0x2d, 0x2c, 0x4d, 0x2d, 0x2e, 0x31, 0x4a, 0xe7, 0x62, 0x83, 0x08,
+	0x29, 0x4a, 0x4d, 0xcc, 0x75, 0x05, 0x1b, 0x18, 0x94, 0x5a, 0x58, 0x9a, 0x5a, 0x5c, 0x62, 0x94,
-	0x08, 0xc5, 0x72, 0xb1, 0x41, 0x14, 0x08, 0x19, 0xe9, 0xe1, 0x75, 0x88, 0x1e, 0x16, 0x73, 0xa4,
+	0xce, 0xc5, 0x06, 0x11, 0x10, 0x8a, 0xe5, 0x62, 0x83, 0x28, 0x10, 0x32, 0xd2, 0xc3, 0xeb, 0x10,
-	0x64, 0x91, 0xf5, 0x94, 0x19, 0xea, 0x81, 0x9d, 0xa1, 0xe7, 0x9a, 0x57, 0x96, 0x9a, 0x93, 0x5f,
+	0x3d, 0x2c, 0xe6, 0x48, 0xc9, 0x22, 0xeb, 0x29, 0x33, 0xd4, 0x03, 0x3b, 0x43, 0xcf, 0x35, 0xaf,
-	0x90, 0x6a, 0xc0, 0xe8, 0x24, 0x71, 0xe2, 0xa1, 0x1c, 0xc3, 0x8d, 0x87, 0x72, 0x0c, 0x0d, 0x8f,
+	0x2c, 0x35, 0x27, 0xbf, 0x20, 0xd5, 0x80, 0xd1, 0x29, 0xe2, 0xc4, 0x43, 0x39, 0x86, 0x1b, 0x0f,
-	0xe4, 0x18, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x24,
+	0xe5, 0x18, 0x1a, 0x1e, 0xc9, 0x31, 0x9e, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83,
-	0x36, 0xb0, 0x03, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x82, 0x06, 0x73, 0x76, 0x42, 0x01,
+	0x47, 0x72, 0x8c, 0x51, 0x76, 0x64, 0x06, 0x9e, 0x35, 0x84, 0x95, 0xc4, 0x06, 0xf6, 0xa0, 0x31,
-	0x00, 0x00,
+	0x20, 0x00, 0x00, 0xff, 0xff, 0xf9, 0x3a, 0x20, 0x52, 0x85, 0x01, 0x00, 0x00,
 }

api/services/events/v1/events.proto

@@ -4,6 +4,8 @@ package containerd.services.events.v1;
 
 import "github.com/containerd/containerd/api/types/event/event.proto";
 
+option go_package = "github.com/containerd/containerd/api/services/events/v1;events";
+
 service Events {
 	rpc Stream(StreamEventsRequest) returns (stream containerd.v1.types.Envelope);
 }

api/services/images/v1/images.pb.go

@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-gogo.
-// source: github.com/containerd/containerd/api/services/images/images.proto
+// source: github.com/containerd/containerd/api/services/images/v1/images.proto
 // DO NOT EDIT!
 
 /*
 	Package images is a generated protocol buffer package.
 
 	It is generated from these files:
-		github.com/containerd/containerd/api/services/images/images.proto
+		github.com/containerd/containerd/api/services/images/v1/images.proto
 
 	It has these top-level messages:
 		Image
@@ -304,7 +304,7 @@ var _Images_serviceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "github.com/containerd/containerd/api/services/images/images.proto",
+	Metadata: "github.com/containerd/containerd/api/services/images/v1/images.proto",
 }
 
 func (m *Image) Marshal() (dAtA []byte, err error) {
@@ -1658,42 +1658,42 @@ var (
 )
 
 func init() {
-	proto.RegisterFile("github.com/containerd/containerd/api/services/images/images.proto", fileDescriptorImages)
+	proto.RegisterFile("github.com/containerd/containerd/api/services/images/v1/images.proto", fileDescriptorImages)
 }
 
 var fileDescriptorImages = []byte{
-	// 513 bytes of a gzipped FileDescriptorProto
+	// 523 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4d, 0x6f, 0xd3, 0x40,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4f, 0x6b, 0x13, 0x41,
-	0x10, 0xed, 0xe6, 0xc3, 0x12, 0x93, 0x03, 0x65, 0xa9, 0x2a, 0xcb, 0x08, 0x37, 0xb2, 0x40, 0x8a,
+	0x14, 0xcf, 0xe4, 0xcf, 0x82, 0x2f, 0x07, 0xeb, 0x58, 0x4a, 0x58, 0x71, 0x1b, 0x16, 0x85, 0x80,
-	0x84, 0xb4, 0x26, 0xe6, 0x02, 0x95, 0x90, 0x20, 0x6a, 0x29, 0x48, 0x15, 0x07, 0x23, 0x3e, 0xae,
+	0x30, 0x6b, 0xe2, 0x45, 0x2b, 0x8a, 0x84, 0xd4, 0x2a, 0x14, 0x0f, 0x11, 0xb5, 0x78, 0xdb, 0x24,
-	0x4e, 0x32, 0x31, 0x56, 0x1d, 0xaf, 0xf1, 0x6e, 0x22, 0xe5, 0xc6, 0x7f, 0xe1, 0xcf, 0xe4, 0xc8,
+	0x2f, 0xeb, 0xd2, 0xcd, 0xce, 0xba, 0x33, 0x59, 0xc8, 0xcd, 0xef, 0xe2, 0x97, 0xc9, 0xd1, 0xa3,
-	0x91, 0x13, 0xd0, 0xfc, 0x12, 0xe4, 0xdd, 0x4d, 0xeb, 0x36, 0x15, 0x49, 0xe0, 0xe4, 0x59, 0xfb,
+	0x27, 0xb5, 0xf9, 0x24, 0xb2, 0x33, 0x13, 0xbb, 0x6d, 0x8a, 0x49, 0xda, 0xdb, 0x9b, 0xe4, 0xf7,
-	0xbd, 0x37, 0x6f, 0xde, 0xae, 0x17, 0x5e, 0xc6, 0x89, 0xfc, 0x3c, 0xe9, 0xb3, 0x01, 0x1f, 0xfb,
+	0xef, 0xbd, 0x99, 0x7d, 0xd0, 0x0b, 0x42, 0xf9, 0x65, 0x3a, 0x60, 0x43, 0x3e, 0xf1, 0x86, 0x3c,
-	0x03, 0x9e, 0xc9, 0x28, 0xc9, 0xb0, 0x18, 0x56, 0xcb, 0x28, 0x4f, 0x7c, 0x81, 0xc5, 0x34, 0x19,
+	0x96, 0x7e, 0x18, 0x63, 0x3a, 0x2a, 0x96, 0x7e, 0x12, 0x7a, 0x02, 0xd3, 0x2c, 0x1c, 0xa2, 0xf0,
-	0xa0, 0xf0, 0x93, 0x71, 0x14, 0x5f, 0x3c, 0x58, 0x5e, 0x70, 0xc9, 0xe9, 0xfd, 0x4b, 0x30, 0x5b,
+	0xc2, 0x89, 0x1f, 0xa0, 0xf0, 0xb2, 0xb6, 0xa9, 0x58, 0x92, 0x72, 0xc9, 0xe9, 0xfd, 0x73, 0x3c,
-	0x02, 0x99, 0x41, 0x4c, 0xbb, 0xce, 0x5e, 0xcc, 0x63, 0xae, 0x90, 0x7e, 0x59, 0x69, 0x92, 0x73,
+	0x5b, 0x62, 0x99, 0x41, 0x64, 0x6d, 0x7b, 0x37, 0xe0, 0x01, 0x57, 0x48, 0x2f, 0xaf, 0x34, 0xc9,
-	0x2f, 0xe6, 0x3c, 0x4e, 0xd1, 0x57, 0xab, 0xfe, 0x64, 0xe4, 0xe3, 0x38, 0x97, 0x33, 0xf3, 0xf1,
+	0xbe, 0x17, 0x70, 0x1e, 0x44, 0xe8, 0xa9, 0xd3, 0x60, 0x3a, 0xf6, 0x70, 0x92, 0xc8, 0x99, 0xf9,
-	0xd5, 0x46, 0xa6, 0xe4, 0x2c, 0x47, 0xe1, 0x0f, 0x51, 0x0c, 0x8a, 0x24, 0x97, 0xbc, 0xa8, 0x94,
+	0xf3, 0xf5, 0x46, 0xb9, 0xe4, 0x2c, 0x41, 0xe1, 0x8d, 0x50, 0x0c, 0xd3, 0x30, 0x91, 0x3c, 0x2d,
-	0x5a, 0xc7, 0xfb, 0x45, 0xa0, 0xf9, 0xa6, 0x34, 0x42, 0x29, 0x34, 0xb2, 0x68, 0x8c, 0x36, 0x69,
+	0x94, 0x5a, 0xc7, 0xfd, 0x4d, 0xa0, 0xf6, 0x36, 0x0f, 0x42, 0x29, 0x54, 0x63, 0x7f, 0x82, 0x0d,
-	0x93, 0xce, 0xad, 0x50, 0xd5, 0xf4, 0x35, 0x58, 0x69, 0xd4, 0xc7, 0x54, 0xd8, 0xb5, 0x76, 0xbd,
+	0xd2, 0x24, 0xad, 0x5b, 0x7d, 0x55, 0xd3, 0x37, 0x60, 0x45, 0xfe, 0x00, 0x23, 0xd1, 0x28, 0x37,
-	0xd3, 0x0a, 0x1e, 0xb3, 0xbf, 0x0e, 0xc2, 0x94, 0x12, 0x3b, 0x55, 0x94, 0xe3, 0x4c, 0x16, 0xb3,
+	0x2b, 0xad, 0x7a, 0xe7, 0x31, 0xfb, 0x6f, 0x23, 0x4c, 0x29, 0xb1, 0x63, 0x45, 0x39, 0x8c, 0x65,
-	0xd0, 0xf0, 0xe9, 0x73, 0xb0, 0x64, 0x54, 0xc4, 0x28, 0xed, 0x7a, 0x9b, 0x74, 0x5a, 0xc1, 0x41,
+	0x3a, 0xeb, 0x1b, 0x3e, 0x7d, 0x01, 0x96, 0xf4, 0xd3, 0x00, 0x65, 0xa3, 0xd2, 0x24, 0xad, 0x7a,
-	0x55, 0x69, 0xda, 0x65, 0xca, 0x29, 0x3b, 0xba, 0xb0, 0xd7, 0x6b, 0xcc, 0x7f, 0x1e, 0xec, 0x84,
+	0x67, 0xbf, 0xa8, 0x94, 0xb5, 0x99, 0x4a, 0xca, 0x7a, 0xff, 0xe2, 0x75, 0xab, 0xf3, 0x5f, 0xfb,
-	0x86, 0xe4, 0x3c, 0x83, 0x56, 0x45, 0x95, 0xee, 0x42, 0xfd, 0x0c, 0x67, 0xc6, 0x6a, 0x59, 0xd2,
+	0xa5, 0xbe, 0x21, 0xd9, 0xcf, 0xa0, 0x5e, 0x50, 0xa5, 0x3b, 0x50, 0x39, 0xc5, 0x99, 0x89, 0x9a,
-	0x3d, 0x68, 0x4e, 0xa3, 0x74, 0x82, 0x76, 0x4d, 0xbd, 0xd3, 0x8b, 0xc3, 0xda, 0x53, 0xe2, 0x3d,
+	0x97, 0x74, 0x17, 0x6a, 0x99, 0x1f, 0x4d, 0xb1, 0x51, 0x56, 0xbf, 0xe9, 0xc3, 0x41, 0xf9, 0x29,
-	0x84, 0xdb, 0x27, 0x28, 0x95, 0xb3, 0x10, 0xbf, 0x4c, 0x50, 0xc8, 0x9b, 0x46, 0xf5, 0xde, 0xc2,
+	0x71, 0x1f, 0xc2, 0xed, 0x23, 0x94, 0x2a, 0x59, 0x1f, 0xbf, 0x4e, 0x51, 0xc8, 0xab, 0x5a, 0x75,
-	0xee, 0x25, 0x4c, 0xe4, 0x3c, 0x13, 0x48, 0x0f, 0xa1, 0xa9, 0x66, 0x53, 0xc0, 0x56, 0xf0, 0x60,
+	0xdf, 0xc1, 0xce, 0x39, 0x4c, 0x24, 0x3c, 0x16, 0x48, 0x0f, 0xa0, 0xa6, 0x7a, 0x53, 0xc0, 0x7a,
-	0x93, 0xe9, 0x43, 0x4d, 0xf1, 0x3e, 0x00, 0x7d, 0x9f, 0x0f, 0x23, 0x89, 0x57, 0x3a, 0xbf, 0xf8,
+	0xe7, 0xc1, 0x26, 0xdd, 0xf7, 0x35, 0xc5, 0xfd, 0x08, 0xf4, 0x43, 0x32, 0xf2, 0x25, 0x5e, 0x70,
-	0x07, 0x45, 0x13, 0x85, 0xd1, 0xfd, 0x08, 0x77, 0xaf, 0xe8, 0x1a, 0xab, 0xff, 0x2f, 0xfc, 0x08,
+	0x7e, 0x75, 0x0d, 0x45, 0x33, 0x0a, 0xa3, 0xfb, 0x09, 0xee, 0x5e, 0xd0, 0x35, 0x51, 0x6f, 0x2e,
-	0xee, 0x9c, 0x26, 0x42, 0x27, 0x20, 0x96, 0x7e, 0xf7, 0xc1, 0x1a, 0x25, 0xa9, 0xc4, 0xc2, 0x64,
+	0xfc, 0x08, 0xee, 0x1c, 0x87, 0x42, 0x4f, 0x40, 0x2c, 0xf3, 0xee, 0x81, 0x35, 0x0e, 0x23, 0x89,
-	0x65, 0x56, 0xde, 0x27, 0xa0, 0x55, 0xb0, 0x31, 0xd1, 0x03, 0x4b, 0xb7, 0xb0, 0x89, 0x3a, 0x2e,
+	0xa9, 0x99, 0x95, 0x39, 0xb9, 0x27, 0x40, 0x8b, 0x60, 0x13, 0xa2, 0x0b, 0x96, 0xb6, 0x68, 0x10,
-	0xdb, 0xb8, 0x30, 0x4c, 0xaf, 0x03, 0xf4, 0x08, 0x53, 0xbc, 0x96, 0xdb, 0x0d, 0x3b, 0x16, 0x7c,
+	0xf5, 0x5c, 0xb6, 0x49, 0x61, 0x98, 0x6e, 0x0b, 0x68, 0x0f, 0x23, 0xbc, 0x34, 0xb7, 0x2b, 0x6e,
-	0xab, 0x83, 0xa5, 0x0d, 0xd0, 0x11, 0xd4, 0x4f, 0x50, 0x52, 0xb6, 0xa6, 0xdf, 0xb5, 0x73, 0xe0,
+	0xac, 0xf3, 0xbd, 0x02, 0x96, 0x0e, 0x40, 0xc7, 0x50, 0x39, 0x42, 0x49, 0xd9, 0x1a, 0xbf, 0x4b,
-	0xf8, 0x1b, 0xe3, 0xcd, 0x80, 0x67, 0xd0, 0x28, 0xc7, 0xa6, 0xeb, 0xfe, 0x83, 0x95, 0x20, 0x9d,
+	0xef, 0xc0, 0xf6, 0x36, 0xc6, 0x9b, 0x06, 0x4f, 0xa1, 0x9a, 0xb7, 0x4d, 0xd7, 0x7d, 0x07, 0x2b,
-	0xee, 0x16, 0x0c, 0xd3, 0x8c, 0x83, 0xa5, 0x77, 0x9a, 0xae, 0x23, 0xaf, 0x1e, 0x34, 0x27, 0xd8,
+	0x83, 0xb4, 0xdb, 0x5b, 0x30, 0x8c, 0x19, 0x07, 0x4b, 0xdf, 0x34, 0x5d, 0x47, 0x5e, 0x7d, 0x68,
-	0x86, 0x62, 0x1a, 0xbe, 0x03, 0x4b, 0x47, 0xbf, 0xb6, 0xe1, 0xea, 0x0e, 0x39, 0xfb, 0x4c, 0x5f,
+	0x76, 0x67, 0x1b, 0x8a, 0x31, 0x7c, 0x0f, 0x96, 0x1e, 0xfd, 0x5a, 0xc3, 0xd5, 0x1b, 0xb2, 0xf7,
-	0x57, 0x6c, 0x79, 0x5d, 0xb1, 0xe3, 0xf2, 0xba, 0xea, 0xd9, 0xf3, 0x73, 0x77, 0xe7, 0xc7, 0xb9,
+	0x98, 0x5e, 0x57, 0x6c, 0xb9, 0xae, 0xd8, 0x61, 0xbe, 0xae, 0xba, 0x27, 0xf3, 0x33, 0xa7, 0xf4,
-	0xbb, 0xf3, 0x75, 0xe1, 0x92, 0xf9, 0xc2, 0x25, 0xdf, 0x17, 0x2e, 0xf9, 0xbd, 0x70, 0x49, 0xdf,
+	0xf3, 0xcc, 0x29, 0x7d, 0x5b, 0x38, 0x64, 0xbe, 0x70, 0xc8, 0x8f, 0x85, 0x43, 0xfe, 0x2c, 0x1c,
-	0x52, 0xc8, 0x27, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x75, 0x19, 0x85, 0xd6, 0x60, 0x05, 0x00,
+	0xf2, 0xf9, 0xe5, 0x35, 0x57, 0xeb, 0x73, 0x5d, 0x0d, 0x2c, 0xe5, 0xf4, 0xe4, 0x6f, 0x00, 0x00,
-	0x00,
+	0x00, 0xff, 0xff, 0xb3, 0x1d, 0x46, 0xc6, 0xa3, 0x05, 0x00, 0x00,
 }

api/services/images/v1/images.proto

@@ -6,6 +6,8 @@ import "gogoproto/gogo.proto";
 import "google/protobuf/empty.proto";
 import "github.com/containerd/containerd/api/types/descriptor/descriptor.proto";
 
+option go_package = "github.com/containerd/containerd/api/services/images/v1;images";
+
 // Images is a service that allows one to register images with containerd.
 //
 // In containerd, an image is merely the mapping of a name to a content root,

api/services/namespaces/v1/namespace.pb.go

@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-gogo.
-// source: github.com/containerd/containerd/api/services/namespaces/namespace.proto
+// source: github.com/containerd/containerd/api/services/namespaces/v1/namespace.proto
 // DO NOT EDIT!
 
 /*
 	Package namespaces is a generated protocol buffer package.
 
 	It is generated from these files:
-		github.com/containerd/containerd/api/services/namespaces/namespace.proto
+		github.com/containerd/containerd/api/services/namespaces/v1/namespace.proto
 
 	It has these top-level messages:
 		Namespace
@@ -365,7 +365,7 @@ var _Namespaces_serviceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "github.com/containerd/containerd/api/services/namespaces/namespace.proto",
+	Metadata: "github.com/containerd/containerd/api/services/namespaces/v1/namespace.proto",
 }
 
 func (m *Namespace) Marshal() (dAtA []byte, err error) {
@@ -1967,43 +1967,44 @@ var (
 )
 
 func init() {
-	proto.RegisterFile("github.com/containerd/containerd/api/services/namespaces/namespace.proto", fileDescriptorNamespace)
+	proto.RegisterFile("github.com/containerd/containerd/api/services/namespaces/v1/namespace.proto", fileDescriptorNamespace)
 }
 
 var fileDescriptorNamespace = []byte{
-	// 536 bytes of a gzipped FileDescriptorProto
+	// 547 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xc1, 0x6e, 0xd3, 0x40,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0x4d, 0x6f, 0xd3, 0x40,
-	0x10, 0xcd, 0x26, 0x21, 0x52, 0xc6, 0x17, 0xb4, 0x04, 0x63, 0x19, 0xc9, 0x04, 0x9f, 0x8a, 0x54,
+	0x10, 0xcd, 0x26, 0xc1, 0x52, 0xc6, 0x17, 0xb4, 0x04, 0x13, 0x19, 0xc9, 0x04, 0x9f, 0x8a, 0x54,
-	0xad, 0x45, 0x90, 0xa0, 0x2d, 0xb7, 0x42, 0x29, 0x87, 0x82, 0x90, 0x25, 0x4e, 0x1c, 0x90, 0x93,
+	0xad, 0xd5, 0x20, 0x41, 0x3f, 0x6e, 0x85, 0xb6, 0x07, 0x0a, 0x42, 0x96, 0xb8, 0xc0, 0x01, 0x9c,
-	0x4c, 0x5c, 0x13, 0xc7, 0x36, 0xde, 0x75, 0xa4, 0x88, 0x03, 0xfc, 0x0d, 0x17, 0x3e, 0x24, 0x47,
+	0x64, 0xe3, 0x9a, 0x38, 0xb6, 0xf1, 0xae, 0x2d, 0x45, 0x1c, 0xe0, 0xdf, 0x70, 0xe1, 0x87, 0xe4,
-	0x8e, 0x9c, 0x50, 0x9b, 0x2f, 0x41, 0x5e, 0x3b, 0x71, 0xda, 0x18, 0xe1, 0x46, 0xb4, 0xb7, 0x59,
+	0xc8, 0x91, 0x13, 0x6a, 0xf3, 0x4b, 0xd0, 0xae, 0x9d, 0x38, 0x34, 0x46, 0xb8, 0x81, 0x72, 0x9b,
-	0xef, 0xcc, 0xbc, 0xb7, 0x4f, 0xef, 0x25, 0xf0, 0xda, 0xf5, 0xc4, 0x69, 0xd2, 0x67, 0x83, 0x70,
+	0xb1, 0xf7, 0xcd, 0x7b, 0x3b, 0x7a, 0xcf, 0x86, 0x67, 0xae, 0xc7, 0xcf, 0x92, 0x3e, 0x19, 0x84,
-	0x62, 0x0d, 0xc2, 0x40, 0x38, 0x5e, 0x80, 0xf1, 0x70, 0xbd, 0x74, 0x22, 0xcf, 0xe2, 0x18, 0x4f,
+	0x13, 0x6b, 0x10, 0x06, 0xdc, 0xf1, 0x02, 0x1a, 0x0f, 0x57, 0x4b, 0x27, 0xf2, 0x2c, 0x46, 0xe3,
-	0xbd, 0x01, 0x72, 0x2b, 0x70, 0x26, 0xc8, 0x23, 0xe7, 0x42, 0xc9, 0xa2, 0x38, 0x14, 0x21, 0x7d,
+	0xd4, 0x1b, 0x50, 0x66, 0x05, 0xce, 0x84, 0xb2, 0xc8, 0x11, 0x65, 0xba, 0x53, 0x74, 0x24, 0x8a,
-	0x58, 0xcc, 0xb0, 0x65, 0x3f, 0x2b, 0xfa, 0xd9, 0xf4, 0xb1, 0xde, 0x71, 0x43, 0x37, 0x94, 0xdd,
+	0x43, 0x1e, 0xe2, 0xfb, 0x05, 0x8c, 0x2c, 0x20, 0xa4, 0x80, 0x90, 0x74, 0x47, 0x6f, 0xbb, 0xa1,
-	0x56, 0x5a, 0x65, 0x83, 0xfa, 0x7d, 0x37, 0x0c, 0x5d, 0x1f, 0x2d, 0x79, 0xea, 0x27, 0x23, 0x0b,
+	0x1b, 0xca, 0xd3, 0x96, 0xa8, 0x32, 0xa0, 0x7e, 0xd7, 0x0d, 0x43, 0xd7, 0xa7, 0x96, 0xec, 0xfa,
-	0x27, 0x91, 0x98, 0xe5, 0x97, 0xdd, 0xcb, 0x97, 0x23, 0x0f, 0xfd, 0xe1, 0xc7, 0x89, 0xc3, 0xc7,
+	0xc9, 0xc8, 0xa2, 0x93, 0x88, 0x4f, 0xf3, 0x97, 0xdd, 0xcb, 0x2f, 0x47, 0x1e, 0xf5, 0x87, 0x6f,
-	0x59, 0x87, 0xf9, 0x83, 0x40, 0xfb, 0xed, 0x12, 0x86, 0x52, 0x68, 0xa6, 0x98, 0x1a, 0xe9, 0x92,
+	0x27, 0x0e, 0x1b, 0x67, 0x27, 0xcc, 0xaf, 0x08, 0x5a, 0x2f, 0x16, 0x34, 0x18, 0x43, 0x53, 0x70,
-	0x9d, 0xb6, 0x2d, 0x6b, 0xfa, 0x0e, 0x5a, 0xbe, 0xd3, 0x47, 0x9f, 0x6b, 0xf5, 0x6e, 0x63, 0x47,
+	0x76, 0x50, 0x17, 0x6d, 0xb5, 0x6c, 0x59, 0xe3, 0x97, 0xa0, 0xf8, 0x4e, 0x9f, 0xfa, 0xac, 0x53,
-	0xe9, 0xed, 0xb1, 0x7f, 0x52, 0x65, 0xab, 0x8d, 0xec, 0x44, 0x8e, 0x1e, 0x05, 0x22, 0x9e, 0xd9,
+	0xef, 0x36, 0xb6, 0xd4, 0xde, 0x2e, 0xf9, 0xa3, 0x54, 0xb2, 0x9c, 0x48, 0x4e, 0x25, 0xf4, 0x28,
-	0xf9, 0x1e, 0x7d, 0x1f, 0x94, 0xb5, 0xcf, 0xf4, 0x36, 0x34, 0xc6, 0x38, 0xcb, 0x31, 0xd3, 0x92,
+	0xe0, 0xf1, 0xd4, 0xce, 0xe7, 0xe8, 0x7b, 0xa0, 0xae, 0x3c, 0xc6, 0x37, 0xa1, 0x31, 0xa6, 0xd3,
-	0x76, 0xe0, 0xd6, 0xd4, 0xf1, 0x13, 0xd4, 0xea, 0xf2, 0x5b, 0x76, 0x38, 0xa8, 0xef, 0x11, 0xf3,
+	0x9c, 0x53, 0x94, 0xb8, 0x0d, 0x37, 0x52, 0xc7, 0x4f, 0x68, 0xa7, 0x2e, 0x9f, 0x65, 0xcd, 0x7e,
-	0x11, 0xdc, 0x39, 0x46, 0xb1, 0x5a, 0x6f, 0xe3, 0xe7, 0x04, 0xb9, 0x28, 0xe3, 0x6d, 0x9e, 0x42,
+	0x7d, 0x17, 0x99, 0x0f, 0xe0, 0xd6, 0x09, 0xe5, 0xcb, 0xf1, 0x36, 0xfd, 0x90, 0x50, 0xc6, 0xcb,
-	0xe7, 0x62, 0x2b, 0x8f, 0xc2, 0x80, 0xa7, 0xef, 0x69, 0xaf, 0xc8, 0xca, 0x01, 0xa5, 0xb7, 0x7b,
+	0x74, 0x9b, 0x67, 0xd0, 0xfe, 0xf5, 0x28, 0x8b, 0xc2, 0x80, 0x89, 0xfb, 0xb4, 0x96, 0x62, 0x25,
-	0x95, 0x27, 0x1d, 0x36, 0xe7, 0xbf, 0x1f, 0xd4, 0xec, 0x62, 0x89, 0x69, 0xc1, 0xdd, 0x13, 0x8f,
+	0x40, 0xed, 0x6d, 0x5f, 0xe5, 0x4a, 0x87, 0xcd, 0xd9, 0x8f, 0x7b, 0x35, 0xbb, 0x18, 0x62, 0x5a,
-	0x17, 0x50, 0x7c, 0x49, 0x4b, 0x85, 0xd6, 0xc8, 0xf3, 0x05, 0xc6, 0x39, 0xb1, 0xfc, 0x64, 0xfa,
+	0x70, 0xfb, 0xd4, 0x63, 0x05, 0x15, 0x5b, 0xc8, 0xd2, 0x40, 0x19, 0x79, 0x3e, 0xa7, 0x71, 0x2e,
-	0xa0, 0x5e, 0x1e, 0xc8, 0xc9, 0xd9, 0x00, 0x05, 0xac, 0x46, 0xa4, 0xe0, 0xdb, 0xb0, 0x5b, 0xdb,
+	0x2c, 0xef, 0x4c, 0x1f, 0xb4, 0xcb, 0x80, 0x5c, 0x9c, 0x0d, 0x50, 0xd0, 0x76, 0x90, 0x5c, 0xf8,
-	0x62, 0x7e, 0x02, 0xf5, 0x45, 0x8c, 0x8e, 0xc0, 0x0d, 0xd9, 0xfe, 0xbf, 0x14, 0x63, 0xb8, 0xb7,
+	0x26, 0xea, 0x56, 0xa6, 0x98, 0xef, 0x41, 0x7b, 0x12, 0x53, 0x87, 0xd3, 0xb5, 0xb5, 0xfd, 0xfb,
-	0x81, 0x75, 0x6d, 0xba, 0x7f, 0x27, 0xa0, 0xbe, 0x8f, 0x86, 0x37, 0xf2, 0x32, 0xfa, 0x1c, 0x94,
+	0x55, 0x8c, 0xe1, 0xce, 0x1a, 0xd7, 0xb5, 0xed, 0xfd, 0x0b, 0x02, 0xed, 0x55, 0x34, 0xfc, 0x2f,
-	0x44, 0x62, 0xc9, 0xf4, 0x48, 0x67, 0x2a, 0x3d, 0x9d, 0x65, 0x01, 0x63, 0xcb, 0x80, 0xb1, 0x57,
+	0x37, 0xc3, 0x07, 0xa0, 0x26, 0x92, 0x4b, 0xa6, 0x47, 0x3a, 0x53, 0xed, 0xe9, 0x24, 0x0b, 0x18,
-	0x69, 0xc0, 0xde, 0x38, 0x7c, 0x6c, 0x43, 0xd6, 0x9e, 0xd6, 0xa9, 0x2c, 0x1b, 0x44, 0xaf, 0x4d,
+	0x59, 0x04, 0x8c, 0x1c, 0x8b, 0x80, 0x3d, 0x77, 0xd8, 0xd8, 0x86, 0xec, 0xb8, 0xa8, 0xc5, 0x5a,
-	0x96, 0x5d, 0x50, 0x5f, 0xa2, 0x8f, 0x25, 0xaa, 0x94, 0xc4, 0xa4, 0x77, 0xd6, 0x04, 0x28, 0x8c,
+	0xd6, 0x84, 0x5e, 0xdb, 0x5a, 0xb6, 0x41, 0x7b, 0x4a, 0x7d, 0x5a, 0xb2, 0x95, 0x92, 0x98, 0xf4,
-	0x48, 0xa7, 0xd0, 0x38, 0x46, 0x41, 0x9f, 0x56, 0xa0, 0x50, 0x12, 0x44, 0xfd, 0xd9, 0x95, 0xe7,
+	0xce, 0x9b, 0x00, 0x85, 0x11, 0x71, 0x0a, 0x8d, 0x13, 0xca, 0xf1, 0xa3, 0x0a, 0x12, 0x4a, 0x82,
-	0x72, 0x19, 0xbe, 0x40, 0x33, 0x8d, 0x04, 0xad, 0xf2, 0xeb, 0x52, 0x1a, 0x36, 0x7d, 0x7f, 0x8b,
+	0xa8, 0x3f, 0xbe, 0x32, 0x2e, 0x5f, 0xc3, 0x47, 0x68, 0x8a, 0x48, 0xe0, 0x2a, 0x5f, 0x97, 0xd2,
-	0xc9, 0x1c, 0xfc, 0x2b, 0xb4, 0x32, 0xd7, 0xd2, 0x2a, 0x4b, 0xca, 0xc3, 0xa4, 0x1f, 0x6c, 0x33,
+	0xb0, 0xe9, 0x7b, 0x1b, 0x20, 0x73, 0xf2, 0x4f, 0xa0, 0x64, 0xae, 0xc5, 0x55, 0x86, 0x94, 0x87,
-	0x5a, 0x10, 0xc8, 0xfc, 0x51, 0x89, 0x40, 0xb9, 0xe7, 0x2b, 0x11, 0xf8, 0x9b, 0x0b, 0x3f, 0x40,
+	0x49, 0xdf, 0xdf, 0x04, 0x5a, 0x08, 0xc8, 0xfc, 0x51, 0x49, 0x40, 0xb9, 0xe7, 0x2b, 0x09, 0xf8,
-	0x2b, 0xf3, 0x4c, 0x25, 0x02, 0xe5, 0xf6, 0xd2, 0xd5, 0x8d, 0x34, 0x1c, 0xa5, 0xff, 0x45, 0x87,
+	0x9d, 0x0b, 0xdf, 0x80, 0x92, 0x79, 0xa6, 0x92, 0x80, 0x72, 0x7b, 0xe9, 0xda, 0x5a, 0x1a, 0x8e,
-	0xda, 0xfc, 0xdc, 0xa8, 0xfd, 0x3a, 0x37, 0x6a, 0xdf, 0x16, 0x06, 0x99, 0x2f, 0x0c, 0xf2, 0x73,
+	0xc4, 0xbf, 0xe8, 0xf0, 0xdd, 0xec, 0xc2, 0xa8, 0x7d, 0xbf, 0x30, 0x6a, 0x9f, 0xe7, 0x06, 0x9a,
-	0x61, 0x90, 0xb3, 0x85, 0x41, 0xfa, 0x2d, 0xd9, 0xf9, 0xe4, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0xcd, 0x0d, 0xf4, 0x6d, 0x6e, 0xa0, 0xf3, 0xb9, 0x81, 0x5e, 0x1f, 0xff, 0xc5, 0x2f, 0xf4, 0xa0,
-	0x88, 0x7f, 0xdb, 0x9f, 0x48, 0x07, 0x00, 0x00,
+	0xe8, 0xfa, 0x8a, 0x64, 0x7c, 0xf8, 0x33, 0x00, 0x00, 0xff, 0xff, 0xbf, 0xe8, 0x4d, 0xe1, 0x93,
+	0x07, 0x00, 0x00,
 }

api/services/namespaces/v1/namespace.proto

@@ -6,6 +6,8 @@ import "gogoproto/gogo.proto";
 import "google/protobuf/empty.proto";
 import "google/protobuf/field_mask.proto";
 
+option go_package = "github.com/containerd/containerd/api/services/namespaces/v1;namespaces";
+
 // Namespaces provides the ability to manipulate containerd namespaces.
 //
 // All objects in the system are required to be a member of a namespace. If a

api/services/shim/v1/shim.pb.go

@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-gogo.
-// source: github.com/containerd/containerd/api/services/shim/shim.proto
+// source: github.com/containerd/containerd/api/services/shim/v1/shim.proto
 // DO NOT EDIT!
 
 /*
 	Package shim is a generated protocol buffer package.
 
 	It is generated from these files:
-		github.com/containerd/containerd/api/services/shim/shim.proto
+		github.com/containerd/containerd/api/services/shim/v1/shim.proto
 
 	It has these top-level messages:
 		CreateRequest
@@ -845,7 +845,7 @@ var _Shim_serviceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
-	Metadata: "github.com/containerd/containerd/api/services/shim/shim.proto",
+	Metadata: "github.com/containerd/containerd/api/services/shim/v1/shim.proto",
 }
 
 func (m *CreateRequest) Marshal() (dAtA []byte, err error) {
@@ -4486,79 +4486,80 @@ var (
 )
 
 func init() {
-	proto.RegisterFile("github.com/containerd/containerd/api/services/shim/shim.proto", fileDescriptorShim)
+	proto.RegisterFile("github.com/containerd/containerd/api/services/shim/v1/shim.proto", fileDescriptorShim)
 }
 
 var fileDescriptorShim = []byte{
-	// 1114 bytes of a gzipped FileDescriptorProto
+	// 1127 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcd, 0x6f, 0xe3, 0x44,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcd, 0x4f, 0xe3, 0x46,
-	0x14, 0xaf, 0x93, 0x34, 0x4d, 0x5e, 0x9a, 0xd2, 0x8e, 0xaa, 0xca, 0x9b, 0x45, 0x69, 0x65, 0x09,
+	0x14, 0x5f, 0x27, 0x21, 0x24, 0x2f, 0x84, 0xc2, 0x08, 0x21, 0x6f, 0xb6, 0x0a, 0xc8, 0x52, 0x25,
-	0xa9, 0xe2, 0xc3, 0xd9, 0x4d, 0x25, 0x84, 0x2a, 0x90, 0xe8, 0xd7, 0x61, 0xb5, 0xac, 0x1a, 0x5c,
+	0xd4, 0x0f, 0x67, 0x09, 0x52, 0x55, 0xd1, 0x1e, 0x96, 0xaf, 0xc3, 0x6a, 0xbb, 0x22, 0x35, 0x2b,
-	0x24, 0x04, 0x97, 0xca, 0x4d, 0xa6, 0xf1, 0xa8, 0xb6, 0xc7, 0x78, 0xc6, 0xa1, 0xb9, 0x71, 0xe2,
+	0x55, 0xdd, 0x0b, 0x32, 0xc9, 0x10, 0x8f, 0xb0, 0x3d, 0xae, 0x67, 0x9c, 0x92, 0x5b, 0x4f, 0x3d,
-	0x0c, 0x47, 0xee, 0xfc, 0x1f, 0x5c, 0x7b, 0xe4, 0x06, 0xa7, 0x85, 0xed, 0x5f, 0x82, 0xe6, 0xc3,
+	0xb7, 0xc7, 0xde, 0xfb, 0x7f, 0xf4, 0xca, 0xb1, 0xb7, 0xf6, 0xb4, 0xed, 0xf2, 0x97, 0x54, 0xf3,
-	0x8e, 0xd3, 0xd6, 0xc4, 0x5d, 0xed, 0xc5, 0x9a, 0xf7, 0xe6, 0xbd, 0x37, 0xef, 0xe3, 0xf7, 0xde,
+	0x61, 0xc7, 0x01, 0x5c, 0x0c, 0xea, 0x85, 0xcc, 0x7b, 0xf3, 0xde, 0x9b, 0xf7, 0xf1, 0x7b, 0xef,
-	0x33, 0x7c, 0x31, 0x26, 0xdc, 0x4b, 0x2e, 0xec, 0x21, 0x0d, 0x7a, 0x43, 0x1a, 0x72, 0x97, 0x84,
+	0x19, 0x78, 0x31, 0x26, 0xdc, 0x4b, 0xce, 0xec, 0x21, 0x0d, 0x7a, 0x43, 0x1a, 0x72, 0x97, 0x84,
 	0x38, 0x1e, 0xe5, 0x8f, 0x6e, 0x44, 0x7a, 0x0c, 0xc7, 0x13, 0x32, 0xc4, 0xac, 0xc7, 0x3c, 0x12,
-	0xc8, 0x8f, 0x1d, 0xc5, 0x94, 0x53, 0xb4, 0x33, 0x13, 0xb4, 0xe3, 0x24, 0xe4, 0x24, 0xc0, 0xb6,
+	0xf4, 0x26, 0xdb, 0xf2, 0xd7, 0x8e, 0x62, 0xca, 0x29, 0xda, 0x9c, 0xc9, 0xda, 0x71, 0x12, 0x72,
-	0x4f, 0xc2, 0xe4, 0xda, 0x96, 0x42, 0x93, 0xe7, 0x9d, 0x27, 0x63, 0x4a, 0xc7, 0x3e, 0xee, 0x49,
+	0x12, 0x60, 0xdb, 0x27, 0x61, 0x72, 0x69, 0x4b, 0xa1, 0xc9, 0x76, 0xe7, 0xe9, 0x98, 0xd2, 0xb1,
-	0xf9, 0x8b, 0xe4, 0xb2, 0xe7, 0x86, 0x53, 0xa5, 0xdc, 0x79, 0x7a, 0xf7, 0x0a, 0x07, 0x11, 0x4f,
+	0x8f, 0x7b, 0x52, 0xfe, 0x2c, 0x39, 0xef, 0xb9, 0xe1, 0x54, 0x29, 0x77, 0x9e, 0xdd, 0xbc, 0xc2,
-	0x2f, 0x37, 0xc7, 0x74, 0x4c, 0xe5, 0xb1, 0x27, 0x4e, 0x9a, 0xfb, 0x79, 0x29, 0x77, 0xf9, 0x34,
+	0x41, 0xc4, 0xd3, 0xcb, 0xb5, 0x31, 0x1d, 0x53, 0x79, 0xec, 0x89, 0x93, 0xe6, 0x7e, 0x55, 0xca,
-	0xc2, 0xac, 0x17, 0xd0, 0x24, 0xe4, 0xea, 0xab, 0xb5, 0xf7, 0x1f, 0xa1, 0xcd, 0x5d, 0x76, 0x25,
+	0x63, 0x3e, 0x8d, 0x30, 0xeb, 0x05, 0x34, 0x09, 0xb9, 0xfa, 0xab, 0xb5, 0x77, 0x1f, 0xa0, 0xcd,
-	0x3f, 0x5a, 0x77, 0xfb, 0xae, 0xb3, 0x22, 0x56, 0xc6, 0xdd, 0x20, 0x52, 0x02, 0xd6, 0x5f, 0x15,
+	0x5d, 0x76, 0x21, 0xff, 0x68, 0xdd, 0x8d, 0x9b, 0xce, 0x8a, 0x58, 0x19, 0x77, 0x83, 0x48, 0x09,
-	0x68, 0x1f, 0xc5, 0xd8, 0xe5, 0xd8, 0xc1, 0x3f, 0x24, 0x98, 0x71, 0xb4, 0x05, 0x15, 0x32, 0x32,
+	0x58, 0x7f, 0x56, 0xa0, 0x7d, 0x10, 0x63, 0x97, 0x63, 0x07, 0x7f, 0x9f, 0x60, 0xc6, 0xd1, 0x3a,
-	0x8d, 0x1d, 0x63, 0xb7, 0x79, 0x58, 0xbf, 0x7d, 0xbd, 0x5d, 0x79, 0x71, 0xec, 0x54, 0xc8, 0x08,
+	0x54, 0xc8, 0xc8, 0x34, 0x36, 0x8d, 0xad, 0xe6, 0x7e, 0xfd, 0xfa, 0xdd, 0x46, 0xe5, 0xe5, 0xa1,
-	0x6d, 0x41, 0xfd, 0x22, 0x09, 0x47, 0x3e, 0x36, 0x2b, 0xe2, 0xce, 0xd1, 0x14, 0x32, 0x61, 0x45,
+	0x53, 0x21, 0x23, 0xb4, 0x0e, 0xf5, 0xb3, 0x24, 0x1c, 0xf9, 0xd8, 0xac, 0x88, 0x3b, 0x47, 0x53,
-	0xe7, 0xd0, 0xac, 0xca, 0x8b, 0x94, 0x44, 0x4f, 0xa0, 0x11, 0xd2, 0xf3, 0x88, 0x4c, 0x28, 0x37,
+	0xc8, 0x84, 0x45, 0x9d, 0x43, 0xb3, 0x2a, 0x2f, 0x52, 0x12, 0x3d, 0x85, 0x46, 0x48, 0x4f, 0x23,
-	0x6b, 0x3b, 0xc6, 0x6e, 0xc3, 0x59, 0x09, 0xe9, 0x40, 0x90, 0xa8, 0x03, 0x0d, 0x8e, 0xe3, 0x80,
+	0x32, 0xa1, 0xdc, 0xac, 0x6d, 0x1a, 0x5b, 0x0d, 0x67, 0x31, 0xa4, 0x03, 0x41, 0xa2, 0x0e, 0x34,
-	0x84, 0xae, 0x6f, 0x2e, 0xcb, 0xab, 0x8c, 0x46, 0x9b, 0xb0, 0xcc, 0xf8, 0x88, 0x84, 0x66, 0x5d,
+	0x38, 0x8e, 0x03, 0x12, 0xba, 0xbe, 0xb9, 0x20, 0xaf, 0x32, 0x1a, 0xad, 0xc1, 0x02, 0xe3, 0x23,
-	0x9a, 0x53, 0x84, 0x78, 0x9e, 0xf1, 0x11, 0x4d, 0xb8, 0xb9, 0xa2, 0x9e, 0x57, 0x94, 0xe6, 0xe3,
+	0x12, 0x9a, 0x75, 0x69, 0x4e, 0x11, 0xe2, 0x79, 0xc6, 0x47, 0x34, 0xe1, 0xe6, 0xa2, 0x7a, 0x5e,
-	0x38, 0x36, 0x1b, 0x19, 0x1f, 0xc7, 0x31, 0xea, 0x43, 0x3d, 0xa6, 0x94, 0x5f, 0x32, 0xb3, 0xb9,
+	0x51, 0x9a, 0x8f, 0xe3, 0xd8, 0x6c, 0x64, 0x7c, 0x1c, 0xc7, 0xa8, 0x0f, 0xf5, 0x98, 0x52, 0x7e,
-	0x53, 0xdd, 0x6d, 0xf5, 0x3b, 0x76, 0xae, 0xe8, 0x93, 0xe7, 0xb6, 0xcc, 0x97, 0xfd, 0x4a, 0xe4,
+	0xce, 0xcc, 0xe6, 0x66, 0x75, 0xab, 0xd5, 0xef, 0xd8, 0xb9, 0xa2, 0x4f, 0xb6, 0x6d, 0x99, 0x2f,
-	0xd9, 0xd1, 0x92, 0xa8, 0x0b, 0x30, 0xf4, 0xf0, 0xf0, 0x2a, 0xa2, 0x24, 0xe4, 0x26, 0x48, 0x7b,
+	0xfb, 0xb5, 0xc8, 0xb3, 0xa3, 0x25, 0x51, 0x17, 0x60, 0xe8, 0xe1, 0xe1, 0x45, 0x44, 0x49, 0xc8,
-	0x39, 0x0e, 0xfa, 0x08, 0x36, 0x22, 0x37, 0xc6, 0x21, 0x3f, 0xcf, 0x89, 0xb5, 0xa4, 0xd8, 0xba,
+	0x4d, 0x90, 0xf6, 0x72, 0x1c, 0xf4, 0x09, 0xac, 0x46, 0x6e, 0x8c, 0x43, 0x7e, 0x9a, 0x13, 0x6b,
-	0xba, 0x38, 0xca, 0xf8, 0x96, 0x05, 0x6b, 0x69, 0x62, 0x59, 0x44, 0x43, 0x86, 0xd1, 0x3a, 0x54,
+	0x49, 0xb1, 0x15, 0x75, 0x71, 0x90, 0xf1, 0x2d, 0x0b, 0x96, 0xd3, 0xc4, 0xb2, 0x88, 0x86, 0x0c,
-	0x23, 0x9d, 0xda, 0xb6, 0x23, 0x8e, 0xd6, 0x1a, 0xac, 0x9e, 0x71, 0x37, 0xe6, 0x3a, 0xf7, 0xd6,
+	0xa3, 0x15, 0xa8, 0x46, 0x3a, 0xb5, 0x6d, 0x47, 0x1c, 0xad, 0x65, 0x58, 0x3a, 0xe1, 0x6e, 0xcc,
-	0x7b, 0xd0, 0x3e, 0xc6, 0x3e, 0xce, 0x8a, 0x61, 0xfd, 0x6c, 0xc0, 0x5a, 0xca, 0x29, 0xb2, 0x82,
+	0x75, 0xee, 0xad, 0x0f, 0xa0, 0x7d, 0x88, 0x7d, 0x9c, 0x15, 0xc3, 0xfa, 0xc9, 0x80, 0xe5, 0x94,
-	0xb6, 0xa1, 0x85, 0xaf, 0x09, 0x3f, 0x67, 0xdc, 0xe5, 0x09, 0x93, 0xe5, 0x69, 0x3b, 0x20, 0x58,
+	0x53, 0x64, 0x05, 0x6d, 0x40, 0x0b, 0x5f, 0x12, 0x7e, 0xca, 0xb8, 0xcb, 0x13, 0x26, 0xcb, 0xd3,
-	0x67, 0x92, 0x83, 0x0e, 0xa0, 0x29, 0x28, 0x3c, 0x3a, 0x77, 0xb9, 0x2c, 0x92, 0x48, 0x87, 0x42,
+	0x76, 0x40, 0xb0, 0x4e, 0x24, 0x07, 0xed, 0x41, 0x53, 0x50, 0x78, 0x74, 0xea, 0x72, 0x59, 0x24,
-	0x86, 0x9d, 0x22, 0xc3, 0xfe, 0x26, 0x45, 0xc6, 0x61, 0xe3, 0xe6, 0xf5, 0xf6, 0xd2, 0x2f, 0xff,
+	0x91, 0x0e, 0x85, 0x0c, 0x3b, 0x45, 0x86, 0xfd, 0x26, 0x45, 0xc6, 0x7e, 0xe3, 0xea, 0xdd, 0xc6,
-	0x6c, 0x1b, 0x4e, 0x43, 0xa9, 0x1d, 0x70, 0x6b, 0x17, 0x36, 0x95, 0x1f, 0x83, 0x98, 0x0e, 0x31,
+	0x93, 0x9f, 0xff, 0xde, 0x30, 0x9c, 0x86, 0x52, 0xdb, 0xe3, 0xd6, 0x16, 0xac, 0x29, 0x3f, 0x06,
-	0x63, 0x29, 0x5a, 0xee, 0xc7, 0xf4, 0x9b, 0x01, 0xad, 0x93, 0x6b, 0x3c, 0x4c, 0x25, 0xf2, 0xa5,
+	0x31, 0x1d, 0x62, 0xc6, 0x52, 0xb4, 0xdc, 0x8e, 0xe9, 0x57, 0x03, 0x5a, 0x47, 0x97, 0x78, 0x98,
-	0x36, 0x8a, 0x4a, 0x5d, 0x79, 0xb8, 0xd4, 0xd5, 0x82, 0x52, 0xd7, 0xe6, 0x4a, 0xbd, 0x0b, 0x35,
+	0x4a, 0xe4, 0x4b, 0x6d, 0x14, 0x95, 0xba, 0x72, 0x77, 0xa9, 0xab, 0x05, 0xa5, 0xae, 0xcd, 0x95,
-	0x16, 0xe1, 0xa1, 0x04, 0x52, 0xab, 0xbf, 0x79, 0x2f, 0xb2, 0x83, 0x70, 0xea, 0x48, 0x09, 0xeb,
+	0x7a, 0x0b, 0x6a, 0x2c, 0xc2, 0x43, 0x09, 0xa4, 0x56, 0x7f, 0xed, 0x56, 0x64, 0x7b, 0xe1, 0xd4,
-	0x18, 0xea, 0x8e, 0x4f, 0x02, 0xc2, 0x11, 0x82, 0x9a, 0x40, 0x80, 0xc2, 0xb9, 0x23, 0xcf, 0x82,
+	0x91, 0x12, 0xd6, 0x21, 0xd4, 0x1d, 0x9f, 0x04, 0x84, 0x23, 0x04, 0x35, 0x81, 0x00, 0x85, 0x73,
-	0xe7, 0xb9, 0xf1, 0x48, 0x3a, 0x53, 0x73, 0xe4, 0x59, 0xf0, 0x18, 0xbd, 0x54, 0x9e, 0xd4, 0x1c,
+	0x47, 0x9e, 0x05, 0xcf, 0x73, 0xe3, 0x91, 0x74, 0xa6, 0xe6, 0xc8, 0xb3, 0xe0, 0x31, 0x7a, 0xae,
-	0x79, 0xb6, 0x76, 0x60, 0x55, 0x05, 0x58, 0x58, 0xd7, 0xaf, 0x00, 0x06, 0x7c, 0x5a, 0x98, 0x23,
+	0x3c, 0xa9, 0x39, 0xf2, 0x6c, 0x6d, 0xc2, 0x92, 0x0a, 0xb0, 0xb0, 0xae, 0x5f, 0x03, 0x0c, 0xf8,
-	0x11, 0xf7, 0x8f, 0x64, 0xc4, 0x3d, 0x5d, 0x2b, 0x45, 0x88, 0xf8, 0x3c, 0x4c, 0xc6, 0x9e, 0x7a,
+	0xb4, 0x30, 0x47, 0x22, 0xee, 0x1f, 0xc8, 0x88, 0x7b, 0xba, 0x56, 0x8a, 0x10, 0xf1, 0x79, 0x98,
-	0xad, 0xed, 0x68, 0x4a, 0xa0, 0xe2, 0x64, 0x82, 0x43, 0x9e, 0x26, 0x5d, 0xc3, 0x66, 0x86, 0x92,
+	0x8c, 0x3d, 0xf5, 0x5a, 0xdb, 0xd1, 0x94, 0x40, 0xc5, 0xd1, 0x04, 0x87, 0x3c, 0x4d, 0xba, 0x86,
-	0xdf, 0x2b, 0xd0, 0xd6, 0x0c, 0xed, 0xd2, 0x63, 0x9b, 0x58, 0xbb, 0x58, 0x9d, 0xb9, 0xb8, 0x27,
+	0xcd, 0x0c, 0x25, 0xbf, 0x55, 0xa0, 0xad, 0x19, 0xda, 0xa5, 0x87, 0x36, 0xb1, 0x76, 0xb1, 0x3a,
-	0x92, 0x2d, 0xf1, 0x24, 0x92, 0xbd, 0xd6, 0x7f, 0xfa, 0x60, 0xff, 0x28, 0x80, 0x39, 0x5a, 0x14,
+	0x73, 0x71, 0x47, 0x24, 0x5b, 0xe2, 0x49, 0x24, 0x7b, 0xb9, 0xff, 0xec, 0xce, 0xfe, 0x51, 0x00,
-	0xed, 0x43, 0x33, 0x52, 0xf8, 0xc0, 0xcc, 0x5c, 0x96, 0x7d, 0xf7, 0xfe, 0x83, 0x7a, 0x29, 0x8a,
+	0x73, 0xb4, 0x28, 0xda, 0x85, 0x66, 0xa4, 0xf0, 0x81, 0x99, 0xb9, 0x20, 0xfb, 0xee, 0xc3, 0x3b,
-	0x66, 0xe2, 0xef, 0xa8, 0xed, 0xf3, 0x68, 0x6b, 0xce, 0xa3, 0x4d, 0xa4, 0x6d, 0xe0, 0x26, 0x0c,
+	0xf5, 0x52, 0x14, 0xcd, 0xc4, 0xff, 0xa7, 0xb6, 0xcf, 0xa3, 0xad, 0x39, 0x8f, 0x36, 0x91, 0xb6,
-	0xe7, 0xba, 0xcd, 0xc1, 0x2c, 0x09, 0x32, 0x46, 0x5b, 0x20, 0x97, 0x64, 0xdd, 0xf8, 0x02, 0x5a,
+	0x81, 0x9b, 0x30, 0x9c, 0xeb, 0x36, 0x07, 0xb3, 0x24, 0xc8, 0x18, 0x6d, 0x81, 0x5c, 0x92, 0x75,
-	0x2f, 0x89, 0xef, 0xcf, 0x06, 0x63, 0x9d, 0x91, 0x71, 0x0a, 0xe3, 0xb6, 0xa3, 0x29, 0x91, 0x3b,
+	0xe3, 0x4b, 0x68, 0xbd, 0x22, 0xbe, 0x3f, 0x1b, 0x8c, 0x75, 0x46, 0xc6, 0x29, 0x8c, 0xdb, 0x8e,
-	0xd7, 0xf7, 0x65, 0x42, 0x1b, 0x8e, 0x38, 0xde, 0xcf, 0xa6, 0xf5, 0x01, 0x6c, 0x1c, 0xf9, 0x94,
+	0xa6, 0x44, 0xee, 0x5c, 0xdf, 0x97, 0x09, 0x6d, 0x38, 0xe2, 0x78, 0x3b, 0x9b, 0xd6, 0x47, 0xb0,
-	0xe1, 0x33, 0x11, 0x54, 0x71, 0xef, 0x7c, 0x08, 0xeb, 0x83, 0x34, 0x21, 0x0b, 0xe6, 0xb1, 0x75,
+	0x7a, 0xe0, 0x53, 0x86, 0x4f, 0x44, 0x50, 0xc5, 0xbd, 0xf3, 0x31, 0xac, 0x0c, 0xd2, 0x84, 0xdc,
-	0x0a, 0x1b, 0x39, 0x59, 0x5d, 0xf7, 0xb9, 0x02, 0x18, 0x8f, 0x2a, 0x80, 0xf5, 0x87, 0x01, 0x1b,
+	0x33, 0x8f, 0xad, 0x63, 0x58, 0xcd, 0xc9, 0xea, 0xba, 0xcf, 0x15, 0xc0, 0x78, 0x50, 0x01, 0xac,
-	0xb3, 0xf9, 0x95, 0x3e, 0x8f, 0xa0, 0x16, 0xb9, 0xdc, 0x4b, 0x1b, 0x45, 0x9c, 0xd1, 0xf7, 0xb0,
+	0xdf, 0x0d, 0x58, 0x9d, 0xcd, 0xaf, 0xf4, 0x79, 0x04, 0xb5, 0xc8, 0xe5, 0x5e, 0xda, 0x28, 0xe2,
-	0x42, 0x23, 0x4e, 0x68, 0x28, 0x86, 0x8d, 0x78, 0xe3, 0x4b, 0x7b, 0xd1, 0x46, 0xb5, 0xef, 0x59,
+	0x8c, 0xde, 0xc2, 0x22, 0x8d, 0x38, 0xa1, 0xa1, 0x18, 0x36, 0xe2, 0x8d, 0x17, 0xf6, 0x7d, 0x1b,
-	0xb6, 0x4f, 0x95, 0x89, 0x93, 0x90, 0xc7, 0x53, 0x27, 0x35, 0xd8, 0xd9, 0x87, 0xd5, 0xfc, 0x85,
+	0xd5, 0xbe, 0x65, 0xd9, 0x3e, 0x56, 0x26, 0x8e, 0x42, 0x1e, 0x4f, 0x9d, 0xd4, 0x60, 0x67, 0x17,
-	0x48, 0xd2, 0x15, 0x9e, 0xea, 0xe7, 0xc5, 0x51, 0x00, 0x65, 0xe2, 0xfa, 0x49, 0x0a, 0x61, 0x45,
+	0x96, 0xf2, 0x17, 0x22, 0x49, 0x17, 0x78, 0xaa, 0x9f, 0x17, 0x47, 0x01, 0x94, 0x89, 0xeb, 0x27,
-	0xec, 0x57, 0x3e, 0x33, 0xfa, 0xbf, 0xb6, 0xa0, 0x76, 0xe6, 0x91, 0x00, 0x5d, 0x41, 0x5d, 0xcd,
+	0x29, 0x84, 0x15, 0xb1, 0x5b, 0xf9, 0xc2, 0xe8, 0xff, 0xd2, 0x82, 0xda, 0x89, 0x47, 0x02, 0x74,
-	0x5e, 0xd4, 0x2b, 0xe1, 0x59, 0x7e, 0xfd, 0x75, 0x9e, 0x95, 0x57, 0xd0, 0x39, 0x3f, 0x85, 0x65,
+	0x01, 0x75, 0x35, 0x7b, 0x51, 0xaf, 0x84, 0x67, 0xf9, 0xf5, 0xd7, 0x79, 0x5e, 0x5e, 0x41, 0xe7,
-	0x39, 0xc4, 0x91, 0xbd, 0x58, 0x35, 0x3f, 0xed, 0x3b, 0x5b, 0xf7, 0x26, 0xd5, 0x89, 0xf8, 0x95,
+	0xfc, 0x18, 0x16, 0xe4, 0x10, 0x47, 0xf6, 0xfd, 0xaa, 0xf9, 0x69, 0xdf, 0x59, 0xbf, 0x35, 0xa9,
-	0x10, 0xde, 0xab, 0x59, 0x5b, 0xc6, 0xfb, 0xb9, 0x7d, 0x51, 0xc6, 0xfb, 0x3b, 0xeb, 0x64, 0x9a,
+	0x8e, 0xc4, 0xa7, 0x84, 0xf0, 0x5e, 0xcd, 0xda, 0x32, 0xde, 0xcf, 0xed, 0x8b, 0x32, 0xde, 0xdf,
-	0xae, 0x1c, 0x8d, 0x08, 0xf4, 0x69, 0x59, 0x13, 0xf3, 0x9b, 0xe0, 0x2d, 0x9e, 0xf6, 0x64, 0xe2,
+	0x58, 0x27, 0xd3, 0x74, 0xe5, 0x68, 0x44, 0xa0, 0xcf, 0xcb, 0x9a, 0x98, 0xdf, 0x04, 0x8f, 0x78,
-	0x38, 0x2e, 0x99, 0xb8, 0x59, 0x94, 0xbd, 0xd2, 0xf2, 0xfa, 0x25, 0x0e, 0xcd, 0xac, 0x57, 0x50,
+	0xda, 0x93, 0x89, 0xe3, 0xb8, 0x64, 0xe2, 0x66, 0x51, 0xf6, 0x4a, 0xcb, 0xeb, 0x97, 0x38, 0x34,
-	0x7f, 0xb1, 0xf6, 0xdd, 0x26, 0xec, 0xec, 0x3d, 0x4a, 0x67, 0x06, 0x0c, 0x39, 0x6f, 0xca, 0xc4,
+	0xb3, 0x5e, 0x41, 0xfd, 0xfb, 0xb5, 0x6f, 0x36, 0x61, 0x67, 0xe7, 0x41, 0x3a, 0x33, 0x60, 0xc8,
-	0x97, 0x1f, 0x4c, 0x85, 0xc0, 0xf8, 0x1a, 0xea, 0x6a, 0x60, 0x95, 0x01, 0xc6, 0xdc, 0x68, 0x2b,
+	0x79, 0x53, 0x26, 0xbe, 0xfc, 0x60, 0x2a, 0x04, 0xc6, 0x37, 0x50, 0x57, 0x03, 0xab, 0x0c, 0x30,
-	0x34, 0xf9, 0x1d, 0xc0, 0xac, 0x33, 0xd1, 0xde, 0x5b, 0xf4, 0x71, 0xa1, 0xe9, 0x57, 0x50, 0x13,
+	0xe6, 0x46, 0x5b, 0xa1, 0xc9, 0xef, 0x00, 0x66, 0x9d, 0x89, 0x76, 0x1e, 0xd1, 0xc7, 0x85, 0xa6,
-	0xd3, 0x14, 0x7d, 0xb2, 0xd8, 0x68, 0x6e, 0xea, 0x16, 0x9a, 0xfb, 0x16, 0xea, 0x6a, 0x0b, 0x96,
+	0x5f, 0x43, 0x4d, 0x4c, 0x53, 0xf4, 0xd9, 0xfd, 0x46, 0x73, 0x53, 0xb7, 0xd0, 0xdc, 0xb7, 0x50,
-	0x09, 0x7e, 0x6e, 0x5f, 0x76, 0x1e, 0xfe, 0xf7, 0x93, 0x32, 0xcf, 0x0c, 0xe1, 0xa7, 0x18, 0xf3,
+	0x57, 0x5b, 0xb0, 0x4c, 0xf0, 0x73, 0xfb, 0xb2, 0x73, 0xf7, 0xb7, 0x9f, 0x94, 0x79, 0x6e, 0x08,
-	0x65, 0xfc, 0xcc, 0xad, 0x83, 0x42, 0x3f, 0xb1, 0x08, 0x1b, 0x0f, 0xcb, 0x85, 0x9d, 0xfd, 0x26,
+	0x3f, 0xc5, 0x98, 0x2f, 0xe3, 0x67, 0x6e, 0x1d, 0x14, 0xfa, 0x89, 0x45, 0xd8, 0x78, 0x58, 0x2e,
-	0x75, 0xec, 0xb2, 0xe2, 0x1a, 0x5c, 0x2f, 0xa1, 0x3a, 0xe0, 0x53, 0xf4, 0x71, 0x09, 0x68, 0x65,
+	0xec, 0xec, 0x33, 0xa9, 0x63, 0x97, 0x15, 0xd7, 0xe0, 0x7a, 0x05, 0xd5, 0x01, 0x9f, 0xa2, 0x4f,
-	0x7f, 0x22, 0xff, 0x8b, 0x82, 0x6c, 0x3d, 0x95, 0x42, 0xc1, 0xdd, 0x65, 0x56, 0x64, 0xfa, 0xd0,
+	0x4b, 0x40, 0x2b, 0xfb, 0x12, 0xf9, 0x4f, 0x14, 0x64, 0xeb, 0xa9, 0x14, 0x0a, 0x6e, 0x2e, 0xb3,
-	0xbc, 0x79, 0xd3, 0x5d, 0xfa, 0xfb, 0x4d, 0x77, 0xe9, 0xa7, 0xdb, 0xae, 0x71, 0x73, 0xdb, 0x35,
+	0x22, 0xd3, 0xfb, 0x6f, 0xae, 0xde, 0x77, 0x9f, 0xfc, 0xf5, 0xbe, 0xfb, 0xe4, 0xc7, 0xeb, 0xae,
-	0xfe, 0xbc, 0xed, 0x1a, 0xff, 0xde, 0x76, 0x8d, 0x8b, 0xba, 0x94, 0xdc, 0xfb, 0x2f, 0x00, 0x00,
+	0x71, 0x75, 0xdd, 0x35, 0xfe, 0xb8, 0xee, 0x1a, 0xff, 0x5c, 0x77, 0x8d, 0xb7, 0xbb, 0x8f, 0xfa,
-	0xff, 0xff, 0xc6, 0xa3, 0x7c, 0xe5, 0xcd, 0x0d, 0x00, 0x00,
+	0x3f, 0xee, 0x4b, 0xf1, 0x7b, 0x56, 0x97, 0xaf, 0xec, 0xfc, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x99,
+	0x1c, 0x92, 0x1a, 0x0c, 0x0e, 0x00, 0x00,
 }

api/services/shim/v1/shim.proto

@@ -9,6 +9,8 @@ import "github.com/containerd/containerd/api/types/mount/mount.proto";
 import "github.com/containerd/containerd/api/types/task/task.proto";
 import "google/protobuf/timestamp.proto";
 
+option go_package = "github.com/containerd/containerd/api/services/shim/v1;shim";
+
 // Shim service is launched for each container and is responsible for owning the IO
 // for the container and its additional processes.  The shim is also the parent of
 // each container and allows reattaching to the IO and receiving the exit status

api/services/snapshot/v1/snapshots.pb.go

@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-gogo.
-// source: github.com/containerd/containerd/api/services/snapshot/snapshots.proto
+// source: github.com/containerd/containerd/api/services/snapshot/v1/snapshots.proto
 // DO NOT EDIT!
 
 /*
 	Package snapshot is a generated protocol buffer package.
 
 	It is generated from these files:
-		github.com/containerd/containerd/api/services/snapshot/snapshots.proto
+		github.com/containerd/containerd/api/services/snapshot/v1/snapshots.proto
 
 	It has these top-level messages:
 		PrepareSnapshotRequest
@@ -549,7 +549,7 @@ var _Snapshots_serviceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
-	Metadata: "github.com/containerd/containerd/api/services/snapshot/snapshots.proto",
+	Metadata: "github.com/containerd/containerd/api/services/snapshot/v1/snapshots.proto",
 }
 
 func (m *PrepareSnapshotRequest) Marshal() (dAtA []byte, err error) {
@@ -2790,54 +2790,55 @@ var (
 )
 
 func init() {
-	proto.RegisterFile("github.com/containerd/containerd/api/services/snapshot/snapshots.proto", fileDescriptorSnapshots)
+	proto.RegisterFile("github.com/containerd/containerd/api/services/snapshot/v1/snapshots.proto", fileDescriptorSnapshots)
 }
 
 var fileDescriptorSnapshots = []byte{
-	// 710 bytes of a gzipped FileDescriptorProto
+	// 725 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4b, 0x6f, 0xd3, 0x4e,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xcf, 0x52, 0xd3, 0x5e,
-	0x10, 0x8f, 0x1b, 0xff, 0xd3, 0x76, 0xfa, 0x50, 0xff, 0xdb, 0x34, 0x44, 0x46, 0x32, 0xc6, 0x07,
+	0x14, 0x6e, 0x68, 0x7e, 0x05, 0x0e, 0x7f, 0x86, 0xdf, 0xa5, 0xd4, 0x4e, 0x9c, 0x89, 0x31, 0x0b,
-	0x08, 0x1c, 0xec, 0x36, 0x08, 0xca, 0x53, 0xd0, 0x17, 0x52, 0x29, 0x11, 0xc8, 0x2d, 0x15, 0x3d,
+	0xad, 0x2e, 0x12, 0xa8, 0xa3, 0xa8, 0xe8, 0x28, 0x05, 0x16, 0x15, 0x3b, 0x3a, 0x01, 0x19, 0x71,
-	0xba, 0xc9, 0x36, 0xb5, 0x5a, 0x7b, 0x4d, 0x76, 0x13, 0x14, 0x0e, 0x08, 0x6e, 0xa8, 0xdf, 0xa1,
+	0xdc, 0x84, 0xf6, 0x52, 0x32, 0x90, 0xdc, 0xd8, 0x7b, 0x5b, 0xa7, 0x2e, 0x1c, 0xdd, 0x39, 0xbc,
-	0x27, 0xf8, 0x14, 0x7c, 0x82, 0x1e, 0x39, 0x72, 0x42, 0x34, 0x9f, 0x04, 0xed, 0x7a, 0x93, 0xbe,
+	0x03, 0x2b, 0x7d, 0x0a, 0x9f, 0x80, 0xa5, 0x4b, 0x57, 0x8e, 0xf4, 0x49, 0x9c, 0xdc, 0xdc, 0x16,
-	0x1c, 0xd9, 0x4d, 0x2f, 0xd1, 0xec, 0xe6, 0xf7, 0x18, 0xcf, 0x78, 0xc6, 0xf0, 0xb2, 0xee, 0xb1,
+	0x0a, 0xe9, 0x24, 0x94, 0x4d, 0xe7, 0xdc, 0x93, 0xf3, 0x7d, 0xdf, 0xc9, 0x39, 0x39, 0xe7, 0x16,
-	0xdd, 0xe6, 0xb6, 0x55, 0x25, 0xbe, 0x5d, 0x25, 0x01, 0x73, 0xbd, 0x00, 0x37, 0x6a, 0xa7, 0x43,
+	0xca, 0x75, 0x87, 0xed, 0x35, 0x77, 0x8c, 0x2a, 0x71, 0xcd, 0x2a, 0xf1, 0x98, 0xed, 0x78, 0xb8,
-	0x37, 0xf4, 0x6c, 0x8a, 0x1b, 0x2d, 0xaf, 0x8a, 0xa9, 0x4d, 0x03, 0x37, 0xa4, 0xbb, 0x84, 0xf5,
+	0x51, 0x3b, 0x6b, 0xda, 0xbe, 0x63, 0x52, 0xdc, 0x68, 0x39, 0x55, 0x4c, 0x4d, 0xea, 0xd9, 0x3e,
-	0x02, 0x6a, 0x85, 0x0d, 0xc2, 0x08, 0x32, 0x4e, 0x18, 0x56, 0x17, 0x6d, 0x9d, 0x80, 0x5a, 0x73,
+	0xdd, 0x23, 0xcc, 0x6c, 0x2d, 0xf4, 0x6c, 0x6a, 0xf8, 0x0d, 0xc2, 0x08, 0xd2, 0x4e, 0x41, 0x46,
-	0x5a, 0xbe, 0x4e, 0xea, 0x44, 0x80, 0x6d, 0x1e, 0x45, 0x3c, 0xed, 0x7a, 0x9d, 0x90, 0xfa, 0x3e,
+	0x17, 0x60, 0x9c, 0x06, 0xb5, 0x16, 0x94, 0x6c, 0x9d, 0xd4, 0x09, 0x0f, 0x36, 0x03, 0x2b, 0xc4,
-	0xb6, 0xc5, 0x69, 0xbb, 0xb9, 0x63, 0x63, 0x3f, 0x64, 0x6d, 0xf9, 0xe7, 0xd3, 0x54, 0xc9, 0xb1,
+	0x29, 0xd7, 0xeb, 0x84, 0xd4, 0x0f, 0xb0, 0xc9, 0x4f, 0x3b, 0xcd, 0x5d, 0x13, 0xbb, 0x3e, 0x6b,
-	0x76, 0x88, 0xa9, 0xed, 0x93, 0x66, 0xc0, 0xa2, 0xdf, 0x88, 0x6d, 0x2e, 0x42, 0xe1, 0x6d, 0x03,
+	0x8b, 0x87, 0x4f, 0x12, 0xe5, 0xc7, 0xda, 0x3e, 0xa6, 0xa6, 0x4b, 0x9a, 0x1e, 0x0b, 0x7f, 0x43,
-	0x87, 0x6e, 0x03, 0xaf, 0xcb, 0x3c, 0x1c, 0xfc, 0xa1, 0x89, 0x29, 0x43, 0x53, 0x90, 0xdd, 0xc3,
+	0xb4, 0x5e, 0x82, 0xdc, 0xeb, 0x06, 0xf6, 0xed, 0x06, 0xde, 0x10, 0x79, 0x58, 0xf8, 0x43, 0x13,
-	0xed, 0xa2, 0x62, 0x28, 0xa5, 0x51, 0x87, 0x87, 0xa8, 0x00, 0x39, 0x0e, 0x0c, 0x58, 0x71, 0x48,
+	0x53, 0x86, 0x66, 0x20, 0xbd, 0x8f, 0xdb, 0x79, 0x49, 0x93, 0x0a, 0xe3, 0x56, 0x60, 0xa2, 0x1c,
-	0x5c, 0xca, 0x93, 0x59, 0x81, 0x6b, 0x17, 0x34, 0x68, 0x48, 0x02, 0x8a, 0x51, 0x19, 0x72, 0xc2,
+	0x64, 0x82, 0x40, 0x8f, 0xe5, 0x47, 0xb8, 0x53, 0x9c, 0xf4, 0x0a, 0x5c, 0xbb, 0xc0, 0x41, 0x7d,
-	0x8d, 0x16, 0x15, 0x23, 0x5b, 0x1a, 0x2b, 0x6b, 0xd6, 0xa9, 0x12, 0xb4, 0xe6, 0x2c, 0x91, 0x96,
+	0xe2, 0x51, 0x8c, 0x8a, 0x90, 0xe1, 0x6a, 0x34, 0x2f, 0x69, 0xe9, 0xc2, 0x44, 0x51, 0x31, 0xce,
-	0x55, 0xe1, 0x10, 0x47, 0x22, 0xcd, 0xe7, 0x30, 0xbd, 0xe9, 0xe1, 0x8f, 0x83, 0xe7, 0xf3, 0x0a,
+	0x94, 0xa0, 0xb5, 0x60, 0xf0, 0xb4, 0x8c, 0x4a, 0x10, 0x62, 0x89, 0x48, 0xfd, 0x19, 0xcc, 0x6e,
-	0xf2, 0x67, 0x05, 0xae, 0x90, 0xcc, 0x4d, 0x98, 0x10, 0x17, 0xb4, 0x6f, 0x1a, 0xe6, 0x32, 0x4c,
+	0x39, 0xf8, 0xe3, 0xf0, 0xf9, 0xbc, 0x80, 0x6c, 0x3f, 0xc1, 0x15, 0x92, 0xb9, 0x09, 0x53, 0xdc,
-	0x76, 0x21, 0x57, 0x30, 0xba, 0x03, 0x33, 0x0e, 0xf6, 0x49, 0x2b, 0xb9, 0x0f, 0xe6, 0x33, 0x98,
+	0x41, 0x07, 0xa6, 0xa1, 0xaf, 0xc2, 0x74, 0x37, 0xe4, 0x0a, 0x42, 0x77, 0x60, 0xce, 0xc2, 0x2e,
-	0x59, 0x22, 0xbe, 0xef, 0xb1, 0xf3, 0x50, 0x04, 0x6a, 0xe0, 0xfa, 0x58, 0x62, 0x45, 0xdc, 0xa5,
+	0x69, 0xc5, 0xf7, 0x41, 0x7f, 0x0a, 0x73, 0x2b, 0xc4, 0x75, 0x1d, 0x76, 0x3e, 0x14, 0x81, 0xec,
-	0x0f, 0x9d, 0xd0, 0x6f, 0xc3, 0xf4, 0x3a, 0x73, 0x59, 0xb2, 0xcf, 0x81, 0x02, 0xea, 0x6a, 0xb0,
+	0xd9, 0x2e, 0x16, 0xb1, 0xdc, 0xee, 0xc2, 0x47, 0x4e, 0xe1, 0xb7, 0x61, 0x76, 0x83, 0xd9, 0x2c,
-	0x43, 0x62, 0x75, 0xfb, 0x14, 0x1f, 0x3d, 0x06, 0x75, 0xcf, 0x0b, 0x6a, 0xc5, 0xac, 0xa1, 0x94,
+	0x5e, 0xe7, 0x50, 0x02, 0xb9, 0xec, 0xed, 0x92, 0x48, 0xde, 0x01, 0xc5, 0x47, 0x8f, 0x41, 0xde,
-	0x26, 0xcb, 0xb7, 0xac, 0xa4, 0x57, 0xde, 0x5a, 0xf3, 0x82, 0x9a, 0x23, 0x38, 0x48, 0x83, 0x91,
+	0x77, 0xbc, 0x5a, 0x3e, 0xad, 0x49, 0x85, 0xe9, 0xe2, 0x2d, 0x23, 0xee, 0x93, 0x37, 0xd6, 0x1d,
-	0x06, 0x76, 0x6b, 0x24, 0xd8, 0x6f, 0x17, 0x55, 0x43, 0x29, 0x8d, 0x38, 0xbd, 0xb3, 0xf9, 0x1e,
+	0xaf, 0x66, 0x71, 0x0c, 0x52, 0x60, 0xac, 0x81, 0xed, 0x1a, 0xf1, 0x0e, 0xda, 0x79, 0x59, 0x93,
-	0xf2, 0x67, 0xb3, 0x96, 0xb5, 0x7e, 0x01, 0xaa, 0x17, 0xec, 0x10, 0x91, 0xdb, 0x58, 0x1a, 0x3f,
+	0x0a, 0x63, 0x56, 0xef, 0xac, 0xbf, 0x85, 0x6c, 0x7f, 0xd6, 0xa2, 0xd6, 0xcf, 0x41, 0x76, 0xbc,
-	0xfe, 0x44, 0x8b, 0xea, 0xd1, 0x9f, 0x1b, 0x19, 0x47, 0x30, 0xcd, 0x02, 0xe4, 0x5f, 0x7b, 0xb4,
+	0x5d, 0xc2, 0x73, 0x9b, 0x48, 0xa2, 0x17, 0xbc, 0x51, 0x49, 0x3e, 0xfe, 0x73, 0x23, 0x65, 0x71,
-	0xa7, 0xdc, 0xed, 0xb4, 0xb9, 0x05, 0x33, 0xe7, 0xee, 0x2f, 0x58, 0x66, 0x07, 0xb4, 0x34, 0x60,
+	0xa4, 0x9e, 0x83, 0xec, 0x4b, 0x87, 0xf6, 0x98, 0xbb, 0x9d, 0xd6, 0xb7, 0x61, 0xee, 0x9c, 0xff,
-	0xfc, 0x1d, 0x75, 0xeb, 0xb8, 0x7f, 0xed, 0x9f, 0xc0, 0x84, 0x44, 0x48, 0x53, 0x04, 0x2a, 0xf5,
+	0x82, 0x64, 0x7a, 0x48, 0x49, 0x0d, 0x26, 0xdf, 0x50, 0xbb, 0x8e, 0x07, 0xd7, 0x7e, 0x09, 0xa6,
-	0x3e, 0x45, 0x3d, 0xc8, 0x3a, 0x22, 0xe6, 0x3d, 0xf0, 0x02, 0x52, 0xc3, 0x54, 0xf4, 0x20, 0xeb,
+	0x44, 0x84, 0x10, 0x45, 0x20, 0x53, 0xe7, 0x53, 0xd8, 0x83, 0xb4, 0xc5, 0xed, 0xa0, 0x07, 0x8e,
-	0xc8, 0xd3, 0x5d, 0x07, 0xd4, 0xb5, 0xa8, 0x9e, 0xb9, 0x85, 0xa5, 0x8d, 0xd5, 0xcd, 0x95, 0xa9,
+	0x47, 0x6a, 0x98, 0xf2, 0x1e, 0xa4, 0x2d, 0x71, 0xba, 0x6b, 0x81, 0xbc, 0x1e, 0xd6, 0x33, 0xb3,
-	0x8c, 0x36, 0x79, 0x70, 0x68, 0x00, 0xbf, 0x5d, 0xa8, 0x32, 0xaf, 0x85, 0x91, 0x01, 0xa3, 0x4b,
+	0xbc, 0xb2, 0x59, 0xde, 0x5a, 0x9b, 0x49, 0x29, 0xd3, 0x87, 0x47, 0x1a, 0x04, 0xde, 0xe5, 0x2a,
-	0x6f, 0x2a, 0x95, 0xd5, 0x8d, 0x8d, 0x95, 0xe5, 0x29, 0x45, 0xfb, 0xff, 0xe0, 0xd0, 0x98, 0xe0,
+	0x73, 0x5a, 0x18, 0x69, 0x30, 0xbe, 0xf2, 0xaa, 0x52, 0x29, 0x6f, 0x6e, 0xae, 0xad, 0xce, 0x48,
-	0x7f, 0x47, 0x6f, 0x16, 0xc3, 0x35, 0x6d, 0xfc, 0xdb, 0x77, 0x3d, 0xf3, 0xf3, 0x87, 0x2e, 0xb4,
+	0xca, 0xff, 0x87, 0x47, 0xda, 0x54, 0xf0, 0x38, 0xfc, 0xb2, 0x18, 0xae, 0x29, 0x93, 0xdf, 0xbe,
-	0xca, 0x5f, 0x87, 0x61, 0xb4, 0x57, 0x0a, 0xf4, 0x19, 0x86, 0xe5, 0xc8, 0xa3, 0x87, 0xc9, 0xcf,
+	0xab, 0xa9, 0x9f, 0x3f, 0x54, 0xce, 0x55, 0xfc, 0x3a, 0x0a, 0xe3, 0xbd, 0x52, 0xa0, 0xcf, 0x30,
-	0x1f, 0xbf, 0x61, 0xb4, 0x47, 0x03, 0x30, 0x65, 0x35, 0x9a, 0xa0, 0xf2, 0x11, 0x47, 0xf7, 0x93,
+	0x2a, 0x46, 0x1e, 0x3d, 0x8c, 0x7f, 0xff, 0xe8, 0x0d, 0xa3, 0x3c, 0x1a, 0x02, 0x29, 0xaa, 0xd1,
-	0x25, 0x62, 0x76, 0x89, 0xf6, 0xe0, 0xb2, 0x34, 0x69, 0xbb, 0x07, 0xb9, 0x68, 0xd4, 0x91, 0x9d,
+	0x04, 0x39, 0x18, 0x71, 0x74, 0x3f, 0x9e, 0x22, 0x62, 0x97, 0x28, 0x0f, 0x2e, 0x0b, 0x13, 0xb2,
-	0xac, 0x70, 0x66, 0x6f, 0x68, 0xb3, 0xe9, 0x09, 0xd2, 0x6c, 0x0b, 0x72, 0x51, 0x33, 0xd0, 0x7c,
+	0xfb, 0x90, 0x09, 0x47, 0x1d, 0x99, 0xf1, 0x0c, 0x7d, 0x7b, 0x43, 0x99, 0x4f, 0x0e, 0x10, 0x62,
-	0x32, 0x37, 0x76, 0x21, 0x68, 0x05, 0x2b, 0xfa, 0x72, 0x58, 0xdd, 0x2f, 0x87, 0xb5, 0xc2, 0xbf,
+	0xdb, 0x90, 0x09, 0x9b, 0x81, 0x16, 0xe3, 0xb1, 0x91, 0x0b, 0x41, 0xc9, 0x19, 0xe1, 0xcd, 0x61,
-	0x1c, 0x5c, 0x3a, 0x5a, 0x36, 0x69, 0xa4, 0x63, 0xd7, 0x52, 0x5f, 0xe9, 0x26, 0xa8, 0x7c, 0x4e,
+	0x74, 0x6f, 0x0e, 0x63, 0x2d, 0xb8, 0x39, 0x02, 0xea, 0x70, 0xd9, 0x24, 0xa1, 0x8e, 0x5c, 0x4b,
-	0xd3, 0x74, 0x26, 0x66, 0x0b, 0xa5, 0xe9, 0x4c, 0xec, 0x1a, 0x68, 0x83, 0xca, 0x87, 0x15, 0xa5,
+	0x03, 0xa9, 0x9b, 0x20, 0x07, 0x73, 0x9a, 0xa4, 0x33, 0x11, 0x5b, 0x28, 0x49, 0x67, 0x22, 0xd7,
-	0xe0, 0xc7, 0x0d, 0xbb, 0x36, 0x7f, 0x69, 0x5e, 0x64, 0x3c, 0xab, 0xa0, 0x5d, 0xf8, 0x4f, 0x8c,
+	0x40, 0x1b, 0xe4, 0x60, 0x58, 0x51, 0x02, 0x7c, 0xd4, 0xb0, 0x2b, 0x8b, 0x97, 0xc6, 0x85, 0xc2,
-	0x2a, 0xb2, 0x92, 0x35, 0x4e, 0x4f, 0xbd, 0x66, 0xa7, 0xc6, 0x47, 0x5e, 0x8b, 0xc5, 0xa3, 0x63,
+	0xf3, 0x12, 0xda, 0x83, 0xff, 0xf8, 0xa8, 0x22, 0x23, 0x9e, 0xe3, 0xec, 0xd4, 0x2b, 0x66, 0xe2,
-	0x3d, 0xf3, 0xfb, 0x58, 0xcf, 0x7c, 0xe9, 0xe8, 0xca, 0x51, 0x47, 0x57, 0x7e, 0x75, 0x74, 0xe5,
+	0xf8, 0x50, 0xab, 0xf4, 0xfe, 0xf8, 0x44, 0x4d, 0xfd, 0x3e, 0x51, 0x53, 0x5f, 0x3a, 0xaa, 0x74,
-	0x6f, 0x47, 0x57, 0xb6, 0x73, 0xa2, 0x0b, 0xf7, 0xfe, 0x05, 0x00, 0x00, 0xff, 0xff, 0xa9, 0xee,
+	0xdc, 0x51, 0xa5, 0x5f, 0x1d, 0x55, 0xfa, 0xdb, 0x51, 0xa5, 0x77, 0xa5, 0xa1, 0xff, 0xa4, 0x2c,
-	0xc9, 0x12, 0xaa, 0x08, 0x00, 0x00,
+	0x75, 0xed, 0x9d, 0x0c, 0xef, 0xe4, 0xbd, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x22, 0x50, 0x02,
+	0x42, 0xf1, 0x08, 0x00, 0x00,
 }

api/services/snapshot/v1/snapshots.proto

@@ -6,6 +6,8 @@ import "gogoproto/gogo.proto";
 import "google/protobuf/empty.proto";
 import "github.com/containerd/containerd/api/types/mount/mount.proto";
 
+option go_package = "github.com/containerd/containerd/api/services/snapshot/v1;snapshot";
+
 // Snapshot service manages snapshots
 service Snapshots {
 	rpc Prepare(PrepareSnapshotRequest) returns (PrepareSnapshotResponse);

api/services/tasks/v1/tasks.pb.go

@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-gogo.
-// source: github.com/containerd/containerd/api/services/tasks/tasks.proto
+// source: github.com/containerd/containerd/api/services/tasks/v1/tasks.proto
 // DO NOT EDIT!
 
 /*
 	Package tasks is a generated protocol buffer package.
 
 	It is generated from these files:
-		github.com/containerd/containerd/api/services/tasks/tasks.proto
+		github.com/containerd/containerd/api/services/tasks/v1/tasks.proto
 
 	It has these top-level messages:
 		CreateTaskRequest
@@ -918,7 +918,7 @@ var _Tasks_serviceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "github.com/containerd/containerd/api/services/tasks/tasks.proto",
+	Metadata: "github.com/containerd/containerd/api/services/tasks/v1/tasks.proto",
 }
 
 func (m *CreateTaskRequest) Marshal() (dAtA []byte, err error) {
@@ -4760,83 +4760,84 @@ var (
 )
 
 func init() {
-	proto.RegisterFile("github.com/containerd/containerd/api/services/tasks/tasks.proto", fileDescriptorTasks)
+	proto.RegisterFile("github.com/containerd/containerd/api/services/tasks/v1/tasks.proto", fileDescriptorTasks)
 }
 
 var fileDescriptorTasks = []byte{
-	// 1178 bytes of a gzipped FileDescriptorProto
+	// 1192 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4b, 0x53, 0xe3, 0xc6,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0x4b, 0x53, 0xdb, 0xd6,
-	0x13, 0x47, 0x7e, 0xad, 0x69, 0x2f, 0x2c, 0xcc, 0x9f, 0xa5, 0xbc, 0xfa, 0x6f, 0xd9, 0x94, 0x2e,
+	0x17, 0x47, 0x7e, 0xc5, 0x1c, 0x87, 0x04, 0xf4, 0x27, 0x8c, 0xa3, 0x7f, 0xc6, 0x66, 0xb4, 0xa9,
-	0x71, 0xb6, 0x82, 0x1c, 0x4c, 0x0e, 0x29, 0x2a, 0x55, 0xbb, 0x80, 0x59, 0x42, 0x1e, 0x05, 0x11,
+	0x9b, 0x69, 0xa4, 0xe2, 0x74, 0xd1, 0xa1, 0x99, 0x69, 0x00, 0x13, 0x4a, 0x1f, 0x03, 0x15, 0x99,
-	0x7b, 0xda, 0xa4, 0xca, 0x25, 0xac, 0xc1, 0x4c, 0x59, 0x96, 0xb4, 0x9a, 0x31, 0x8b, 0x73, 0xca,
+	0x2e, 0x68, 0x67, 0x3c, 0xc2, 0xba, 0x98, 0x3b, 0x96, 0x25, 0x45, 0xf7, 0x9a, 0xe0, 0xae, 0xba,
-	0x29, 0xd7, 0xe4, 0x13, 0xe4, 0x83, 0xe4, 0x9c, 0x03, 0xc7, 0x1c, 0x72, 0x48, 0xe5, 0x40, 0xb2,
+	0xea, 0xb6, 0xfd, 0x04, 0xfd, 0x20, 0x5d, 0x77, 0xc1, 0xb2, 0x8b, 0x2e, 0x3a, 0x5d, 0xd0, 0x86,
-	0xe4, 0x8b, 0xa4, 0x66, 0x34, 0x12, 0xf2, 0x53, 0xf6, 0x9a, 0x8b, 0x3d, 0xd3, 0xea, 0xee, 0xe9,
+	0x7e, 0x91, 0xce, 0x7d, 0x58, 0xc8, 0x4f, 0xd9, 0x98, 0x8d, 0xb9, 0xf7, 0xe8, 0x9c, 0x73, 0xcf,
-	0xf7, 0xaf, 0xe1, 0x79, 0x8b, 0xb0, 0x8b, 0xee, 0x99, 0xde, 0x74, 0x3b, 0xd5, 0xa6, 0xeb, 0x30,
+	0xfb, 0x77, 0x06, 0xd8, 0x6e, 0x62, 0x7a, 0xd6, 0x39, 0x31, 0x1a, 0x7e, 0xdb, 0x6c, 0xf8, 0x1e,
-	0x93, 0x38, 0xd8, 0xb7, 0xe2, 0x47, 0xd3, 0x23, 0x55, 0x8a, 0xfd, 0x4b, 0xd2, 0xc4, 0xb4, 0xca,
+	0xb5, 0xb1, 0x87, 0x42, 0x27, 0x7e, 0xb4, 0x03, 0x6c, 0x12, 0x14, 0x9e, 0xe3, 0x06, 0x22, 0x26,
-	0x4c, 0xda, 0x96, 0xbf, 0xba, 0xe7, 0xbb, 0xcc, 0x45, 0x4f, 0xef, 0x58, 0xf5, 0x90, 0x4d, 0x0f,
+	0xb5, 0x49, 0x8b, 0x98, 0xe7, 0x1b, 0xe2, 0x60, 0x04, 0xa1, 0x4f, 0x7d, 0xf5, 0xc9, 0x0d, 0xb7,
-	0x18, 0x2e, 0xb7, 0xd4, 0xff, 0xb7, 0x5c, 0xb7, 0x65, 0xe3, 0xaa, 0xe0, 0x3d, 0xeb, 0x9e, 0x57,
+	0xd1, 0xe3, 0x34, 0x04, 0xc3, 0xf9, 0x86, 0xf6, 0xff, 0xa6, 0xef, 0x37, 0x5d, 0x64, 0x72, 0xde,
-	0x71, 0xc7, 0x63, 0xbd, 0x40, 0x54, 0x7d, 0x32, 0xf8, 0xd1, 0x74, 0xc2, 0x4f, 0x6b, 0x2d, 0xb7,
+	0x93, 0xce, 0xa9, 0x89, 0xda, 0x01, 0xed, 0x0a, 0x51, 0xed, 0xf1, 0xe0, 0x47, 0xdb, 0xeb, 0x7d,
-	0xe5, 0x8a, 0x63, 0x95, 0x9f, 0x24, 0xf5, 0xb3, 0xa9, 0x8c, 0x65, 0x3d, 0x0f, 0xd3, 0x6a, 0xc7,
+	0x5a, 0x6d, 0xfa, 0x4d, 0x9f, 0x1f, 0x4d, 0x76, 0x92, 0xd4, 0x17, 0x53, 0xd9, 0x4b, 0xbb, 0x01,
-	0xed, 0x3a, 0x2c, 0xf8, 0x95, 0xd2, 0x2f, 0x67, 0x90, 0xb6, 0x30, 0x6d, 0xfa, 0xc4, 0x63, 0xae,
+	0x22, 0x66, 0xdb, 0xef, 0x78, 0x54, 0xfc, 0x4a, 0xe9, 0x57, 0x33, 0x48, 0x3b, 0x88, 0x34, 0x42,
-	0x1f, 0x3b, 0x4a, 0x3d, 0x3b, 0x33, 0xe8, 0xe1, 0x81, 0x10, 0x3f, 0x52, 0xb6, 0x3c, 0xe8, 0x32,
+	0x1c, 0x50, 0x3f, 0x8c, 0x1d, 0xa5, 0x9e, 0xcd, 0x19, 0xf4, 0xb0, 0x40, 0xf0, 0x1f, 0x29, 0x5b,
-	0x23, 0x1d, 0x4c, 0x99, 0xd9, 0xf1, 0x02, 0x06, 0xed, 0x97, 0x14, 0xac, 0xee, 0xfb, 0xd8, 0x64,
+	0x1e, 0x74, 0x99, 0xe2, 0x36, 0x22, 0xd4, 0x6e, 0x07, 0x82, 0x41, 0xff, 0x25, 0x05, 0x2b, 0x3b,
-	0xf8, 0x95, 0x49, 0xdb, 0x06, 0x7e, 0xd3, 0xc5, 0x94, 0xa1, 0x1a, 0x3c, 0x8c, 0xd4, 0x37, 0x88,
+	0x21, 0xb2, 0x29, 0x7a, 0x6d, 0x93, 0x96, 0x85, 0xde, 0x74, 0x10, 0xa1, 0x6a, 0x15, 0xee, 0x47,
-	0x55, 0x4c, 0x6d, 0x28, 0x95, 0xc5, 0xbd, 0x47, 0xb7, 0x37, 0xe5, 0xc2, 0x7e, 0x48, 0x3f, 0xaa,
+	0xea, 0xeb, 0xd8, 0x29, 0xa6, 0xd6, 0x95, 0xca, 0xe2, 0xf6, 0xc3, 0xeb, 0xab, 0x72, 0x61, 0xa7,
-	0x1b, 0x85, 0x88, 0xe9, 0xc8, 0x42, 0x35, 0xc8, 0xf9, 0xae, 0xcb, 0xce, 0x69, 0x31, 0xbd, 0x91,
+	0x47, 0xdf, 0xaf, 0x59, 0x85, 0x88, 0x69, 0xdf, 0x51, 0xab, 0x90, 0x0b, 0x7d, 0x9f, 0x9e, 0x92,
-	0xae, 0x14, 0x6a, 0xaa, 0x1e, 0xcb, 0xd4, 0xe5, 0x96, 0x2e, 0x0c, 0xd4, 0xbf, 0xe6, 0x01, 0x32,
+	0x62, 0x7a, 0x3d, 0x5d, 0x29, 0x54, 0x35, 0x23, 0x96, 0xa9, 0xf3, 0x0d, 0x83, 0x1b, 0x68, 0x7c,
-	0x24, 0x27, 0x5a, 0x83, 0x2c, 0x65, 0x16, 0x71, 0x8a, 0x19, 0xfe, 0x80, 0x11, 0x5c, 0xd0, 0x3a,
+	0xc5, 0x02, 0x64, 0x49, 0x4e, 0x75, 0x15, 0xb2, 0x84, 0x3a, 0xd8, 0x2b, 0x66, 0xd8, 0x03, 0x96,
-	0xe4, 0x28, 0xb3, 0xdc, 0x2e, 0x2b, 0x66, 0x05, 0x59, 0xde, 0x24, 0x1d, 0xfb, 0x7e, 0x31, 0x17,
+	0xb8, 0xa8, 0x6b, 0x90, 0x23, 0xd4, 0xf1, 0x3b, 0xb4, 0x98, 0xe5, 0x64, 0x79, 0x93, 0x74, 0x14,
-	0xd1, 0xb1, 0xef, 0x23, 0x15, 0xf2, 0x0c, 0xfb, 0x1d, 0xe2, 0x98, 0x76, 0xf1, 0xc1, 0x86, 0x52,
+	0x86, 0xc5, 0x5c, 0x44, 0x47, 0x61, 0xa8, 0x6a, 0x90, 0xa7, 0x28, 0x6c, 0x63, 0xcf, 0x76, 0x8b,
-	0xc9, 0x1b, 0xd1, 0x1d, 0x3d, 0x07, 0x68, 0x5e, 0xe0, 0x66, 0xdb, 0x73, 0x89, 0xc3, 0x8a, 0xf9,
+	0xf7, 0xd6, 0x95, 0x4a, 0xde, 0x8a, 0xee, 0xea, 0xa7, 0x00, 0x8d, 0x33, 0xd4, 0x68, 0x05, 0x3e,
-	0x0d, 0xa5, 0x52, 0xa8, 0x95, 0x47, 0x5a, 0x56, 0x8f, 0xe2, 0x6e, 0xc4, 0x44, 0xb4, 0xd7, 0x80,
+	0xf6, 0x68, 0x31, 0xbf, 0xae, 0x54, 0x0a, 0xd5, 0xf2, 0x48, 0xcb, 0x6a, 0x51, 0xdc, 0xad, 0x98,
-	0xe2, 0xf1, 0xa1, 0x9e, 0xeb, 0x50, 0xfc, 0x5e, 0x01, 0x5a, 0x81, 0xb4, 0x47, 0xac, 0x62, 0x7a,
+	0x88, 0x7e, 0x0c, 0x6a, 0x3c, 0x3e, 0x24, 0xf0, 0x3d, 0x82, 0x6e, 0x15, 0xa0, 0x65, 0x48, 0x07,
-	0x43, 0xa9, 0x2c, 0x19, 0xfc, 0xa8, 0xbd, 0x84, 0x95, 0x53, 0x66, 0xfa, 0x6c, 0x52, 0xe8, 0x95,
+	0xd8, 0x29, 0xa6, 0xd7, 0x95, 0xca, 0x92, 0xc5, 0x8e, 0xfa, 0x2b, 0x58, 0x3e, 0xa2, 0x76, 0x48,
-	0x64, 0xcd, 0xda, 0x21, 0xac, 0xd6, 0xb1, 0x8d, 0x27, 0xe7, 0x70, 0x1a, 0x45, 0xbf, 0x2a, 0xb0,
+	0x27, 0x85, 0x5e, 0x49, 0xd6, 0xac, 0xef, 0xc1, 0x4a, 0x0d, 0xb9, 0x68, 0x72, 0x0e, 0xa7, 0x51,
-	0x1c, 0x68, 0x1a, 0xeb, 0xa9, 0x32, 0xbd, 0xa7, 0xa9, 0xc8, 0x53, 0x54, 0x86, 0x02, 0xbe, 0x22,
+	0xf4, 0xab, 0x02, 0x0f, 0x84, 0xa6, 0xb1, 0x9e, 0x2a, 0xd3, 0x7b, 0x9a, 0x8a, 0x3c, 0x55, 0xcb,
-	0xac, 0x41, 0x99, 0xc9, 0xba, 0x54, 0xc6, 0x00, 0x38, 0xe9, 0x54, 0x50, 0xd0, 0x2e, 0x2c, 0xf2,
+	0x50, 0x40, 0x17, 0x98, 0xd6, 0x09, 0xb5, 0x69, 0x87, 0xc8, 0x18, 0x00, 0x23, 0x1d, 0x71, 0x8a,
-	0x1b, 0xb6, 0x1a, 0x26, 0x13, 0xd5, 0xc0, 0x0b, 0x28, 0x28, 0x5e, 0x3d, 0x2c, 0x5e, 0xfd, 0x55,
+	0xba, 0x05, 0x8b, 0xec, 0x86, 0x9c, 0xba, 0x4d, 0x79, 0x35, 0xb0, 0x02, 0x12, 0xc5, 0x6b, 0xf4,
-	0x58, 0xbc, 0x7b, 0xf9, 0xeb, 0x9b, 0xf2, 0xc2, 0xcf, 0x7f, 0x97, 0x15, 0x23, 0x1f, 0x88, 0xed,
+	0x8a, 0xd7, 0x78, 0xdd, 0x2b, 0xde, 0xed, 0xfc, 0xe5, 0x55, 0x79, 0xe1, 0xe7, 0xbf, 0xcb, 0x8a,
-	0x32, 0xed, 0x3b, 0x58, 0x0b, 0x6c, 0x3f, 0xf1, 0xdd, 0x26, 0xa6, 0x74, 0x8e, 0x40, 0x0c, 0x7b,
+	0x95, 0x17, 0x62, 0x5b, 0x54, 0xff, 0x0e, 0x56, 0x85, 0xed, 0x87, 0xa1, 0xdf, 0x40, 0x84, 0xcc,
-	0xa0, 0xd5, 0x61, 0xf9, 0x10, 0xcf, 0x9d, 0xa9, 0x17, 0xf0, 0x28, 0xd2, 0x22, 0x03, 0xbc, 0x09,
+	0x11, 0x88, 0x61, 0x0f, 0xf4, 0x1a, 0x3c, 0xd8, 0x43, 0x73, 0x67, 0xea, 0x25, 0x3c, 0x8c, 0xb4,
-	0x19, 0xde, 0xb0, 0x42, 0xbc, 0x50, 0x7b, 0x32, 0xb2, 0x36, 0x85, 0x80, 0x60, 0xd3, 0x9e, 0xc1,
+	0xc8, 0x00, 0x3f, 0x83, 0x0c, 0x6b, 0x58, 0x2e, 0x5e, 0xa8, 0x3e, 0x1e, 0x59, 0x9b, 0x5c, 0x80,
-	0xca, 0x57, 0x84, 0x0a, 0x15, 0x91, 0x87, 0xeb, 0x90, 0x3b, 0x27, 0x36, 0xc3, 0x7e, 0x60, 0x83,
+	0xb3, 0xe9, 0x4f, 0x61, 0xf9, 0x4b, 0x4c, 0xb8, 0x8a, 0xc8, 0xc3, 0x35, 0xc8, 0x9d, 0x62, 0x97,
-	0x21, 0x6f, 0x5a, 0x1d, 0x56, 0x63, 0xbc, 0xf2, 0xbd, 0x2a, 0x64, 0xc5, 0xb8, 0x2c, 0x2a, 0xa2,
+	0xa2, 0x50, 0xd8, 0x60, 0xc9, 0x9b, 0x5e, 0x83, 0x95, 0x18, 0xaf, 0x7c, 0xcf, 0x84, 0x2c, 0x1f,
-	0x4d, 0x27, 0x3c, 0x18, 0xf0, 0x69, 0x3f, 0x29, 0x50, 0xf8, 0x92, 0xd8, 0xf6, 0x3c, 0xf1, 0xe4,
+	0x97, 0x45, 0x85, 0xb7, 0xe9, 0x84, 0x07, 0x05, 0x9f, 0xfe, 0x93, 0x02, 0x85, 0x2f, 0xb0, 0xeb,
-	0xad, 0x4b, 0x5a, 0xbc, 0x41, 0x83, 0x90, 0xca, 0x1b, 0x42, 0x90, 0x36, 0x6d, 0x5b, 0xd4, 0x43,
+	0xce, 0x13, 0x4f, 0xd6, 0xba, 0xb8, 0xc9, 0x1a, 0x54, 0x84, 0x54, 0xde, 0x54, 0x15, 0xd2, 0xb6,
-	0xfe, 0xf3, 0x05, 0x83, 0x5f, 0x38, 0x8d, 0xc7, 0x9e, 0x17, 0xc1, 0x12, 0xa7, 0x79, 0xc4, 0xda,
+	0xeb, 0xf2, 0x7a, 0xc8, 0x7f, 0xb6, 0x60, 0xb1, 0x0b, 0xa3, 0xb1, 0xd8, 0xb3, 0x22, 0x58, 0x62,
-	0x7b, 0x08, 0xe0, 0x11, 0xab, 0xe1, 0xfa, 0x0d, 0xd3, 0xb6, 0xb5, 0x3f, 0x14, 0x40, 0x07, 0x57,
+	0xb4, 0x00, 0x3b, 0xdb, 0xf7, 0x01, 0x02, 0xec, 0xd4, 0xfd, 0xb0, 0x6e, 0xbb, 0xae, 0xfe, 0x87,
-	0xb8, 0x79, 0x0f, 0x89, 0x8e, 0x26, 0x50, 0x6a, 0xf4, 0x04, 0x4a, 0x8f, 0x99, 0x40, 0x99, 0xb1,
+	0x02, 0xea, 0xee, 0x05, 0x6a, 0xdc, 0x41, 0xa2, 0xa3, 0x09, 0x94, 0x1a, 0x3d, 0x81, 0xd2, 0x63,
-	0x13, 0x28, 0x3b, 0x30, 0x81, 0x2a, 0x90, 0xa1, 0x1e, 0x6e, 0x8a, 0x99, 0x55, 0xa8, 0xad, 0x0d,
+	0x26, 0x50, 0x66, 0xec, 0x04, 0xca, 0x0e, 0x4c, 0xa0, 0x0a, 0x64, 0x48, 0x80, 0x1a, 0x7c, 0x66,
-	0x15, 0xf5, 0xae, 0xd3, 0x33, 0x04, 0x87, 0xf6, 0x01, 0xfc, 0xaf, 0xcf, 0x2b, 0x99, 0x30, 0x59,
+	0x15, 0xaa, 0xab, 0x43, 0x45, 0xbd, 0xe5, 0x75, 0x2d, 0xce, 0xa1, 0xbf, 0x07, 0xff, 0xeb, 0xf3,
-	0x8b, 0xca, 0x5d, 0x2d, 0xfe, 0xa8, 0xc0, 0x8a, 0x81, 0x29, 0xf9, 0x1e, 0x9f, 0xb0, 0xde, 0xbd,
+	0x4a, 0x26, 0x4c, 0xd6, 0xa2, 0x72, 0x53, 0x8b, 0x3f, 0x2a, 0xb0, 0x6c, 0x21, 0x82, 0xbf, 0x47,
-	0x96, 0x39, 0x8f, 0xc7, 0x5b, 0x62, 0xb1, 0x0b, 0xd9, 0xa2, 0xc1, 0x85, 0xfb, 0x7d, 0x81, 0x49,
+	0x87, 0xb4, 0x7b, 0xa7, 0x65, 0xce, 0xe2, 0xf1, 0x16, 0x3b, 0xf4, 0x4c, 0xb6, 0xa8, 0xb8, 0x30,
-	0xeb, 0x22, 0x68, 0xcd, 0x25, 0x43, 0xde, 0x34, 0x1b, 0x96, 0xf7, 0x6d, 0x97, 0xe2, 0xa3, 0xe3,
+	0xbf, 0xcf, 0x10, 0x6e, 0x9e, 0x89, 0xd6, 0x5c, 0xb2, 0xe4, 0x4d, 0x77, 0xe1, 0xc1, 0x8e, 0xeb,
-	0x7b, 0xb7, 0x22, 0xc8, 0x8a, 0x28, 0x0c, 0x99, 0x15, 0x3e, 0x2e, 0x4f, 0xcc, 0x2e, 0xc5, 0xf7,
+	0x13, 0xb4, 0x7f, 0x70, 0xe7, 0x56, 0x88, 0xac, 0xf0, 0xc2, 0x90, 0x59, 0x61, 0xe3, 0xf2, 0xd0,
-	0x30, 0x2e, 0x0d, 0x4c, 0xbb, 0x9d, 0xb9, 0x15, 0x7d, 0x01, 0x6b, 0xbc, 0xbf, 0x64, 0xc2, 0xf0,
+	0xee, 0x10, 0x74, 0x07, 0xe3, 0xd2, 0x42, 0xa4, 0xd3, 0x9e, 0x5b, 0xd1, 0xe7, 0xb0, 0xca, 0xfa,
-	0x3c, 0x85, 0xa8, 0x9d, 0xc2, 0xe3, 0x01, 0x5d, 0x32, 0xfd, 0x3b, 0xb0, 0xe8, 0x85, 0x44, 0xd9,
+	0x4b, 0x26, 0x0c, 0xcd, 0x53, 0x88, 0xfa, 0x11, 0x3c, 0x1a, 0xd0, 0x25, 0xd3, 0xbf, 0x09, 0x8b,
-	0xb3, 0x4f, 0x47, 0xf6, 0x6c, 0x58, 0x37, 0x77, 0xec, 0xda, 0x6f, 0x29, 0x78, 0xbc, 0x1f, 0x61,
+	0x41, 0x8f, 0x28, 0x7b, 0xf6, 0xc9, 0xc8, 0x9e, 0xed, 0xd5, 0xcd, 0x0d, 0xbb, 0xfe, 0x5b, 0x0a,
-	0xd9, 0x9c, 0xee, 0xa2, 0x06, 0xac, 0x7a, 0xa6, 0x8f, 0x1d, 0xd6, 0x88, 0x41, 0x6a, 0x80, 0x7c,
+	0x1e, 0xed, 0x44, 0x58, 0x36, 0xa7, 0xbb, 0x6a, 0x1d, 0x56, 0x02, 0x3b, 0x44, 0x1e, 0xad, 0xc7,
-	0x35, 0x3e, 0x8f, 0xff, 0xba, 0x29, 0x3f, 0x8b, 0xed, 0x2a, 0xae, 0x87, 0x9d, 0x48, 0x9c, 0x56,
+	0x20, 0x55, 0x20, 0x5f, 0x95, 0xcd, 0xe3, 0xbf, 0xae, 0xca, 0x4f, 0x63, 0xbb, 0x8a, 0x1f, 0x20,
-	0x5b, 0xee, 0xa6, 0x45, 0x5a, 0x98, 0x32, 0xbd, 0x2e, 0xfe, 0x8c, 0x95, 0x40, 0xd9, 0x9d, 0x7d,
+	0x2f, 0x12, 0x27, 0x66, 0xd3, 0x7f, 0xe6, 0xe0, 0x26, 0x22, 0xd4, 0xa8, 0xf1, 0x3f, 0xd6, 0xb2,
-	0xe8, 0x35, 0x3c, 0x70, 0x3d, 0x46, 0x5c, 0x27, 0xdc, 0x21, 0x5e, 0xe8, 0x93, 0xb6, 0x3d, 0x7d,
+	0x50, 0x76, 0x63, 0x9f, 0x7a, 0x0c, 0xf7, 0xfc, 0x80, 0x62, 0xdf, 0xeb, 0xed, 0x10, 0x2f, 0x8d,
-	0xa4, 0x6b, 0xfa, 0x71, 0xa0, 0xe2, 0xc0, 0x61, 0x7e, 0xcf, 0x08, 0x15, 0xaa, 0x3b, 0xf0, 0x30,
+	0x49, 0xdb, 0x9e, 0x31, 0xd2, 0x35, 0xe3, 0x40, 0xa8, 0xd8, 0xf5, 0x68, 0xd8, 0xb5, 0x7a, 0x0a,
-	0xfe, 0x81, 0x17, 0x5d, 0x1b, 0xf7, 0xe4, 0xc0, 0xe4, 0x47, 0x5e, 0x74, 0x97, 0xa6, 0xdd, 0xc5,
+	0xb5, 0x4d, 0xb8, 0x1f, 0xff, 0xc0, 0x8a, 0xae, 0x85, 0xba, 0x72, 0x60, 0xb2, 0x23, 0x2b, 0xba,
-	0xe1, 0x28, 0x10, 0x97, 0x9d, 0xd4, 0xa7, 0x8a, 0xf6, 0x2d, 0xac, 0x0f, 0x3e, 0x25, 0x93, 0xb3,
+	0x73, 0xdb, 0xed, 0xa0, 0xde, 0x28, 0xe0, 0x97, 0xcd, 0xd4, 0xc7, 0x8a, 0xfe, 0x2d, 0xac, 0x0d,
-	0x0b, 0x85, 0xbb, 0x7d, 0x2d, 0x4c, 0x4f, 0xe2, 0x7e, 0x11, 0x97, 0xa9, 0xfd, 0x0b, 0x90, 0x15,
+	0x3e, 0x25, 0x93, 0xb3, 0x05, 0x85, 0x9b, 0x7d, 0xad, 0x97, 0x9e, 0xc4, 0xfd, 0x22, 0x2e, 0x53,
-	0x13, 0x1a, 0xb5, 0x21, 0x17, 0xac, 0x1a, 0xa8, 0x9a, 0xe0, 0xf7, 0xe0, 0xc2, 0xa6, 0x7e, 0x3c,
+	0xfd, 0x17, 0x20, 0xcb, 0x27, 0xb4, 0xda, 0x82, 0x9c, 0x58, 0x35, 0x54, 0x33, 0xc1, 0xef, 0xc1,
-	0xbd, 0x80, 0xb4, 0xfc, 0x18, 0xb2, 0x62, 0xf7, 0x40, 0xfa, 0x64, 0xd1, 0xc1, 0x05, 0x45, 0x5d,
+	0x85, 0x4d, 0xfb, 0x70, 0x7a, 0x01, 0x69, 0xf9, 0x01, 0x64, 0xf9, 0xee, 0xa1, 0x1a, 0x93, 0x45,
-	0x1f, 0x9a, 0x60, 0x07, 0x7c, 0xc7, 0x46, 0x2d, 0xc8, 0x05, 0xf0, 0x9b, 0x64, 0xfd, 0xd0, 0xaa,
+	0x07, 0x17, 0x14, 0x6d, 0x6d, 0x68, 0x82, 0xed, 0xb2, 0x1d, 0x5b, 0x6d, 0x42, 0x4e, 0xc0, 0x6f,
-	0xa2, 0x7e, 0x34, 0x8d, 0x40, 0x64, 0xf9, 0x1b, 0x58, 0xea, 0xc3, 0x79, 0x54, 0x9b, 0x46, 0xbc,
+	0x92, 0xf5, 0x43, 0xab, 0x8a, 0xf6, 0xc1, 0x34, 0x02, 0x91, 0xe5, 0x6f, 0x60, 0xa9, 0x0f, 0xe7,
-	0x1f, 0x2b, 0x66, 0x7c, 0xf2, 0x0c, 0xd2, 0x87, 0x98, 0xa1, 0x04, 0xa1, 0xfe, 0xfd, 0x40, 0xdd,
+	0xd5, 0xea, 0x34, 0xe2, 0xfd, 0x58, 0x31, 0xe3, 0x93, 0x27, 0x90, 0xde, 0x43, 0x54, 0x4d, 0x10,
-	0x9c, 0x92, 0x5b, 0xbe, 0xd1, 0x82, 0x0c, 0x1f, 0x00, 0x49, 0xf9, 0x18, 0x04, 0x7f, 0xb5, 0x3a,
+	0xea, 0xdf, 0x0f, 0xb4, 0x67, 0x53, 0x72, 0xcb, 0x37, 0x9a, 0x90, 0x61, 0x03, 0x20, 0x29, 0x1f,
-	0x35, 0xbf, 0x7c, 0xe8, 0x08, 0x32, 0x1c, 0xce, 0xd1, 0x87, 0x93, 0x05, 0x63, 0x90, 0x3f, 0x36,
+	0x83, 0xe0, 0xaf, 0x99, 0x53, 0xf3, 0xcb, 0x87, 0xf6, 0x21, 0xc3, 0xe0, 0x5c, 0x7d, 0x7f, 0xb2,
-	0xe7, 0x6d, 0xc8, 0x70, 0xc4, 0x42, 0x09, 0xe5, 0x37, 0x8c, 0xd5, 0xea, 0xd6, 0x0c, 0x12, 0xd2,
+	0x60, 0x0c, 0xf2, 0xc7, 0xe6, 0xbc, 0x05, 0x19, 0x86, 0x58, 0x6a, 0x42, 0xf9, 0x0d, 0x63, 0xb5,
-	0xee, 0x53, 0x58, 0x8c, 0x40, 0x2f, 0x29, 0x4a, 0x83, 0xe8, 0x38, 0xd6, 0x83, 0x63, 0x78, 0x20,
+	0xb6, 0x31, 0x83, 0x84, 0xb4, 0xfb, 0x08, 0x16, 0x23, 0xd0, 0x4b, 0x8a, 0xd2, 0x20, 0x3a, 0x8e,
-	0x11, 0x2c, 0x29, 0xbb, 0xfd, 0x40, 0x37, 0x41, 0x61, 0x56, 0x80, 0x54, 0x92, 0x85, 0x83, 0x48,
+	0xf5, 0xe0, 0x00, 0xee, 0x49, 0x04, 0x4b, 0xca, 0x6e, 0x3f, 0xd0, 0x4d, 0x50, 0x98, 0xe5, 0x20,
-	0x36, 0x56, 0xe1, 0x37, 0x90, 0x0b, 0xd0, 0x2a, 0xa9, 0xaf, 0x86, 0x30, 0x6d, 0xac, 0xca, 0x2b,
+	0x95, 0x64, 0xe1, 0x20, 0x92, 0x8d, 0x55, 0xf8, 0x35, 0xe4, 0x04, 0x5a, 0x25, 0xf5, 0xd5, 0x10,
-	0x58, 0xea, 0xc3, 0x9a, 0xa4, 0x0e, 0x1a, 0x05, 0x72, 0xea, 0xf6, 0x4c, 0x32, 0x32, 0x87, 0x6f,
+	0xa6, 0x8d, 0x55, 0x79, 0x01, 0x4b, 0x7d, 0x58, 0x93, 0xd4, 0x41, 0xa3, 0x40, 0x4e, 0x7b, 0x3e,
-	0x01, 0x62, 0xf3, 0x7e, 0xfb, 0x3d, 0xc6, 0xbb, 0xfa, 0xc9, 0x6c, 0x42, 0xc1, 0xc3, 0x7b, 0xc5,
+	0x93, 0x8c, 0xcc, 0xe1, 0x5b, 0x80, 0xd8, 0xbc, 0x7f, 0x7e, 0x8b, 0xf1, 0xae, 0x7d, 0x34, 0x9b,
-	0xeb, 0x77, 0xa5, 0x85, 0x3f, 0xdf, 0x95, 0x16, 0x7e, 0xb8, 0x2d, 0x29, 0xd7, 0xb7, 0x25, 0xe5,
+	0x90, 0x78, 0x78, 0xfb, 0x9b, 0xcb, 0x77, 0xa5, 0x85, 0x3f, 0xdf, 0x95, 0x16, 0x7e, 0xb8, 0x2e,
-	0xf7, 0xdb, 0x92, 0xf2, 0xcf, 0x6d, 0x49, 0x39, 0xcb, 0x89, 0xe0, 0x6c, 0xff, 0x17, 0x00, 0x00,
+	0x29, 0x97, 0xd7, 0x25, 0xe5, 0xf7, 0xeb, 0x92, 0xf2, 0xcf, 0x75, 0x49, 0x39, 0x7e, 0x71, 0xbb,
-	0xff, 0xff, 0xb0, 0x5b, 0xd4, 0x42, 0x9a, 0x10, 0x00, 0x00,
+	0x7f, 0x4a, 0x7c, 0xc2, 0x0f, 0x27, 0x39, 0x1e, 0xda, 0xe7, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff,
+	0x21, 0x4a, 0x1d, 0x66, 0xdb, 0x10, 0x00, 0x00,
 }

api/services/tasks/v1/tasks.proto

@@ -10,6 +10,8 @@ import "github.com/containerd/containerd/api/types/descriptor/descriptor.proto";
 import "github.com/containerd/containerd/api/types/task/task.proto";
 import "google/protobuf/timestamp.proto";
 
+option go_package = "github.com/containerd/containerd/api/services/tasks/v1;tasks";
+
 service Tasks {
 	// Create a task.
 	rpc Create(CreateTaskRequest) returns (CreateTaskResponse);

api/services/version/v1/version.pb.go

@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-gogo.
-// source: github.com/containerd/containerd/api/services/version/version.proto
+// source: github.com/containerd/containerd/api/services/version/v1/version.proto
 // DO NOT EDIT!
 
 /*
 	Package version is a generated protocol buffer package.
 
 	It is generated from these files:
-		github.com/containerd/containerd/api/services/version/version.proto
+		github.com/containerd/containerd/api/services/version/v1/version.proto
 
 	It has these top-level messages:
 		VersionResponse
@@ -122,7 +122,7 @@ var _Version_serviceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "github.com/containerd/containerd/api/services/version/version.proto",
+	Metadata: "github.com/containerd/containerd/api/services/version/v1/version.proto",
 }
 
 func (m *VersionResponse) Marshal() (dAtA []byte, err error) {
@@ -442,24 +442,25 @@ var (
 )
 
 func init() {
-	proto.RegisterFile("github.com/containerd/containerd/api/services/version/version.proto", fileDescriptorVersion)
+	proto.RegisterFile("github.com/containerd/containerd/api/services/version/v1/version.proto", fileDescriptorVersion)
 }
 
 var fileDescriptorVersion = []byte{
-	// 230 bytes of a gzipped FileDescriptorProto
+	// 241 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x4e, 0xcf, 0x2c, 0xc9,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x4b, 0xcf, 0x2c, 0xc9,
 	0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d,
 	0x4a, 0x41, 0x66, 0x26, 0x16, 0x64, 0xea, 0x17, 0xa7, 0x16, 0x95, 0x65, 0x26, 0xa7, 0x16, 0xeb,
-	0x97, 0xa5, 0x16, 0x15, 0x67, 0xe6, 0xe7, 0xc1, 0x68, 0xbd, 0x82, 0xa2, 0xfc, 0x92, 0x7c, 0x21,
+	0x97, 0xa5, 0x16, 0x15, 0x67, 0xe6, 0xe7, 0xe9, 0x97, 0x19, 0xc2, 0x98, 0x7a, 0x05, 0x45, 0xf9,
-	0x39, 0x84, 0x72, 0x3d, 0x98, 0x52, 0x3d, 0x98, 0x92, 0x32, 0x43, 0x29, 0xe9, 0xf4, 0xfc, 0xfc,
+	0x25, 0xf9, 0x42, 0x72, 0x08, 0x1d, 0x7a, 0x30, 0xd5, 0x7a, 0x30, 0x25, 0x65, 0x86, 0x52, 0xd2,
-	0xf4, 0x9c, 0x54, 0x7d, 0xb0, 0xea, 0xa4, 0xd2, 0x34, 0xfd, 0xd4, 0xdc, 0x82, 0x92, 0x4a, 0x88,
+	0xe9, 0xf9, 0xf9, 0xe9, 0x39, 0xa9, 0xfa, 0x60, 0xd5, 0x49, 0xa5, 0x69, 0xfa, 0xa9, 0xb9, 0x05,
-	0x66, 0x29, 0x91, 0xf4, 0xfc, 0xf4, 0x7c, 0x30, 0x53, 0x1f, 0xc4, 0x82, 0x88, 0x2a, 0xb9, 0x73,
+	0x25, 0x95, 0x10, 0xcd, 0x52, 0x22, 0xe9, 0xf9, 0xe9, 0xf9, 0x60, 0xa6, 0x3e, 0x88, 0x05, 0x11,
-	0xf1, 0x87, 0x41, 0x0c, 0x08, 0x4a, 0x2d, 0x2e, 0xc8, 0xcf, 0x2b, 0x4e, 0x15, 0x92, 0xe0, 0x62,
+	0x55, 0x72, 0xe7, 0xe2, 0x0f, 0x83, 0x18, 0x10, 0x94, 0x5a, 0x5c, 0x90, 0x9f, 0x57, 0x9c, 0x2a,
-	0x87, 0x9a, 0x29, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x19, 0x04, 0xe3, 0x0a, 0x49, 0x71, 0x71, 0x14,
+	0x24, 0xc1, 0xc5, 0x0e, 0x35, 0x53, 0x82, 0x51, 0x81, 0x51, 0x83, 0x33, 0x08, 0xc6, 0x15, 0x92,
-	0xa5, 0x96, 0x65, 0x82, 0xa5, 0x98, 0xc0, 0x52, 0x70, 0xbe, 0x51, 0x2c, 0x17, 0x3b, 0xd4, 0x20,
+	0xe2, 0xe2, 0x28, 0x4a, 0x2d, 0xcb, 0x04, 0x4b, 0x31, 0x81, 0xa5, 0xe0, 0x7c, 0xa3, 0x58, 0x2e,
-	0xa1, 0x20, 0x04, 0x53, 0x4c, 0x0f, 0xe2, 0x24, 0x3d, 0x98, 0x93, 0xf4, 0x5c, 0x41, 0x4e, 0x92,
+	0x76, 0xa8, 0x41, 0x42, 0x41, 0x08, 0xa6, 0x98, 0x1e, 0xc4, 0x49, 0x7a, 0x30, 0x27, 0xe9, 0xb9,
-	0xd2, 0xd7, 0xc3, 0xef, 0x15, 0x3d, 0x34, 0x47, 0x39, 0x49, 0x9c, 0x78, 0x28, 0xc7, 0x70, 0xe3,
+	0x82, 0x9c, 0x24, 0xa5, 0xaf, 0x87, 0xdf, 0x2b, 0x7a, 0x68, 0x8e, 0x72, 0x8a, 0x3a, 0xf1, 0x50,
-	0xa1, 0x1c, 0x43, 0xc3, 0x23, 0x39, 0xc6, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c,
+	0x8e, 0xe1, 0xc6, 0x43, 0x39, 0x86, 0x86, 0x47, 0x72, 0x8c, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78,
-	0xf0, 0x48, 0x8e, 0x31, 0x89, 0x0d, 0x6c, 0xb4, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xf3, 0x53,
+	0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0x63, 0x94, 0x03, 0xb9, 0x81, 0x6b, 0x0d, 0x65, 0x26, 0xb1,
-	0x3d, 0xea, 0x62, 0x01, 0x00, 0x00,
+	0x81, 0x1d, 0x67, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xb6, 0x37, 0xd8, 0xc6, 0xa7, 0x01, 0x00,
+	0x00,
 }

api/services/version/v1/version.proto

@@ -5,6 +5,9 @@ package containerd.services.version.v1;
 import "google/protobuf/empty.proto";
 import "gogoproto/gogo.proto";
 
+// TODO(stevvooe): Should version service actually be versioned?
+option go_package = "github.com/containerd/containerd/api/services/version/v1;version";
+
 service Version {
 	rpc Version(google.protobuf.Empty) returns (VersionResponse);
 }