Merge pull request #6558 from kzys/no-weak-import

Do not use weak import

api/events/container.pb.go

@@ -5,7 +5,9 @@ package events
 
 import (
 	fmt "fmt"
+	_ "github.com/containerd/containerd/protobuf/plugin"
 	github_com_containerd_typeurl "github.com/containerd/typeurl"
+	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
 	types "github.com/gogo/protobuf/types"
@@ -202,33 +204,33 @@ func init() {
 }
 
 var fileDescriptor_0d1f05b8626f83ea = []byte{
-	// 413 bytes of a gzipped FileDescriptorProto
+	// 412 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xc1, 0x0a, 0xd3, 0x30,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xc1, 0xaa, 0xd3, 0x40,
-	0x18, 0xc7, 0x97, 0x76, 0x6e, 0x98, 0x0a, 0x6a, 0x18, 0x52, 0x7b, 0xa8, 0x73, 0xa7, 0xe9, 0x21,
+	0x14, 0x86, 0x3b, 0x49, 0x6d, 0x71, 0x22, 0xa8, 0x43, 0x91, 0x98, 0x45, 0xac, 0x5d, 0x55, 0x17,
-	0x85, 0x7a, 0x51, 0x77, 0xd1, 0x6d, 0x0a, 0xa2, 0x82, 0x14, 0x84, 0xe1, 0x45, 0xd2, 0x35, 0xeb,
+	0x13, 0x88, 0x1b, 0xb5, 0x1b, 0x6d, 0xab, 0x20, 0x2a, 0x48, 0xc0, 0x8d, 0x1b, 0x99, 0x34, 0xd3,
-	0x82, 0x6d, 0x52, 0xda, 0x74, 0xd0, 0x9b, 0x8f, 0xe2, 0xe3, 0xec, 0xe8, 0xc1, 0x83, 0x27, 0x71,
+	0x74, 0x30, 0x99, 0x09, 0xc9, 0xa4, 0x90, 0x9d, 0x8f, 0xe2, 0xe3, 0x74, 0xe9, 0xc2, 0x85, 0x2b,
-	0x05, 0xdf, 0xc0, 0x07, 0x90, 0x26, 0xeb, 0x56, 0x14, 0x95, 0x9d, 0xfa, 0xcf, 0xd7, 0xff, 0x3f,
+	0xb1, 0x01, 0xdf, 0xc0, 0x07, 0x90, 0xcc, 0x34, 0x6d, 0xf0, 0x72, 0xef, 0xa5, 0xab, 0xfc, 0x73,
-	0xdf, 0xf7, 0xfb, 0x08, 0x9c, 0xc5, 0x4c, 0x6e, 0xcb, 0x10, 0xaf, 0x45, 0xea, 0xad, 0x05, 0x97,
+	0xf2, 0xff, 0x73, 0xce, 0x77, 0x18, 0x38, 0x8b, 0x99, 0xdc, 0x94, 0x21, 0x5e, 0x89, 0xd4, 0x5b,
-	0x84, 0x71, 0x9a, 0x47, 0x5d, 0x49, 0x32, 0xe6, 0xd1, 0x1d, 0xe5, 0xb2, 0x38, 0x57, 0x71, 0x96,
+	0x09, 0x2e, 0x09, 0xe3, 0x34, 0x8f, 0xba, 0x92, 0x64, 0xcc, 0xa3, 0x5b, 0xca, 0x65, 0x71, 0xaa,
-	0x0b, 0x29, 0xd0, 0xcd, 0xb3, 0x0d, 0x6b, 0x8b, 0x73, 0x3b, 0x16, 0x22, 0x4e, 0xa8, 0xa7, 0x0c,
+	0xe2, 0x2c, 0x17, 0x52, 0xa0, 0xbb, 0x27, 0x1b, 0xd6, 0x16, 0xe7, 0x7e, 0x2c, 0x44, 0x9c, 0x50,
-	0x61, 0xb9, 0xf1, 0x08, 0xaf, 0xb4, 0xdb, 0x19, 0xc5, 0x22, 0x16, 0x4a, 0x7a, 0x8d, 0x3a, 0x56,
+	0x4f, 0x19, 0xc2, 0x72, 0xed, 0x11, 0x5e, 0x69, 0xb7, 0x33, 0x8a, 0x45, 0x2c, 0x94, 0xf4, 0x1a,
-	0x9f, 0xfc, 0x77, 0x80, 0xd3, 0x55, 0x59, 0x52, 0xc6, 0x8c, 0x7b, 0x1b, 0x46, 0x93, 0x28, 0x23,
+	0x75, 0xa8, 0xbe, 0xb8, 0x76, 0x80, 0xe3, 0x55, 0x59, 0x52, 0xc6, 0x8c, 0x7b, 0x6b, 0x46, 0x93,
-	0x72, 0xab, 0x6f, 0x98, 0x7c, 0x01, 0xf0, 0xfa, 0xa2, 0xb5, 0x2f, 0x72, 0x4a, 0x24, 0x45, 0xb7,
+	0x28, 0x23, 0x72, 0xa3, 0x6f, 0x98, 0xfc, 0x00, 0xf0, 0xf6, 0xa2, 0xb5, 0x2f, 0x72, 0x4a, 0x24,
-	0xa0, 0xc1, 0x22, 0x1b, 0x8c, 0xc1, 0xf4, 0xea, 0x7c, 0x50, 0x7f, 0xbb, 0x63, 0xbc, 0x58, 0x06,
+	0x45, 0xf7, 0xa0, 0xc1, 0x22, 0x1b, 0x8c, 0xc1, 0xf4, 0xe6, 0x7c, 0x50, 0xff, 0x7a, 0x60, 0xbc,
-	0x06, 0x8b, 0xd0, 0x08, 0x5e, 0x61, 0x29, 0x89, 0xa9, 0x6d, 0x34, 0xbf, 0x02, 0x7d, 0x40, 0x4b,
+	0x59, 0x06, 0x06, 0x8b, 0xd0, 0x08, 0xde, 0x60, 0x29, 0x89, 0xa9, 0x6d, 0x34, 0xbf, 0x02, 0x7d,
-	0x38, 0xcc, 0x4b, 0x2e, 0x59, 0x4a, 0x6d, 0x73, 0x0c, 0xa6, 0x96, 0x7f, 0x1f, 0xff, 0x41, 0x86,
+	0x40, 0x4b, 0x38, 0xcc, 0x4b, 0x2e, 0x59, 0x4a, 0x6d, 0x73, 0x0c, 0xa6, 0x96, 0xff, 0x18, 0x5f,
-	0x7f, 0x6b, 0x81, 0x03, 0x9d, 0x08, 0xda, 0xa8, 0xf3, 0x1a, 0x0e, 0x8f, 0x35, 0x84, 0x60, 0x9f,
+	0x20, 0xc3, 0xff, 0xb5, 0xc0, 0x81, 0x4e, 0x04, 0x6d, 0xd4, 0x79, 0x0f, 0x87, 0x87, 0x1a, 0x42,
-	0x93, 0x94, 0xea, 0x01, 0x02, 0xa5, 0x11, 0x86, 0x43, 0x91, 0x49, 0x26, 0x78, 0xa1, 0x9a, 0x5b,
+	0xb0, 0xcf, 0x49, 0x4a, 0xf5, 0x00, 0x81, 0xd2, 0x08, 0xc3, 0xa1, 0xc8, 0x24, 0x13, 0xbc, 0x50,
-	0xfe, 0x08, 0xeb, 0x5d, 0xe1, 0x16, 0x10, 0x3f, 0xe5, 0x55, 0xd0, 0x9a, 0x26, 0x3f, 0xba, 0x58,
+	0xcd, 0x2d, 0x7f, 0x84, 0xf5, 0xae, 0x70, 0x0b, 0x88, 0x5f, 0xf2, 0x2a, 0x68, 0x4d, 0x93, 0x3f,
-	0x6f, 0xb3, 0xe8, 0x72, 0xac, 0xe7, 0x70, 0x90, 0x90, 0x90, 0x26, 0x85, 0x6d, 0x8e, 0xcd, 0xa9,
+	0x5d, 0xac, 0x8f, 0x59, 0x74, 0x3e, 0xd6, 0x6b, 0x38, 0x48, 0x48, 0x48, 0x93, 0xc2, 0x36, 0xc7,
-	0xe5, 0xe3, 0x7f, 0x51, 0xe9, 0x0e, 0xf8, 0x95, 0x0a, 0x3c, 0xe3, 0x32, 0xaf, 0x82, 0x63, 0x1a,
+	0xe6, 0xd4, 0xf2, 0xf1, 0x55, 0x54, 0xba, 0x03, 0x7e, 0xa7, 0x02, 0xaf, 0xb8, 0xcc, 0xab, 0xe0,
-	0xdd, 0x85, 0xd7, 0x0a, 0x4e, 0xb2, 0x62, 0x2b, 0xe4, 0xfb, 0x0f, 0xb4, 0xb2, 0xfb, 0xaa, 0x89,
+	0x90, 0x46, 0x0f, 0xe1, 0xad, 0x82, 0x93, 0xac, 0xd8, 0x08, 0xf9, 0xf9, 0x0b, 0xad, 0xec, 0xbe,
-	0xd5, 0xd6, 0x5e, 0xd2, 0xca, 0x79, 0x04, 0xad, 0x4e, 0x12, 0xdd, 0x80, 0x66, 0x63, 0xd4, 0xf8,
+	0x6a, 0x62, 0xb5, 0xb5, 0xb7, 0xb4, 0x72, 0x9e, 0x41, 0xab, 0x93, 0x44, 0x77, 0xa0, 0xd9, 0x18,
-	0x8d, 0x6c, 0x26, 0xdc, 0x91, 0xa4, 0x3c, 0x4d, 0xa8, 0x0e, 0x8f, 0x8d, 0x87, 0x60, 0x72, 0xaf,
+	0x35, 0x7e, 0x23, 0x9b, 0x09, 0xb7, 0x24, 0x29, 0x8f, 0x13, 0xaa, 0xc3, 0x73, 0xe3, 0x29, 0x98,
-	0x83, 0xb9, 0xa4, 0x09, 0xfd, 0x3b, 0xe6, 0xfc, 0xcd, 0xfe, 0xe0, 0xf6, 0xbe, 0x1e, 0xdc, 0xde,
+	0x3c, 0xea, 0x60, 0x2e, 0x69, 0x42, 0x2f, 0xc7, 0x9c, 0x7f, 0xd8, 0xed, 0xdd, 0xde, 0xcf, 0xbd,
-	0xc7, 0xda, 0x05, 0xfb, 0xda, 0x05, 0x9f, 0x6b, 0x17, 0x7c, 0xaf, 0x5d, 0xf0, 0xe9, 0xa7, 0x0b,
+	0xdb, 0xfb, 0x5a, 0xbb, 0x60, 0x57, 0xbb, 0xe0, 0x7b, 0xed, 0x82, 0xdf, 0xb5, 0x0b, 0xbe, 0xfd,
-	0xde, 0xf9, 0x17, 0x3c, 0xe5, 0x99, 0xfe, 0xac, 0xc0, 0xca, 0x08, 0x07, 0x6a, 0xff, 0x0f, 0x7e,
+	0x75, 0xc1, 0x27, 0xff, 0x8c, 0xa7, 0x3c, 0xd3, 0x9f, 0x70, 0xa0, 0x76, 0xff, 0xe4, 0x5f, 0x00,
-	0x05, 0x00, 0x00, 0xff, 0xff, 0xf5, 0x09, 0xe0, 0xd6, 0x0b, 0x03, 0x00, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0xe3, 0xa0, 0x60, 0x02, 0x07, 0x03, 0x00, 0x00,
 }
 
 // Field returns the value for the given fieldpath as a string, if defined.

api/events/container.proto

@@ -19,8 +19,8 @@ syntax = "proto3";
 package containerd.events;
 
 import "google/protobuf/any.proto";
-import weak "gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
-import weak "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
+import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
 
 option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.plugin.fieldpath_all) = true;

api/events/content.pb.go

@@ -5,6 +5,8 @@ package events
 
 import (
 	fmt "fmt"
+	_ "github.com/containerd/containerd/protobuf/plugin"
+	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	github_com_opencontainers_go_digest "github.com/opencontainers/go-digest"
 	io "io"
@@ -73,7 +75,7 @@ func init() {
 }
 
 var fileDescriptor_dfb34b8b808e2ecd = []byte{
-	// 228 bytes of a gzipped FileDescriptorProto
+	// 224 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x4c, 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, 0xa7, 0x96, 0xa5, 0xe6, 0x95, 0x14, 0x83, 0x45, 0x53,
@@ -86,9 +88,8 @@ var fileDescriptor_dfb34b8b808e2ecd = []byte{
 	0x24, 0xab, 0xf2, 0x0b, 0x52, 0xf3, 0xe0, 0x76, 0x14, 0xeb, 0xa7, 0xe7, 0xeb, 0x42, 0xb4, 0xe8,
 	0xb9, 0x80, 0xa9, 0x20, 0xa8, 0x09, 0x4e, 0x01, 0x27, 0x1e, 0xca, 0x31, 0xdc, 0x78, 0x28, 0xc7,
 	0xd0, 0xf0, 0x48, 0x8e, 0xf1, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92,
-	0x63, 0x5c, 0xf0, 0x45, 0x8e, 0x31, 0xca, 0x88, 0x84, 0x00, 0xb2, 0x86, 0x50, 0x11, 0x0c, 0x11,
+	0x63, 0x5c, 0xf0, 0x45, 0x8e, 0x31, 0xca, 0x88, 0x84, 0x00, 0xb2, 0x86, 0x50, 0x49, 0x6c, 0x60,
-	0x8c, 0x49, 0x6c, 0x60, 0x97, 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x4b, 0x78, 0x99, 0xee,
+	0x57, 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xee, 0x71, 0x10, 0x4c, 0x5d, 0x01, 0x00, 0x00,
-	0x61, 0x01, 0x00, 0x00,
 }
 
 // Field returns the value for the given fieldpath as a string, if defined.

api/events/content.proto

@@ -18,8 +18,8 @@ syntax = "proto3";
 
 package containerd.events;
 
-import weak "gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
-import weak "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
+import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
 
 option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.plugin.fieldpath_all) = true;

api/events/image.pb.go

@@ -5,6 +5,7 @@ package events
 
 import (
 	fmt "fmt"
+	_ "github.com/containerd/containerd/protobuf/plugin"
 	proto "github.com/gogo/protobuf/proto"
 	github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
 	io "io"
@@ -157,7 +158,7 @@ func init() {
 }
 
 var fileDescriptor_7085610f7b33e042 = []byte{
-	// 292 bytes of a gzipped FileDescriptorProto
+	// 290 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0x4f, 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, 0xa7, 0x96, 0xa5, 0xe6, 0x95, 0x14, 0xeb, 0x67, 0xe6,
@@ -174,9 +175,9 @@ var fileDescriptor_7085610f7b33e042 = []byte{
 	0x30, 0x22, 0x9c, 0x1b, 0x5a, 0x90, 0x42, 0x55, 0xe7, 0x42, 0xcc, 0xa3, 0xb6, 0x73, 0x15, 0xa1,
 	0xae, 0x75, 0x49, 0xcd, 0x49, 0xc5, 0xee, 0x5a, 0xa7, 0x80, 0x13, 0x0f, 0xe5, 0x18, 0x6e, 0x3c,
 	0x94, 0x63, 0x68, 0x78, 0x24, 0xc7, 0x78, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f,
-	0x1e, 0xc9, 0x31, 0x2e, 0xf8, 0x22, 0xc7, 0x18, 0x65, 0x44, 0x42, 0xc2, 0xb1, 0x86, 0x50, 0x11,
+	0x1e, 0xc9, 0x31, 0x2e, 0xf8, 0x22, 0xc7, 0x18, 0x65, 0x44, 0x42, 0xc2, 0xb1, 0x86, 0x50, 0x49,
-	0x0c, 0x49, 0x6c, 0xe0, 0xb8, 0x35, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x41, 0x80, 0x92, 0x17,
+	0x6c, 0xe0, 0x98, 0x35, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xea, 0x1f, 0xed, 0xe5, 0x75, 0x02,
-	0x77, 0x02, 0x00, 0x00,
+	0x00, 0x00,
 }
 
 // Field returns the value for the given fieldpath as a string, if defined.

api/events/image.proto

@@ -18,7 +18,7 @@ syntax = "proto3";
 
 package containerd.services.images.v1;
 
-import weak "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
+import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
 
 option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.plugin.fieldpath_all) = true;

api/events/namespace.pb.go

@@ -5,6 +5,8 @@ package events
 
 import (
 	fmt "fmt"
+	_ "github.com/containerd/containerd/protobuf/plugin"
+	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
 	io "io"
@@ -157,7 +159,7 @@ func init() {
 }
 
 var fileDescriptor_6cd45d1d5adffe29 = []byte{
-	// 296 bytes of a gzipped FileDescriptorProto
+	// 292 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x4e, 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, 0xa7, 0x96, 0xa5, 0xe6, 0x95, 0x14, 0xeb, 0xe7, 0x25,
@@ -175,8 +177,8 @@ var fileDescriptor_6cd45d1d5adffe29 = []byte{
 	0x2a, 0x92, 0x4b, 0x5d, 0x52, 0x73, 0x52, 0xb1, 0xbb, 0xd4, 0x29, 0xe0, 0xc4, 0x43, 0x39, 0x86,
 	0x1b, 0x0f, 0xe5, 0x18, 0x1a, 0x1e, 0xc9, 0x31, 0x9e, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c,
 	0xe3, 0x83, 0x47, 0x72, 0x8c, 0x0b, 0xbe, 0xc8, 0x31, 0x46, 0x19, 0x91, 0x90, 0x84, 0xac, 0x21,
-	0x54, 0x04, 0x43, 0x04, 0x63, 0x12, 0x1b, 0x38, 0x66, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff,
+	0x54, 0x12, 0x1b, 0x38, 0x56, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x0a, 0x22, 0xd4, 0x70,
-	0x00, 0x50, 0x87, 0x59, 0x83, 0x02, 0x00, 0x00,
+	0x7f, 0x02, 0x00, 0x00,
 }
 
 // Field returns the value for the given fieldpath as a string, if defined.

api/events/namespace.proto

@@ -18,8 +18,8 @@ syntax = "proto3";
 
 package containerd.events;
 
-import weak "gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
-import weak "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
+import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
 
 option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.plugin.fieldpath_all) = true;

api/events/snapshot.pb.go

@@ -5,6 +5,7 @@ package events
 
 import (
 	fmt "fmt"
+	_ "github.com/containerd/containerd/protobuf/plugin"
 	proto "github.com/gogo/protobuf/proto"
 	io "io"
 	math "math"
@@ -154,7 +155,7 @@ func init() {
 }
 
 var fileDescriptor_bd6c184d3d9aa5f2 = []byte{
-	// 235 bytes of a gzipped FileDescriptorProto
+	// 233 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x4a, 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, 0xa7, 0x96, 0xa5, 0xe6, 0x95, 0x14, 0xeb, 0x17, 0xe7,
@@ -168,8 +169,8 @@ var fileDescriptor_bd6c184d3d9aa5f2 = []byte{
 	0x85, 0xea, 0x04, 0xb3, 0x95, 0x94, 0x10, 0xfa, 0x82, 0x52, 0x73, 0xf3, 0xcb, 0xb0, 0xd8, 0xe9,
 	0x14, 0x70, 0xe2, 0xa1, 0x1c, 0xc3, 0x8d, 0x87, 0x72, 0x0c, 0x0d, 0x8f, 0xe4, 0x18, 0x4f, 0x3c,
 	0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x05, 0x5f, 0xe4, 0x18, 0xa3,
-	0x8c, 0x48, 0x08, 0x47, 0x6b, 0x08, 0x15, 0xc1, 0x90, 0xc4, 0x06, 0xf6, 0xb3, 0x31, 0x20, 0x00,
+	0x8c, 0x48, 0x08, 0x47, 0x6b, 0x08, 0x95, 0xc4, 0x06, 0xf6, 0xb1, 0x31, 0x20, 0x00, 0x00, 0xff,
-	0x00, 0xff, 0xff, 0x69, 0x66, 0xa9, 0x2a, 0x86, 0x01, 0x00, 0x00,
+	0xff, 0x62, 0x68, 0x19, 0xf5, 0x84, 0x01, 0x00, 0x00,
 }
 
 // Field returns the value for the given fieldpath as a string, if defined.

api/events/snapshot.proto

@@ -18,7 +18,7 @@ syntax = "proto3";
 
 package containerd.events;
 
-import weak "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
+import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
 
 option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.plugin.fieldpath_all) = true;

api/events/task.pb.go

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

api/events/task.proto

@@ -18,10 +18,10 @@ syntax = "proto3";
 
 package containerd.events;
 
-import weak "gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
 import "github.com/containerd/containerd/api/types/mount.proto";
-import weak "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
+import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
 
 option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.plugin.fieldpath_all) = true;

api/next.pb.txt

@@ -164,8 +164,6 @@ file {
     go_package: "github.com/containerd/containerd/api/events;events"
     63300: 1
   }
-  weak_dependency: 1
-  weak_dependency: 2
   syntax: "proto3"
 }
 file {
@@ -191,8 +189,6 @@ file {
     go_package: "github.com/containerd/containerd/api/events;events"
     63300: 1
   }
-  weak_dependency: 0
-  weak_dependency: 1
   syntax: "proto3"
 }
 file {
@@ -289,7 +285,6 @@ file {
     go_package: "github.com/containerd/containerd/api/events;events"
     63300: 1
   }
-  weak_dependency: 0
   syntax: "proto3"
 }
 file {
@@ -387,8 +382,6 @@ file {
     go_package: "github.com/containerd/containerd/api/events;events"
     63300: 1
   }
-  weak_dependency: 0
-  weak_dependency: 1
   syntax: "proto3"
 }
 file {
@@ -443,7 +436,6 @@ file {
     go_package: "github.com/containerd/containerd/api/events;events"
     63300: 1
   }
-  weak_dependency: 0
   syntax: "proto3"
 }
 file {
@@ -515,7 +507,6 @@ file {
   options {
     go_package: "github.com/containerd/containerd/api/types;types"
   }
-  weak_dependency: 0
   syntax: "proto3"
 }
 file {
@@ -801,8 +792,6 @@ file {
     go_package: "github.com/containerd/containerd/api/events;events"
     63300: 1
   }
-  weak_dependency: 0
-  weak_dependency: 3
   syntax: "proto3"
 }
 file {
@@ -1173,7 +1162,6 @@ file {
   options {
     go_package: "github.com/containerd/containerd/api/services/containers/v1;containers"
   }
-  weak_dependency: 0
   syntax: "proto3"
 }
 file {
@@ -1738,7 +1726,6 @@ file {
   options {
     go_package: "github.com/containerd/containerd/api/services/content/v1;content"
   }
-  weak_dependency: 0
   syntax: "proto3"
 }
 file {
@@ -1804,7 +1791,6 @@ file {
   options {
     go_package: "github.com/containerd/containerd/api/types;types"
   }
-  weak_dependency: 0
   syntax: "proto3"
 }
 file {
@@ -1961,7 +1947,6 @@ file {
   options {
     go_package: "github.com/containerd/containerd/api/services/diff/v1;diff"
   }
-  weak_dependency: 0
   syntax: "proto3"
 }
 file {
@@ -2073,8 +2058,6 @@ file {
   options {
     go_package: "github.com/containerd/containerd/api/services/events/v1;events"
   }
-  weak_dependency: 0
-  weak_dependency: 1
   syntax: "proto3"
 }
 file {
@@ -2315,7 +2298,6 @@ file {
   options {
     go_package: "github.com/containerd/containerd/api/services/images/v1;images"
   }
-  weak_dependency: 0
   syntax: "proto3"
 }
 file {
@@ -2352,7 +2334,6 @@ file {
   options {
     go_package: "github.com/containerd/containerd/api/types;types"
   }
-  weak_dependency: 0
   syntax: "proto3"
 }
 file {
@@ -2532,7 +2513,6 @@ file {
   options {
     go_package: "github.com/containerd/containerd/api/services/introspection/v1;introspection"
   }
-  weak_dependency: 3
   syntax: "proto3"
 }
 file {
@@ -2797,7 +2777,6 @@ file {
   options {
     go_package: "github.com/containerd/containerd/api/services/leases/v1;leases"
   }
-  weak_dependency: 0
   syntax: "proto3"
 }
 file {
@@ -2997,7 +2976,6 @@ file {
   options {
     go_package: "github.com/containerd/containerd/api/services/namespaces/v1;namespaces"
   }
-  weak_dependency: 0
   syntax: "proto3"
 }
 file {
@@ -3549,7 +3527,6 @@ file {
   options {
     go_package: "github.com/containerd/containerd/api/services/snapshots/v1;snapshots"
   }
-  weak_dependency: 0
   syntax: "proto3"
 }
 file {
@@ -3591,7 +3568,6 @@ file {
   options {
     go_package: "github.com/containerd/containerd/api/types;types"
   }
-  weak_dependency: 0
   syntax: "proto3"
 }
 file {
@@ -3746,7 +3722,6 @@ file {
       62023: "Status"
     }
   }
-  weak_dependency: 0
   syntax: "proto3"
 }
 file {
@@ -4405,7 +4380,6 @@ file {
   options {
     go_package: "github.com/containerd/containerd/api/services/tasks/v1;tasks"
   }
-  weak_dependency: 2
   syntax: "proto3"
 }
 file {
@@ -4478,8 +4452,6 @@ file {
   options {
     go_package: "github.com/containerd/containerd/api/services/ttrpc/events/v1;events"
   }
-  weak_dependency: 0
-  weak_dependency: 1
   syntax: "proto3"
 }
 file {
@@ -4515,6 +4487,5 @@ file {
   options {
     go_package: "github.com/containerd/containerd/api/services/version/v1;version"
   }
-  weak_dependency: 1
   syntax: "proto3"
 }

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

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

api/services/containers/v1/containers.proto

@@ -18,7 +18,7 @@ syntax = "proto3";
 
 package containerd.services.containers.v1;
 
-import weak "gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
 import "google/protobuf/any.proto";
 import "google/protobuf/empty.proto";
 import "google/protobuf/field_mask.proto";

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

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

api/services/content/v1/content.proto

@@ -18,7 +18,7 @@ syntax = "proto3";
 
 package containerd.services.content.v1;
 
-import weak "gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
 import "google/protobuf/field_mask.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/empty.proto";

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

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

api/services/diff/v1/diff.proto

@@ -18,7 +18,7 @@ syntax = "proto3";
 
 package containerd.services.diff.v1;
 
-import weak "gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
 import "google/protobuf/any.proto";
 import "github.com/containerd/containerd/api/types/mount.proto";
 import "github.com/containerd/containerd/api/types/descriptor.proto";

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

@@ -6,7 +6,9 @@ package events
 import (
 	context "context"
 	fmt "fmt"
+	_ "github.com/containerd/containerd/protobuf/plugin"
 	github_com_containerd_typeurl "github.com/containerd/typeurl"
+	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
 	types "github.com/gogo/protobuf/types"
@@ -205,37 +207,36 @@ func init() {
 }
 
 var fileDescriptor_43fcd20dc1642376 = []byte{
-	// 466 bytes of a gzipped FileDescriptorProto
+	// 462 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0xcd, 0x8e, 0xd3, 0x30,
 	0x14, 0x85, 0xeb, 0xf9, 0x6d, 0x3c, 0xd2, 0x08, 0x45, 0x15, 0x2a, 0x01, 0xd2, 0xaa, 0x1b, 0x2a,
-	0x04, 0x0e, 0x53, 0x76, 0x20, 0x21, 0x28, 0x94, 0xf5, 0x28, 0x80, 0x54, 0xb1, 0x4b, 0xd2, 0xdb,
+	0x04, 0x0e, 0x53, 0x76, 0x20, 0x21, 0x28, 0x94, 0xf5, 0x28, 0x80, 0x84, 0xd8, 0x25, 0xe9, 0x6d,
-	0xd4, 0x52, 0x62, 0x9b, 0xd8, 0x09, 0x9a, 0xdd, 0x3c, 0x02, 0x1b, 0xde, 0x84, 0x0d, 0x6f, 0xd0,
+	0x6a, 0x29, 0xb1, 0x4d, 0xec, 0x04, 0xcd, 0x6e, 0x1e, 0x81, 0x0d, 0x6f, 0xc2, 0x86, 0x37, 0xe8,
-	0x25, 0x4b, 0x56, 0xc0, 0xf4, 0x49, 0x50, 0x13, 0xbb, 0x61, 0x3a, 0x40, 0x10, 0xbb, 0x6b, 0xdf,
+	0x92, 0x25, 0x2b, 0x60, 0xfa, 0x24, 0xa8, 0x89, 0xdd, 0x30, 0x2d, 0x10, 0x34, 0xbb, 0x6b, 0xdf,
-	0xe3, 0xcf, 0xb9, 0xe7, 0x38, 0xf8, 0x45, 0x4c, 0xd5, 0x22, 0x0f, 0x49, 0xc4, 0x53, 0x2f, 0xe2,
+	0xe3, 0xcf, 0xb9, 0xe7, 0x38, 0xf8, 0x45, 0x4c, 0xd5, 0x3c, 0x0f, 0x49, 0xc4, 0x53, 0x2f, 0xe2,
-	0x4c, 0x05, 0x94, 0x41, 0x36, 0xfb, 0xb5, 0x0c, 0x04, 0xf5, 0x24, 0x64, 0x05, 0x8d, 0x40, 0x7a,
+	0x4c, 0x05, 0x94, 0x41, 0x36, 0xfd, 0xbd, 0x0c, 0x04, 0xf5, 0x24, 0x64, 0x05, 0x8d, 0x40, 0x7a,
 	0x50, 0x00, 0x53, 0xd2, 0x2b, 0x4e, 0x74, 0x45, 0x44, 0xc6, 0x15, 0xb7, 0x6f, 0xd7, 0x7a, 0x62,
-	0xb4, 0x44, 0x2b, 0x8a, 0x13, 0xe7, 0x69, 0xe3, 0x25, 0x25, 0x26, 0xcc, 0xe7, 0x9e, 0x48, 0xf2,
+	0xb4, 0x44, 0x2b, 0x8a, 0x13, 0xe7, 0x69, 0xe3, 0x25, 0x25, 0x26, 0xcc, 0x67, 0x9e, 0x48, 0xf2,
-	0x98, 0x32, 0x6f, 0x4e, 0x21, 0x99, 0x89, 0x40, 0x2d, 0xaa, 0x0b, 0x9c, 0x4e, 0xcc, 0x63, 0x5e,
+	0x98, 0x32, 0x6f, 0x46, 0x21, 0x99, 0x8a, 0x40, 0xcd, 0xab, 0x0b, 0x9c, 0x4e, 0xcc, 0x63, 0x5e,
-	0x96, 0xde, 0xba, 0xd2, 0xbb, 0x37, 0x62, 0xce, 0xe3, 0x04, 0xea, 0xd3, 0x01, 0x3b, 0xd3, 0xad,
+	0x96, 0xde, 0xaa, 0xd2, 0xbb, 0x37, 0x62, 0xce, 0xe3, 0x04, 0xea, 0xd3, 0x01, 0x3b, 0xd3, 0xad,
-	0x9b, 0xdb, 0x2d, 0x48, 0x85, 0x32, 0xcd, 0xde, 0x76, 0x53, 0xd1, 0x14, 0xa4, 0x0a, 0x52, 0x51,
+	0x9b, 0x9b, 0x2d, 0x48, 0x85, 0x32, 0xcd, 0xde, 0x66, 0x53, 0xd1, 0x14, 0xa4, 0x0a, 0x52, 0x51,
-	0x09, 0x06, 0x3e, 0x3e, 0x3e, 0xcd, 0xc3, 0x84, 0xca, 0x85, 0x0f, 0xef, 0x72, 0x90, 0xca, 0xee,
+	0x09, 0x06, 0x3e, 0x3e, 0x3e, 0xcd, 0xc3, 0x84, 0xca, 0xb9, 0x0f, 0xef, 0x73, 0x90, 0xca, 0xee,
 	0xe0, 0x7d, 0xc5, 0x05, 0x8d, 0xba, 0xa8, 0x8f, 0x86, 0x96, 0x5f, 0x2d, 0xec, 0xbb, 0x78, 0xbf,
 	0x9c, 0xb2, 0xbb, 0xd3, 0x47, 0xc3, 0xa3, 0x51, 0x87, 0x54, 0x60, 0x62, 0xc0, 0xe4, 0x19, 0x3b,
-	0xf3, 0x2b, 0xc9, 0xe0, 0x0d, 0x3e, 0x7e, 0xc9, 0xb3, 0xf7, 0x41, 0x36, 0x33, 0xcc, 0xe7, 0xb8,
+	0xf3, 0x2b, 0xc9, 0xe0, 0x0d, 0x3e, 0x7e, 0xc9, 0xb3, 0x0f, 0x41, 0x36, 0x35, 0xcc, 0xe7, 0xb8,
-	0x0d, 0xac, 0x80, 0x84, 0x0b, 0x28, 0xb1, 0x47, 0xa3, 0x3b, 0xe4, 0xaf, 0x46, 0x92, 0x89, 0x96,
+	0x0d, 0xac, 0x80, 0x84, 0x0b, 0x28, 0xb1, 0x47, 0xa3, 0x3b, 0xe4, 0x9f, 0x46, 0x92, 0x89, 0x96,
-	0xfb, 0x9b, 0x83, 0x83, 0x7b, 0xf8, 0xda, 0xab, 0x3c, 0x94, 0x51, 0x46, 0x43, 0x30, 0xe0, 0x2e,
+	0xfb, 0xeb, 0x83, 0x83, 0x7b, 0xf8, 0xda, 0xab, 0x3c, 0x94, 0x51, 0x46, 0x43, 0x30, 0xe0, 0x2e,
-	0x3e, 0x9c, 0xd3, 0x44, 0x41, 0x26, 0xbb, 0xa8, 0xbf, 0x3b, 0xb4, 0x7c, 0xb3, 0x1c, 0x7c, 0x42,
+	0x3e, 0x9c, 0xd1, 0x44, 0x41, 0x26, 0xbb, 0xa8, 0xbf, 0x3b, 0xb4, 0x7c, 0xb3, 0x1c, 0x7c, 0x46,
-	0xb8, 0x6d, 0x20, 0xf6, 0x18, 0x5b, 0x9b, 0xc1, 0xf5, 0x07, 0x38, 0x57, 0x26, 0x78, 0x6d, 0x14,
+	0xb8, 0x6d, 0x20, 0xf6, 0x18, 0x5b, 0xeb, 0xc1, 0xf5, 0x07, 0x38, 0x5b, 0x13, 0xbc, 0x36, 0x8a,
-	0xe3, 0xf6, 0xf2, 0x5b, 0xaf, 0xf5, 0xe1, 0x7b, 0x0f, 0xf9, 0xf5, 0x31, 0xfb, 0x16, 0xb6, 0x58,
+	0x71, 0x7b, 0xf1, 0xbd, 0xd7, 0xfa, 0xf8, 0xa3, 0x87, 0xfc, 0xfa, 0x98, 0x7d, 0x0b, 0x5b, 0x2c,
-	0x90, 0x82, 0x14, 0x41, 0x04, 0xa5, 0x0b, 0x96, 0x5f, 0x6f, 0xd4, 0xae, 0xed, 0xfe, 0xd6, 0xb5,
+	0x48, 0x41, 0x8a, 0x20, 0x82, 0xd2, 0x05, 0xcb, 0xaf, 0x37, 0x6a, 0xd7, 0x76, 0xff, 0xe8, 0xda,
-	0xbd, 0x46, 0xd7, 0x1e, 0xed, 0x9d, 0x7f, 0xee, 0xa1, 0xd1, 0xc7, 0x1d, 0x7c, 0x30, 0x29, 0x5d,
+	0x5e, 0xa3, 0x6b, 0x8f, 0xf6, 0xce, 0xbf, 0xf4, 0xd0, 0xe8, 0xd3, 0x0e, 0x3e, 0x98, 0x94, 0x2e,
-	0xb0, 0x4f, 0xf1, 0xa1, 0x8e, 0xc6, 0xbe, 0xdf, 0xe0, 0xd6, 0xe5, 0x08, 0x9d, 0xeb, 0x57, 0xee,
+	0xd8, 0xa7, 0xf8, 0x50, 0x47, 0x63, 0xdf, 0x6f, 0x70, 0xeb, 0x72, 0x84, 0xce, 0xf5, 0xad, 0x7b,
-	0x99, 0xac, 0xdf, 0xc4, 0x9a, 0xa8, 0x83, 0x69, 0x24, 0x5e, 0x0e, 0xf0, 0x8f, 0xc4, 0x18, 0x5b,
+	0x26, 0xab, 0x37, 0xb1, 0x22, 0xea, 0x60, 0x1a, 0x89, 0x97, 0x03, 0xfc, 0x2b, 0x31, 0xc6, 0xd6,
-	0x9b, 0x4c, 0x6c, 0xaf, 0x81, 0xb9, 0x9d, 0x9e, 0xf3, 0xaf, 0x8f, 0xe0, 0x01, 0x1a, 0x4f, 0x97,
+	0x3a, 0x13, 0xdb, 0x6b, 0x60, 0x6e, 0xa6, 0xe7, 0xfc, 0xef, 0x23, 0x78, 0x80, 0xc6, 0x6f, 0x17,
-	0x17, 0x6e, 0xeb, 0xeb, 0x85, 0xdb, 0x3a, 0x5f, 0xb9, 0x68, 0xb9, 0x72, 0xd1, 0x97, 0x95, 0x8b,
+	0x17, 0x6e, 0xeb, 0xdb, 0x85, 0xdb, 0x3a, 0x5f, 0xba, 0x68, 0xb1, 0x74, 0xd1, 0xd7, 0xa5, 0x8b,
-	0x7e, 0xac, 0x5c, 0xf4, 0xf6, 0xc9, 0x7f, 0xfe, 0xd7, 0x8f, 0xab, 0x6a, 0xda, 0x9a, 0xa2, 0xf0,
+	0x7e, 0x2e, 0x5d, 0xf4, 0xee, 0xc9, 0x15, 0xff, 0xeb, 0xc7, 0x55, 0x15, 0x1e, 0x94, 0x23, 0x3d,
-	0xa0, 0x1c, 0xeb, 0xe1, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe6, 0xbf, 0x19, 0xa6, 0x24, 0x04,
+	0xfc, 0x15, 0x00, 0x00, 0xff, 0xff, 0x1c, 0x38, 0x37, 0x72, 0x20, 0x04, 0x00, 0x00,
-	0x00, 0x00,
 }
 
 // Field returns the value for the given fieldpath as a string, if defined.

api/services/events/v1/events.proto

@@ -18,8 +18,8 @@ syntax = "proto3";
 
 package containerd.services.events.v1;
 
-import weak "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
+import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
-import weak "gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
 import "google/protobuf/any.proto";
 import "google/protobuf/empty.proto";
 import "google/protobuf/timestamp.proto";

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

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

api/services/images/v1/images.proto

@@ -18,7 +18,7 @@ syntax = "proto3";
 
 package containerd.services.images.v1;
 
-import weak "gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
 import "google/protobuf/empty.proto";
 import "google/protobuf/field_mask.proto";
 import "google/protobuf/timestamp.proto";

api/services/introspection/v1/introspection.pb.go

@@ -8,6 +8,7 @@ import (
 	fmt "fmt"
 	types "github.com/containerd/containerd/api/types"
 	rpc "github.com/gogo/googleapis/google/rpc"
+	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
 	types1 "github.com/gogo/protobuf/types"
@@ -247,42 +248,42 @@ func init() {
 }
 
 var fileDescriptor_1a14fda866f10715 = []byte{
-	// 549 bytes of a gzipped FileDescriptorProto
+	// 548 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xc1, 0x6e, 0xd3, 0x40,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x41, 0x6f, 0xd3, 0x4c,
-	0x10, 0xad, 0x9d, 0x34, 0x6e, 0x37, 0xa5, 0xa0, 0x55, 0x55, 0x2c, 0x83, 0x9c, 0x28, 0xe2, 0x10,
+	0x10, 0xad, 0x9d, 0x34, 0x6e, 0x36, 0xfd, 0xfa, 0xa1, 0x55, 0x55, 0x2c, 0x83, 0x9c, 0x28, 0xe2,
-	0x21, 0x58, 0xab, 0x01, 0x24, 0x5a, 0x24, 0x0e, 0x51, 0x73, 0x88, 0xd4, 0x43, 0xe5, 0xa8, 0x08,
+	0x10, 0x21, 0x58, 0xab, 0x01, 0x24, 0x5a, 0x24, 0x0e, 0x51, 0x73, 0x88, 0xd4, 0x43, 0xe5, 0xa8,
-	0x71, 0xa9, 0x1c, 0x67, 0x63, 0x56, 0x38, 0xde, 0xed, 0xee, 0xda, 0x22, 0x37, 0x3e, 0x2f, 0x47,
+	0x1c, 0xb8, 0x54, 0x8e, 0xb3, 0x31, 0x2b, 0x1c, 0xef, 0x76, 0x77, 0x6d, 0x91, 0x1b, 0x3f, 0x2f,
-	0x8e, 0x9c, 0x02, 0xf5, 0x37, 0xf0, 0x01, 0xc8, 0xbb, 0x76, 0x9a, 0xdc, 0x12, 0x71, 0x9b, 0x79,
+	0x47, 0x8e, 0x9c, 0x02, 0xf5, 0x6f, 0xe0, 0x07, 0x20, 0xef, 0xda, 0x69, 0x72, 0x4b, 0xc4, 0x6d,
-	0x33, 0x6f, 0xe6, 0xcd, 0xf3, 0xca, 0xc0, 0x8f, 0x88, 0xfc, 0x9a, 0x8e, 0x51, 0x48, 0x67, 0x5e,
+	0xe6, 0xcd, 0xbc, 0x99, 0x37, 0xcf, 0x2b, 0x03, 0x3f, 0x22, 0xf2, 0x4b, 0x3a, 0x41, 0x21, 0x9d,
-	0x48, 0x13, 0x19, 0x90, 0x04, 0xf3, 0xc9, 0x7a, 0x18, 0x30, 0xe2, 0x09, 0xcc, 0x33, 0x12, 0x62,
+	0x7b, 0x21, 0x4d, 0x64, 0x40, 0x12, 0xcc, 0xa7, 0x9b, 0x61, 0xc0, 0x88, 0x27, 0x30, 0xcf, 0x48,
-	0xe1, 0x91, 0x44, 0x72, 0x2a, 0x18, 0x0e, 0x25, 0xa1, 0x89, 0x97, 0x9d, 0x6d, 0x02, 0x88, 0x71,
+	0x88, 0x85, 0x47, 0x12, 0xc9, 0xa9, 0x60, 0x38, 0x94, 0x84, 0x26, 0x5e, 0x76, 0xbe, 0x0d, 0x20,
-	0x2a, 0x29, 0x7c, 0xf1, 0xc0, 0x46, 0x15, 0x13, 0x6d, 0x36, 0x66, 0x67, 0xce, 0xf9, 0x56, 0x9b,
+	0xc6, 0xa9, 0xa4, 0xf0, 0xc5, 0x23, 0x1b, 0x55, 0x4c, 0xb4, 0xdd, 0x98, 0x9d, 0x3b, 0x17, 0x3b,
-	0xe5, 0x9c, 0x61, 0xe1, 0xb1, 0x38, 0x90, 0x53, 0xca, 0x67, 0x7a, 0x81, 0xf3, 0x34, 0xa2, 0x34,
+	0x6d, 0x96, 0x0b, 0x86, 0x85, 0xc7, 0xe2, 0x40, 0xce, 0x28, 0x9f, 0xeb, 0x05, 0xce, 0xd3, 0x88,
-	0x8a, 0xb1, 0xc7, 0x59, 0xe8, 0x09, 0x19, 0xc8, 0x54, 0x94, 0x85, 0x67, 0x65, 0x41, 0x65, 0xe3,
+	0xd2, 0x28, 0xc6, 0x1e, 0x67, 0xa1, 0x27, 0x64, 0x20, 0x53, 0x51, 0x16, 0x9e, 0x95, 0x05, 0x95,
-	0x74, 0xea, 0xe1, 0x19, 0x93, 0xf3, 0xb2, 0x78, 0x12, 0xd1, 0x88, 0xaa, 0xd0, 0x2b, 0x22, 0x8d,
+	0x4d, 0xd2, 0x99, 0x87, 0xe7, 0x4c, 0x2e, 0xca, 0xe2, 0x69, 0x44, 0x23, 0xaa, 0x42, 0xaf, 0x88,
-	0x76, 0xfe, 0x9a, 0xa0, 0x71, 0x1d, 0xa7, 0x11, 0x49, 0x20, 0x04, 0xf5, 0x62, 0x9d, 0x6d, 0xb4,
+	0x34, 0xda, 0xfd, 0x63, 0x82, 0xc6, 0x4d, 0x9c, 0x46, 0x24, 0x81, 0x10, 0xd4, 0x8b, 0x75, 0xb6,
-	0x8d, 0xee, 0xa1, 0xaf, 0x62, 0x78, 0x0a, 0x4c, 0x32, 0xb1, 0xcd, 0x02, 0xe9, 0x37, 0xf2, 0x65,
+	0xd1, 0x31, 0x7a, 0x4d, 0x5f, 0xc5, 0xf0, 0x0c, 0x98, 0x64, 0x6a, 0x9b, 0x05, 0x32, 0x68, 0xe4,
-	0xcb, 0x1c, 0x5e, 0xfa, 0x26, 0x99, 0x40, 0x07, 0x1c, 0x70, 0x7c, 0x97, 0x12, 0x8e, 0x85, 0x5d,
+	0xab, 0xb6, 0x39, 0xba, 0xf2, 0x4d, 0x32, 0x85, 0x0e, 0x38, 0xe2, 0xf8, 0x3e, 0x25, 0x1c, 0x0b,
-	0x6b, 0xd7, 0xba, 0x87, 0xfe, 0x2a, 0x87, 0x1f, 0xc1, 0x61, 0x25, 0x58, 0xd8, 0xf5, 0x76, 0xad,
+	0xbb, 0xd6, 0xa9, 0xf5, 0x9a, 0xfe, 0x3a, 0x87, 0x1f, 0x41, 0xb3, 0x12, 0x2c, 0xec, 0x7a, 0xa7,
-	0xdb, 0xec, 0x39, 0x68, 0xcd, 0x13, 0x75, 0x13, 0xba, 0x2e, 0x5b, 0xfa, 0xf5, 0xc5, 0xb2, 0xb5,
+	0xd6, 0x6b, 0xf5, 0x1d, 0xb4, 0xe1, 0x89, 0xba, 0x09, 0xdd, 0x94, 0x2d, 0x83, 0xfa, 0x72, 0xd5,
-	0xe7, 0x3f, 0x50, 0xe0, 0x08, 0x58, 0xf8, 0x3b, 0xa3, 0x5c, 0x0a, 0x7b, 0x5f, 0xb1, 0xcf, 0xd1,
+	0x3e, 0xf0, 0x1f, 0x29, 0x70, 0x0c, 0x2c, 0xfc, 0x8d, 0x51, 0x2e, 0x85, 0x7d, 0xa8, 0xd8, 0x17,
-	0x36, 0x8e, 0x22, 0x7d, 0x06, 0x1a, 0x68, 0xee, 0x20, 0x91, 0x7c, 0xee, 0x57, 0x93, 0x60, 0x07,
+	0x68, 0x17, 0x47, 0x91, 0x3e, 0x03, 0x0d, 0x35, 0x77, 0x98, 0x48, 0xbe, 0xf0, 0xab, 0x49, 0xb0,
-	0x1c, 0x85, 0x01, 0x0b, 0xc6, 0x24, 0x26, 0x92, 0x60, 0x61, 0x37, 0x94, 0xe8, 0x0d, 0x0c, 0xbe,
+	0x0b, 0x8e, 0xc3, 0x80, 0x05, 0x13, 0x12, 0x13, 0x49, 0xb0, 0xb0, 0x1b, 0x4a, 0xf4, 0x16, 0x06,
-	0x06, 0x07, 0x24, 0x21, 0xf2, 0x16, 0x73, 0x6e, 0x5b, 0x6d, 0xa3, 0xdb, 0xec, 0x41, 0xa4, 0x1d,
+	0x5f, 0x83, 0x23, 0x92, 0x10, 0x79, 0x87, 0x39, 0xb7, 0xad, 0x8e, 0xd1, 0x6b, 0xf5, 0x21, 0xd2,
-	0x45, 0x9c, 0x85, 0x68, 0xa4, 0xac, 0xf6, 0xad, 0xa2, 0x67, 0xc0, 0xb9, 0x73, 0x01, 0x8e, 0xd6,
+	0x8e, 0x22, 0xce, 0x42, 0x34, 0x56, 0x56, 0xfb, 0x56, 0xd1, 0x33, 0xe4, 0xdc, 0xb9, 0x04, 0xc7,
-	0x77, 0xc1, 0x27, 0xa0, 0xf6, 0x0d, 0xcf, 0x4b, 0xfb, 0x8a, 0x10, 0x9e, 0x80, 0xfd, 0x2c, 0x88,
+	0x9b, 0xbb, 0xe0, 0x13, 0x50, 0xfb, 0x8a, 0x17, 0xa5, 0x7d, 0x45, 0x08, 0x4f, 0xc1, 0x61, 0x16,
-	0x53, 0xac, 0x0d, 0xf4, 0x75, 0x72, 0x61, 0xbe, 0x37, 0x3a, 0x2f, 0xc1, 0xb1, 0x96, 0x2b, 0x7c,
+	0xc4, 0x29, 0xd6, 0x06, 0xfa, 0x3a, 0xb9, 0x34, 0xdf, 0x1b, 0xdd, 0x97, 0xe0, 0x44, 0xcb, 0x15,
-	0x7c, 0x97, 0x62, 0x21, 0xa1, 0x0d, 0xac, 0x29, 0x89, 0x25, 0xe6, 0xc2, 0x36, 0x94, 0xb6, 0x2a,
+	0x3e, 0xbe, 0x4f, 0xb1, 0x90, 0xd0, 0x06, 0xd6, 0x8c, 0xc4, 0x12, 0x73, 0x61, 0x1b, 0x4a, 0x5b,
-	0xed, 0xdc, 0x82, 0xc7, 0xab, 0x5e, 0xc1, 0x68, 0x22, 0x30, 0xbc, 0x02, 0x16, 0xd3, 0x90, 0x6a,
+	0x95, 0x76, 0xef, 0xc0, 0xff, 0xeb, 0x5e, 0xc1, 0x68, 0x22, 0x30, 0xbc, 0x06, 0x16, 0xd3, 0x90,
-	0x6e, 0xf6, 0x5e, 0xed, 0x62, 0x51, 0x69, 0x79, 0x35, 0xa2, 0x83, 0xc0, 0xf1, 0x08, 0xf3, 0x0c,
+	0x6a, 0x6e, 0xf5, 0x5f, 0xed, 0x63, 0x51, 0x69, 0x79, 0x35, 0xa2, 0x8b, 0xc0, 0xc9, 0x18, 0xf3,
-	0xf3, 0xd5, 0xfc, 0xe7, 0xa0, 0x9e, 0xa6, 0x64, 0xa2, 0x6f, 0xe9, 0x1f, 0xe4, 0xcb, 0x56, 0xfd,
+	0x0c, 0xf3, 0xf5, 0xfc, 0xe7, 0xa0, 0x9e, 0xa6, 0x64, 0xaa, 0x6f, 0x19, 0x1c, 0xe5, 0xab, 0x76,
-	0xe6, 0x66, 0x78, 0xe9, 0x2b, 0xb4, 0xf7, 0xdb, 0x00, 0x8f, 0x86, 0xeb, 0xa3, 0x61, 0x06, 0xac,
+	0xfd, 0xf6, 0x76, 0x74, 0xe5, 0x2b, 0xb4, 0xff, 0xcb, 0x00, 0xff, 0x8d, 0x36, 0x47, 0xc3, 0x0c,
-	0x52, 0x22, 0x7c, 0xbb, 0x8b, 0x92, 0xea, 0x7a, 0xe7, 0xdd, 0x8e, 0xac, 0x52, 0xe7, 0x27, 0xd0,
+	0x58, 0xa5, 0x44, 0xf8, 0x76, 0x1f, 0x25, 0xd5, 0xf5, 0xce, 0xbb, 0x3d, 0x59, 0xa5, 0xce, 0x4f,
-	0xd0, 0xca, 0xe1, 0x69, 0xf5, 0xa5, 0xaa, 0xb7, 0x8f, 0x06, 0xc5, 0xdb, 0x77, 0xb6, 0x94, 0xb3,
+	0xa0, 0xa1, 0x95, 0xc3, 0xb3, 0xea, 0x4b, 0x55, 0x6f, 0x1f, 0x0d, 0x8b, 0xb7, 0xef, 0xec, 0x28,
-	0x79, 0x7f, 0x7f, 0xba, 0xb8, 0x77, 0xf7, 0x7e, 0xdd, 0xbb, 0x7b, 0x3f, 0x72, 0xd7, 0x58, 0xe4,
+	0x67, 0xfb, 0xfe, 0xc1, 0x6c, 0xf9, 0xe0, 0x1e, 0xfc, 0x7c, 0x70, 0x0f, 0xbe, 0xe7, 0xae, 0xb1,
-	0xae, 0xf1, 0x33, 0x77, 0x8d, 0x3f, 0xb9, 0x6b, 0x7c, 0xb9, 0xfa, 0xbf, 0x1f, 0xc6, 0x87, 0x0d,
+	0xcc, 0x5d, 0xe3, 0x47, 0xee, 0x1a, 0xbf, 0x73, 0xd7, 0xf8, 0x7c, 0xfd, 0x6f, 0x3f, 0x8c, 0x0f,
-	0xe0, 0x73, 0x6d, 0xdc, 0x50, 0x7a, 0xdf, 0xfc, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x0c, 0xb3, 0x50,
+	0x5b, 0xc0, 0xa4, 0xa1, 0xd4, 0xbe, 0xf9, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x15, 0xc1, 0xc4, 0xe8,
-	0xdc, 0x89, 0x04, 0x00, 0x00,
+	0x87, 0x04, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.

api/services/introspection/v1/introspection.proto

@@ -21,7 +21,7 @@ package containerd.services.introspection.v1;
 import "github.com/containerd/containerd/api/types/platform.proto";
 import "google/rpc/status.proto";
 import "google/protobuf/empty.proto";
-import weak "gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
 
 option go_package = "github.com/containerd/containerd/api/services/introspection/v1;introspection";
 

api/services/leases/v1/leases.pb.go

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

api/services/leases/v1/leases.proto

@@ -17,7 +17,7 @@ syntax = "proto3";
 
 package containerd.services.leases.v1;
 
-import weak "gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
 import "google/protobuf/empty.proto";
 import "google/protobuf/timestamp.proto";
 

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

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

api/services/namespaces/v1/namespace.proto

@@ -18,7 +18,7 @@ syntax = "proto3";
 
 package containerd.services.namespaces.v1;
 
-import weak "gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
 import "google/protobuf/empty.proto";
 import "google/protobuf/field_mask.proto";
 

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

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

api/services/snapshots/v1/snapshots.proto

@@ -18,7 +18,7 @@ syntax = "proto3";
 
 package containerd.services.snapshots.v1;
 
-import weak "gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
 import "google/protobuf/empty.proto";
 import "google/protobuf/field_mask.proto";
 import "google/protobuf/timestamp.proto";

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

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

api/services/tasks/v1/tasks.proto

@@ -20,7 +20,7 @@ package containerd.services.tasks.v1;
 
 import "google/protobuf/empty.proto";
 import "google/protobuf/any.proto";
-import weak "gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
 import "github.com/containerd/containerd/api/types/mount.proto";
 import "github.com/containerd/containerd/api/types/metrics.proto";
 import "github.com/containerd/containerd/api/types/descriptor.proto";

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

@@ -6,8 +6,10 @@ package events
 import (
 	context "context"
 	fmt "fmt"
+	_ "github.com/containerd/containerd/protobuf/plugin"
 	github_com_containerd_ttrpc "github.com/containerd/ttrpc"
 	github_com_containerd_typeurl "github.com/containerd/typeurl"
+	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
 	types "github.com/gogo/protobuf/types"
@@ -122,32 +124,32 @@ func init() {
 }
 
 var fileDescriptor_19f98672016720b5 = []byte{
-	// 396 bytes of a gzipped FileDescriptorProto
+	// 392 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x52, 0xc1, 0x8e, 0xd3, 0x30,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x52, 0xb1, 0xae, 0xd3, 0x30,
-	0x10, 0x8d, 0x61, 0x77, 0x69, 0x8d, 0xc4, 0xc1, 0xaa, 0x50, 0x08, 0x28, 0x59, 0x2d, 0x97, 0x15,
+	0x14, 0xad, 0xe1, 0xbd, 0x47, 0x6b, 0x24, 0x06, 0xab, 0x42, 0x21, 0xa0, 0xe4, 0xe9, 0xb1, 0x54,
-	0x12, 0xb6, 0x76, 0xf7, 0x06, 0x17, 0xa8, 0x28, 0x12, 0x1c, 0x23, 0x84, 0x2a, 0x90, 0x10, 0x6e,
+	0x48, 0xd8, 0x6a, 0xbb, 0xc1, 0x02, 0x15, 0x45, 0x82, 0x31, 0x42, 0x0c, 0x20, 0x21, 0xdc, 0xf4,
-	0x3a, 0x4d, 0x2d, 0x25, 0xb6, 0x49, 0x9c, 0xa0, 0xde, 0xfa, 0x09, 0x7c, 0x0c, 0x17, 0xfe, 0xa0,
+	0x36, 0xb5, 0x94, 0xd8, 0x26, 0x71, 0x82, 0xba, 0xf5, 0x13, 0xf8, 0x18, 0x16, 0xfe, 0xa0, 0x23,
-	0x47, 0x8e, 0x9c, 0x80, 0xe6, 0x4b, 0x50, 0x9d, 0xa4, 0x81, 0xf6, 0x40, 0xa5, 0xbd, 0xbd, 0xcc,
+	0x23, 0x13, 0xd0, 0x7c, 0x09, 0xaa, 0x93, 0x34, 0xd0, 0x0e, 0x54, 0x7a, 0xdb, 0xc9, 0x3d, 0xe7,
-	0x7b, 0x6f, 0xde, 0xcc, 0xc4, 0xf8, 0x75, 0x2c, 0xcc, 0xbc, 0x98, 0xd0, 0x48, 0xa5, 0x2c, 0x52,
+	0xdc, 0x73, 0xef, 0x8d, 0xf1, 0xeb, 0x48, 0x98, 0x65, 0x3e, 0xa3, 0xa1, 0x4a, 0x58, 0xa8, 0xa4,
-	0xd2, 0x70, 0x21, 0x21, 0x9b, 0xfe, 0x0d, 0xb9, 0x16, 0x2c, 0x87, 0xac, 0x14, 0x11, 0xe4, 0xcc,
+	0xe1, 0x42, 0x42, 0x3a, 0xff, 0x1b, 0x72, 0x2d, 0x58, 0x06, 0x69, 0x21, 0x42, 0xc8, 0x98, 0x31,
-	0x98, 0x4c, 0x47, 0x0c, 0x4a, 0x90, 0x26, 0x67, 0xe5, 0x45, 0x83, 0xa8, 0xce, 0x94, 0x51, 0xe4,
+	0xa9, 0x0e, 0x19, 0x14, 0x20, 0x4d, 0xc6, 0x8a, 0x61, 0x8d, 0xa8, 0x4e, 0x95, 0x51, 0xe4, 0x61,
-	0x61, 0xe7, 0xa2, 0xad, 0x83, 0x36, 0x0a, 0x6b, 0xa4, 0xe5, 0x85, 0xf7, 0xec, 0xbf, 0x81, 0xb6,
+	0xeb, 0xa2, 0x8d, 0x83, 0xd6, 0x0a, 0x6b, 0xa4, 0xc5, 0xd0, 0x7d, 0xf6, 0xdf, 0x40, 0xdb, 0x6c,
-	0xd9, 0xa4, 0x98, 0x31, 0x9d, 0x14, 0xb1, 0x90, 0x6c, 0x26, 0x20, 0x99, 0x6a, 0x6e, 0xe6, 0x75,
+	0x96, 0x2f, 0x98, 0x8e, 0xf3, 0x48, 0x48, 0xb6, 0x10, 0x10, 0xcf, 0x35, 0x37, 0xcb, 0x2a, 0xc6,
-	0x8c, 0x37, 0x88, 0x55, 0xac, 0x2c, 0x64, 0x1b, 0xd4, 0x54, 0xef, 0xc5, 0x4a, 0xc5, 0x09, 0x74,
+	0xed, 0x47, 0x2a, 0x52, 0x16, 0xb2, 0x1d, 0xaa, 0xab, 0xf7, 0x22, 0xa5, 0xa2, 0x18, 0x5a, 0x37,
-	0x6e, 0x2e, 0x17, 0x0d, 0x75, 0x7f, 0x97, 0x82, 0x54, 0x9b, 0x96, 0x0c, 0x76, 0x49, 0x23, 0x52,
+	0x97, 0xab, 0x9a, 0xba, 0x7f, 0x48, 0x41, 0xa2, 0x4d, 0x43, 0xfa, 0x87, 0xa4, 0x11, 0x09, 0x64,
-	0xc8, 0x0d, 0x4f, 0x75, 0x2d, 0x38, 0x7b, 0x8f, 0xef, 0xbc, 0x54, 0xd9, 0x67, 0x9e, 0x4d, 0x43,
+	0x86, 0x27, 0xba, 0x12, 0x5c, 0xbd, 0xc7, 0x77, 0x5e, 0xaa, 0xf4, 0x33, 0x4f, 0xe7, 0x01, 0x7c,
-	0xf8, 0x54, 0x40, 0x6e, 0xc8, 0x2b, 0xdc, 0x03, 0x59, 0x42, 0xa2, 0x34, 0xb8, 0xe8, 0x14, 0x9d,
+	0xca, 0x21, 0x33, 0xe4, 0x15, 0xee, 0x82, 0x2c, 0x20, 0x56, 0x1a, 0x1c, 0x74, 0x89, 0x06, 0xb7,
-	0xdf, 0xbe, 0x7c, 0x4c, 0x0f, 0x58, 0x9d, 0x8e, 0x1a, 0x53, 0xb8, 0xb5, 0x9f, 0x7d, 0x45, 0xb8,
+	0x47, 0x8f, 0xe9, 0x09, 0xab, 0xd3, 0x69, 0x6d, 0x0a, 0xf6, 0xf6, 0xab, 0xaf, 0x08, 0x77, 0x9b,
-	0xd7, 0x96, 0xc9, 0x10, 0xf7, 0xb7, 0xe1, 0x4d, 0x63, 0x8f, 0xd6, 0xe3, 0xd1, 0x76, 0x3c, 0xfa,
+	0x32, 0x99, 0xe0, 0xde, 0x3e, 0xbc, 0x6e, 0xec, 0xd2, 0x6a, 0x3c, 0xda, 0x8c, 0x47, 0xdf, 0x34,
-	0xa6, 0x55, 0x0c, 0x7b, 0xab, 0x9f, 0x81, 0xf3, 0xe5, 0x57, 0x80, 0xc2, 0xce, 0x46, 0x1e, 0xe0,
+	0x8a, 0x49, 0x77, 0xf3, 0xd3, 0xef, 0x7c, 0xf9, 0xe5, 0xa3, 0xa0, 0xb5, 0x91, 0x07, 0xb8, 0x27,
-	0xbe, 0xe4, 0x29, 0xe4, 0x9a, 0x47, 0xe0, 0xde, 0x38, 0x45, 0xe7, 0xfd, 0xb0, 0x2b, 0x90, 0x01,
+	0x79, 0x02, 0x99, 0xe6, 0x21, 0x38, 0x37, 0x2e, 0xd1, 0xa0, 0x17, 0xb4, 0x05, 0xd2, 0xc7, 0xe7,
-	0x3e, 0x36, 0x4a, 0x8b, 0xc8, 0xbd, 0x69, 0x99, 0xfa, 0x83, 0x3c, 0xc2, 0xc7, 0x76, 0x54, 0xf7,
+	0x46, 0x69, 0x11, 0x3a, 0x37, 0x2d, 0x53, 0x7d, 0x90, 0x47, 0xf8, 0xdc, 0x8e, 0xea, 0x9c, 0xd9,
-	0xc8, 0x66, 0x0e, 0xf6, 0x32, 0x9f, 0xcb, 0x45, 0x58, 0x4b, 0x9e, 0x1c, 0x2d, 0xbf, 0x05, 0xe8,
+	0xcc, 0xfe, 0x51, 0xe6, 0x73, 0xb9, 0x0a, 0x2a, 0xc9, 0x93, 0xb3, 0xf5, 0x37, 0x1f, 0x8d, 0x3e,
-	0xf2, 0x23, 0x3e, 0x19, 0xd9, 0xe5, 0xc8, 0x5b, 0x7c, 0xab, 0xb9, 0x0e, 0xb9, 0x3a, 0xe8, 0x08,
+	0xe2, 0x8b, 0xa9, 0x5d, 0x8e, 0xbc, 0xc5, 0xb7, 0xea, 0xeb, 0x90, 0xf1, 0x49, 0x47, 0xf8, 0xf7,
-	0xff, 0xde, 0xd2, 0xbb, 0xbb, 0x17, 0x36, 0xda, 0xfc, 0x9c, 0xe1, 0x87, 0xd5, 0xda, 0x77, 0x7e,
+	0x96, 0xee, 0xdd, 0xa3, 0xb0, 0xe9, 0xee, 0xe7, 0x4c, 0x3e, 0x6c, 0xb6, 0x5e, 0xe7, 0xc7, 0xd6,
-	0xac, 0x7d, 0x67, 0x59, 0xf9, 0x68, 0x55, 0xf9, 0xe8, 0x7b, 0xe5, 0xa3, 0xdf, 0x95, 0x8f, 0xde,
+	0xeb, 0xac, 0x4b, 0x0f, 0x6d, 0x4a, 0x0f, 0x7d, 0x2f, 0x3d, 0xf4, 0xbb, 0xf4, 0xd0, 0xbb, 0x17,
-	0xbd, 0xb8, 0xd6, 0x8b, 0x7d, 0x5a, 0xa3, 0xb1, 0x33, 0x46, 0x93, 0x13, 0x9b, 0x79, 0xf5, 0x27,
+	0xd7, 0x7a, 0xb1, 0x4f, 0x2b, 0x34, 0xbb, 0xb0, 0x79, 0xe3, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff,
-	0x00, 0x00, 0xff, 0xff, 0xd4, 0x90, 0xbd, 0x09, 0x04, 0x03, 0x00, 0x00,
+	0x22, 0x5e, 0xcf, 0x4e, 0x00, 0x03, 0x00, 0x00,
 }
 
 // Field returns the value for the given fieldpath as a string, if defined.

api/services/ttrpc/events/v1/events.proto

@@ -18,8 +18,8 @@ syntax = "proto3";
 
 package containerd.services.events.ttrpc.v1;
 
-import weak "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
+import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
-import weak "gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
 import "google/protobuf/any.proto";
 import "google/protobuf/empty.proto";
 import "google/protobuf/timestamp.proto";

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

@@ -6,6 +6,7 @@ package version
 import (
 	context "context"
 	fmt "fmt"
+	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	types "github.com/gogo/protobuf/types"
 	grpc "google.golang.org/grpc"
@@ -78,7 +79,7 @@ func init() {
 }
 
 var fileDescriptor_128109001e578ffe = []byte{
-	// 243 bytes of a gzipped FileDescriptorProto
+	// 241 bytes of a gzipped FileDescriptorProto
 	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,
@@ -92,9 +93,9 @@ var fileDescriptor_128109001e578ffe = []byte{
 	0x76, 0xa8, 0x41, 0x42, 0x41, 0x08, 0xa6, 0x98, 0x1e, 0xc4, 0x49, 0x7a, 0x30, 0x27, 0xe9, 0xb9,
 	0x82, 0x9c, 0x24, 0xa5, 0xaf, 0x87, 0xdf, 0x2b, 0x7a, 0x68, 0x8e, 0x72, 0x8a, 0x3a, 0xf1, 0x50,
 	0x8e, 0xe1, 0xc6, 0x43, 0x39, 0x86, 0x86, 0x47, 0x72, 0x8c, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78,
-	0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0x63, 0x94, 0x03, 0xb9, 0x81, 0x6b, 0x0d, 0x65, 0x46, 0x30,
+	0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0x63, 0x94, 0x03, 0xb9, 0x81, 0x6b, 0x0d, 0x65, 0x26, 0xb1,
-	0x26, 0xb1, 0x81, 0x9d, 0x67, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x95, 0x0d, 0x52, 0x23, 0xa9,
+	0x81, 0x1d, 0x67, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xb6, 0x37, 0xd8, 0xc6, 0xa7, 0x01, 0x00,
-	0x01, 0x00, 0x00,
+	0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.

api/services/version/v1/version.proto

@@ -19,7 +19,7 @@ syntax = "proto3";
 package containerd.services.version.v1;
 
 import "google/protobuf/empty.proto";
-import weak "gogoproto/gogo.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";

api/types/descriptor.pb.go

@@ -5,6 +5,7 @@ package types
 
 import (
 	fmt "fmt"
+	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
 	github_com_opencontainers_go_digest "github.com/opencontainers/go-digest"
@@ -83,7 +84,7 @@ func init() {
 }
 
 var fileDescriptor_37f958df3707db9e = []byte{
-	// 311 bytes of a gzipped FileDescriptorProto
+	// 309 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x4e, 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, 0x97, 0x54, 0x16, 0xa4, 0x16, 0xeb, 0xa7, 0xa4, 0x16,
@@ -102,8 +103,8 @@ var fileDescriptor_37f958df3707db9e = []byte{
 	0xb1, 0x96, 0x25, 0xe6, 0x94, 0xa6, 0x42, 0x7c, 0x15, 0x04, 0xe1, 0x58, 0x31, 0x59, 0x30, 0x3a,
 	0x79, 0x9d, 0x78, 0x28, 0xc7, 0x70, 0xe3, 0xa1, 0x1c, 0x43, 0xc3, 0x23, 0x39, 0xc6, 0x13, 0x8f,
 	0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x31, 0xca, 0x80, 0xf8, 0xd8, 0xb1,
-	0x06, 0x93, 0x11, 0x0c, 0x49, 0x6c, 0xe0, 0x30, 0x37, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x22,
+	0x06, 0x93, 0x49, 0x6c, 0xe0, 0x10, 0x37, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x81, 0x35, 0x34,
-	0x8a, 0x20, 0x4a, 0xda, 0x01, 0x00, 0x00,
+	0x94, 0xd8, 0x01, 0x00, 0x00,
 }
 
 func (m *Descriptor) Marshal() (dAtA []byte, err error) {

api/types/descriptor.proto

@@ -18,7 +18,7 @@ syntax = "proto3";
 
 package containerd.types;
 
-import weak "gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
 
 option go_package = "github.com/containerd/containerd/api/types;types";
 

api/types/metrics.pb.go

@@ -5,6 +5,7 @@ package types
 
 import (
 	fmt "fmt"
+	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
 	types "github.com/gogo/protobuf/types"
@@ -78,7 +79,7 @@ func init() {
 }
 
 var fileDescriptor_8d594d87edf6e6bc = []byte{
-	// 258 bytes of a gzipped FileDescriptorProto
+	// 256 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x48, 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, 0x97, 0x54, 0x16, 0xa4, 0x16, 0xeb, 0xe7, 0xa6, 0x96,
@@ -93,9 +94,8 @@ var fileDescriptor_8d594d87edf6e6bc = []byte{
 	0x5d, 0x82, 0x98, 0x32, 0x53, 0x84, 0x34, 0xb8, 0x58, 0x52, 0x12, 0x4b, 0x12, 0x25, 0x98, 0xc1,
 	0xc6, 0x8a, 0x60, 0x18, 0xeb, 0x98, 0x57, 0x19, 0x04, 0x56, 0xe1, 0xe4, 0x75, 0xe2, 0xa1, 0x1c,
 	0xc3, 0x8d, 0x87, 0x72, 0x0c, 0x0d, 0x8f, 0xe4, 0x18, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48,
-	0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x28, 0x03, 0xe2, 0x03, 0xd2, 0x1a, 0x4c, 0x46, 0x30, 0x24,
+	0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x28, 0x03, 0xe2, 0x03, 0xd2, 0x1a, 0x4c, 0x26, 0xb1, 0x81,
-	0xb1, 0x81, 0x6d, 0x30, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xde, 0x0d, 0x02, 0xfe, 0x85, 0x01,
+	0xcd, 0x37, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xf8, 0x51, 0x36, 0x74, 0x83, 0x01, 0x00, 0x00,
-	0x00, 0x00,
 }
 
 func (m *Metric) Marshal() (dAtA []byte, err error) {

api/types/metrics.proto

@@ -18,7 +18,7 @@ syntax = "proto3";
 
 package containerd.types;
 
-import weak "gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
 import "google/protobuf/any.proto";
 import "google/protobuf/timestamp.proto";
 

api/types/mount.pb.go

@@ -5,6 +5,7 @@ package types
 
 import (
 	fmt "fmt"
+	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	io "io"
 	math "math"
@@ -87,7 +88,7 @@ func init() {
 }
 
 var fileDescriptor_920196890d4a7b9f = []byte{
-	// 202 bytes of a gzipped FileDescriptorProto
+	// 200 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 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, 0x97, 0x54, 0x16, 0xa4, 0x16, 0xeb, 0xe7, 0xe6, 0x97,
@@ -99,8 +100,8 @@ var fileDescriptor_920196890d4a7b9f = []byte{
 	0x82, 0x8b, 0x3d, 0xbf, 0xa0, 0x24, 0x33, 0x3f, 0xaf, 0x58, 0x82, 0x45, 0x81, 0x59, 0x83, 0x33,
 	0x08, 0xc6, 0x75, 0xf2, 0x3a, 0xf1, 0x50, 0x8e, 0xe1, 0xc6, 0x43, 0x39, 0x86, 0x86, 0x47, 0x72,
 	0x8c, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0x63, 0x94, 0x01,
-	0xf1, 0x1e, 0xb4, 0x06, 0x93, 0x11, 0x0c, 0x49, 0x6c, 0x60, 0xb7, 0x1b, 0x03, 0x02, 0x00, 0x00,
+	0xf1, 0x1e, 0xb4, 0x06, 0x93, 0x49, 0x6c, 0x60, 0x97, 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff,
-	0xff, 0xff, 0x82, 0x1c, 0x02, 0x18, 0x1d, 0x01, 0x00, 0x00,
+	0xe5, 0xc7, 0x07, 0x3f, 0x1b, 0x01, 0x00, 0x00,
 }
 
 func (m *Mount) Marshal() (dAtA []byte, err error) {

api/types/mount.proto

@@ -18,7 +18,7 @@ syntax = "proto3";
 
 package containerd.types;
 
-import weak "gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
 
 option go_package = "github.com/containerd/containerd/api/types;types";
 

api/types/platform.pb.go

@@ -5,6 +5,7 @@ package types
 
 import (
 	fmt "fmt"
+	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	io "io"
 	math "math"
@@ -76,7 +77,7 @@ func init() {
 }
 
 var fileDescriptor_24ba7a4b83e2367e = []byte{
-	// 205 bytes of a gzipped FileDescriptorProto
+	// 203 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x4c, 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, 0x97, 0x54, 0x16, 0xa4, 0x16, 0xeb, 0x17, 0xe4, 0x24,
@@ -88,8 +89,8 @@ var fileDescriptor_24ba7a4b83e2367e = []byte{
 	0x40, 0x2a, 0x82, 0x50, 0xc4, 0x84, 0x24, 0xb8, 0xd8, 0xcb, 0x12, 0x8b, 0x32, 0x13, 0xf3, 0x4a,
 	0x24, 0x98, 0xc1, 0xd2, 0x30, 0xae, 0x93, 0xd7, 0x89, 0x87, 0x72, 0x0c, 0x37, 0x1e, 0xca, 0x31,
 	0x34, 0x3c, 0x92, 0x63, 0x3c, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4,
-	0x18, 0xa3, 0x0c, 0x88, 0xf7, 0x9e, 0x35, 0x98, 0x8c, 0x60, 0x48, 0x62, 0x03, 0x3b, 0xdb, 0x18,
+	0x18, 0xa3, 0x0c, 0x88, 0xf7, 0x9e, 0x35, 0x98, 0x4c, 0x62, 0x03, 0x3b, 0xda, 0x18, 0x10, 0x00,
-	0x10, 0x00, 0x00, 0xff, 0xff, 0x05, 0xaa, 0xda, 0xa1, 0x1b, 0x01, 0x00, 0x00,
+	0x00, 0xff, 0xff, 0x97, 0xa1, 0x99, 0x56, 0x19, 0x01, 0x00, 0x00,
 }
 
 func (m *Platform) Marshal() (dAtA []byte, err error) {

api/types/platform.proto

@@ -18,7 +18,7 @@ syntax = "proto3";
 
 package containerd.types;
 
-import weak "gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
 
 option go_package = "github.com/containerd/containerd/api/types;types";
 

api/types/task/task.pb.go

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

api/types/task/task.proto

@@ -18,7 +18,7 @@ syntax = "proto3";
 
 package containerd.v1.types;
 
-import weak "gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/any.proto";
 

runtime/linux/runctypes/next.pb.txt

@@ -206,6 +206,5 @@ file {
   options {
     go_package: "github.com/containerd/containerd/runtime/linux/runctypes;runctypes"
   }
-  weak_dependency: 0
   syntax: "proto3"
 }

runtime/linux/runctypes/runc.pb.go

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

runtime/linux/runctypes/runc.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package containerd.linux.runc;
 
-import weak "gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
 
 option go_package = "github.com/containerd/containerd/runtime/linux/runctypes;runctypes";
 

runtime/v1/shim/v1/shim.pb.go

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

runtime/v1/shim/v1/shim.proto

@@ -20,7 +20,7 @@ package containerd.runtime.linux.shim.v1;
 
 import "google/protobuf/any.proto";
 import "google/protobuf/empty.proto";
-import weak "gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
 import "github.com/containerd/containerd/api/types/mount.proto";
 import "github.com/containerd/containerd/api/types/task/task.proto";

runtime/v2/runc/options/next.pb.txt

@@ -161,6 +161,5 @@ file {
   options {
     go_package: "github.com/containerd/containerd/runtime/v2/runc/options;options"
   }
-  weak_dependency: 0
   syntax: "proto3"
 }

runtime/v2/runc/options/oci.pb.go

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

runtime/v2/runc/options/oci.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package containerd.runc.v1;
 
-import weak "gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
 
 option go_package = "github.com/containerd/containerd/runtime/v2/runc/options;options";
 

runtime/v2/task/shim.pb.go

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

runtime/v2/task/shim.proto

@@ -20,7 +20,7 @@ package containerd.task.v2;
 
 import "google/protobuf/any.proto";
 import "google/protobuf/empty.proto";
-import weak "gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
 import "github.com/containerd/containerd/api/types/mount.proto";
 import "github.com/containerd/containerd/api/types/task/task.proto";