diff --git a/Protobuild.toml b/Protobuild.toml index 5ae49d9c2..ecdb6c5b9 100644 --- a/Protobuild.toml +++ b/Protobuild.toml @@ -30,6 +30,11 @@ plugins = ["grpc", "fieldpath"] "google/protobuf/duration.proto" = "github.com/gogo/protobuf/types" "google/rpc/status.proto" = "github.com/containerd/containerd/protobuf/google/rpc" +[[overrides]] + +prefixes = ["github.com/containerd/containerd/api/events"] +plugins = ["fieldpath"] + # Aggregrate the API descriptors to lock down API changes. [[descriptors]] prefix = "github.com/containerd/containerd/api" diff --git a/api/services/events/v1/container.pb.go b/api/events/container.pb.go similarity index 88% rename from api/services/events/v1/container.pb.go rename to api/events/container.pb.go index 8fa3d1eb5..d9baac49e 100644 --- a/api/services/events/v1/container.pb.go +++ b/api/events/container.pb.go @@ -1,27 +1,22 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: github.com/containerd/containerd/api/services/events/v1/container.proto +// source: github.com/containerd/containerd/api/events/container.proto /* Package events is a generated protocol buffer package. It is generated from these files: - github.com/containerd/containerd/api/services/events/v1/container.proto - github.com/containerd/containerd/api/services/events/v1/content.proto - github.com/containerd/containerd/api/services/events/v1/events.proto - github.com/containerd/containerd/api/services/events/v1/image.proto - github.com/containerd/containerd/api/services/events/v1/namespace.proto - github.com/containerd/containerd/api/services/events/v1/snapshot.proto - github.com/containerd/containerd/api/services/events/v1/task.proto + github.com/containerd/containerd/api/events/container.proto + github.com/containerd/containerd/api/events/content.proto + github.com/containerd/containerd/api/events/image.proto + github.com/containerd/containerd/api/events/namespace.proto + github.com/containerd/containerd/api/events/snapshot.proto + github.com/containerd/containerd/api/events/task.proto It has these top-level messages: ContainerCreate ContainerUpdate ContainerDelete ContentDelete - PublishRequest - ForwardRequest - SubscribeRequest - Envelope ImageCreate ImageUpdate ImageDelete @@ -112,10 +107,10 @@ func (*ContainerDelete) ProtoMessage() {} func (*ContainerDelete) Descriptor() ([]byte, []int) { return fileDescriptorContainer, []int{2} } func init() { - proto.RegisterType((*ContainerCreate)(nil), "containerd.services.events.v1.ContainerCreate") - proto.RegisterType((*ContainerCreate_Runtime)(nil), "containerd.services.events.v1.ContainerCreate.Runtime") - proto.RegisterType((*ContainerUpdate)(nil), "containerd.services.events.v1.ContainerUpdate") - proto.RegisterType((*ContainerDelete)(nil), "containerd.services.events.v1.ContainerDelete") + proto.RegisterType((*ContainerCreate)(nil), "containerd.events.ContainerCreate") + proto.RegisterType((*ContainerCreate_Runtime)(nil), "containerd.events.ContainerCreate.Runtime") + proto.RegisterType((*ContainerUpdate)(nil), "containerd.events.ContainerUpdate") + proto.RegisterType((*ContainerDelete)(nil), "containerd.events.ContainerDelete") } // Field returns the value for the given fieldpath as a string, if defined. @@ -1210,36 +1205,35 @@ var ( ) func init() { - proto.RegisterFile("github.com/containerd/containerd/api/services/events/v1/container.proto", fileDescriptorContainer) + proto.RegisterFile("github.com/containerd/containerd/api/events/container.proto", fileDescriptorContainer) } var fileDescriptorContainer = []byte{ - // 427 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x52, 0x5d, 0x8b, 0xd4, 0x30, - 0x14, 0xdd, 0x74, 0xd6, 0x19, 0x4c, 0x05, 0x25, 0x0c, 0x52, 0x07, 0xac, 0xe3, 0x3c, 0x8d, 0x2f, - 0x09, 0x3b, 0x82, 0xe8, 0x0a, 0xa2, 0xbb, 0x2b, 0x22, 0x2a, 0x48, 0xc0, 0x17, 0x11, 0x24, 0x9d, - 0xde, 0xed, 0x04, 0xdb, 0xa4, 0xb4, 0x69, 0xa1, 0x6f, 0xfe, 0x14, 0x7f, 0xce, 0x3e, 0xfa, 0xe8, - 0x93, 0xec, 0xf6, 0x1f, 0x08, 0xfe, 0x00, 0x69, 0x32, 0xdd, 0x2d, 0x82, 0x9f, 0x6f, 0xe7, 0xe6, - 0x9e, 0x73, 0xef, 0x39, 0xb7, 0xc5, 0xcf, 0x12, 0x69, 0x36, 0x55, 0x44, 0xd7, 0x3a, 0x63, 0x6b, - 0xad, 0x8c, 0x90, 0x0a, 0x8a, 0x78, 0x08, 0x45, 0x2e, 0x59, 0x09, 0x45, 0x2d, 0xd7, 0x50, 0x32, - 0xa8, 0x41, 0x99, 0x92, 0xd5, 0x7b, 0x17, 0x0c, 0x9a, 0x17, 0xda, 0x68, 0x72, 0xf3, 0x42, 0x42, - 0x7b, 0x3a, 0x75, 0x74, 0x5a, 0xef, 0xcd, 0xa6, 0x89, 0x4e, 0xb4, 0x65, 0xb2, 0x0e, 0x39, 0xd1, - 0xec, 0x46, 0xa2, 0x75, 0x92, 0x02, 0xb3, 0x55, 0x54, 0x1d, 0x33, 0xa1, 0x9a, 0x6d, 0xeb, 0xf1, - 0x1f, 0x8d, 0x9d, 0x8b, 0xf2, 0xb4, 0x4a, 0xa4, 0x62, 0xc7, 0x12, 0xd2, 0x38, 0x17, 0x66, 0xe3, - 0x26, 0x2c, 0x4e, 0x11, 0xbe, 0x7a, 0xd8, 0xd3, 0x0f, 0x0b, 0x10, 0x06, 0xc8, 0x75, 0xec, 0xc9, - 0x38, 0x40, 0x73, 0xb4, 0xbc, 0x7c, 0x30, 0x6e, 0xbf, 0xde, 0xf2, 0x9e, 0x1f, 0x71, 0x4f, 0xc6, - 0x64, 0x8a, 0x2f, 0xc9, 0x4c, 0x24, 0x10, 0x78, 0x5d, 0x8b, 0xbb, 0x82, 0xbc, 0xc6, 0x93, 0xa2, - 0x52, 0x46, 0x66, 0x10, 0x8c, 0xe6, 0x68, 0xe9, 0xaf, 0xee, 0xd1, 0xdf, 0xa6, 0xa4, 0x3f, 0xad, - 0xa3, 0xdc, 0xa9, 0x79, 0x3f, 0x66, 0xf6, 0x0a, 0x4f, 0xb6, 0x6f, 0x84, 0xe0, 0x5d, 0x25, 0x32, - 0x70, 0x66, 0xb8, 0xc5, 0x84, 0xe2, 0x89, 0xce, 0x8d, 0xd4, 0xaa, 0xb4, 0x46, 0xfc, 0xd5, 0x94, - 0xba, 0x0b, 0xd1, 0x3e, 0x2c, 0x7d, 0xa2, 0x1a, 0xde, 0x93, 0x16, 0xdf, 0x86, 0x11, 0xdf, 0xe4, - 0xf1, 0xbf, 0x47, 0xe4, 0x78, 0x9c, 0x8a, 0x08, 0xd2, 0x32, 0x18, 0xcd, 0x47, 0x4b, 0x7f, 0xb5, - 0xff, 0xb7, 0x09, 0xdd, 0x36, 0xfa, 0xd2, 0x8a, 0x9f, 0x2a, 0x53, 0x34, 0x7c, 0x3b, 0x89, 0xdc, - 0xc6, 0x57, 0x4a, 0x25, 0xf2, 0x72, 0xa3, 0xcd, 0xfb, 0x0f, 0xd0, 0x04, 0xbb, 0x76, 0xa1, 0xdf, - 0xbf, 0xbd, 0x80, 0x66, 0xf6, 0x00, 0xfb, 0x03, 0x25, 0xb9, 0x86, 0x47, 0x1d, 0xd1, 0x9d, 0xa2, - 0x83, 0x9d, 0xdb, 0x5a, 0xa4, 0xd5, 0xb9, 0x5b, 0x5b, 0xec, 0x7b, 0xf7, 0xd1, 0xe2, 0xce, 0x20, - 0xf2, 0x11, 0xa4, 0xf0, 0xeb, 0xc8, 0x07, 0xef, 0x4e, 0xce, 0xc2, 0x9d, 0x2f, 0x67, 0xe1, 0xce, - 0xc7, 0x36, 0x44, 0x27, 0x6d, 0x88, 0x3e, 0xb7, 0x21, 0x3a, 0x6d, 0x43, 0xf4, 0xe9, 0x7b, 0x88, - 0xde, 0x3e, 0xfa, 0xcf, 0x5f, 0xff, 0xa1, 0x43, 0xd1, 0xd8, 0x7e, 0x93, 0xbb, 0x3f, 0x02, 0x00, - 0x00, 0xff, 0xff, 0x26, 0x0d, 0x55, 0x1c, 0x43, 0x03, 0x00, 0x00, + // 411 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xcf, 0xaa, 0xd3, 0x40, + 0x14, 0xc6, 0x3b, 0x49, 0x6d, 0x71, 0x22, 0xa8, 0x43, 0x91, 0x98, 0x45, 0xac, 0x5d, 0x55, 0x17, + 0x13, 0x88, 0x1b, 0xb5, 0x1b, 0x6d, 0xab, 0x20, 0x2a, 0x48, 0xc0, 0x8d, 0x1b, 0x99, 0x34, 0xd3, + 0x74, 0x30, 0x99, 0x09, 0xc9, 0xa4, 0x90, 0x9d, 0x8f, 0xe2, 0xe3, 0x74, 0xe9, 0xc2, 0x85, 0x2b, + 0xb1, 0x01, 0xdf, 0xc0, 0x07, 0x90, 0xcc, 0x34, 0x6d, 0xf0, 0x72, 0xef, 0xa5, 0xab, 0x9c, 0x3f, + 0xdf, 0x97, 0x73, 0x7e, 0x87, 0x81, 0xb3, 0x98, 0xc9, 0x4d, 0x19, 0xe2, 0x95, 0x48, 0xbd, 0x95, + 0xe0, 0x92, 0x30, 0x4e, 0xf3, 0xa8, 0x1b, 0x92, 0x8c, 0x79, 0x74, 0x4b, 0xb9, 0x2c, 0x4e, 0x55, + 0x9c, 0xe5, 0x42, 0x0a, 0x74, 0xf7, 0x24, 0xc3, 0x5a, 0xe2, 0x8c, 0x62, 0x11, 0x0b, 0xd5, 0xf5, + 0x9a, 0x48, 0x0b, 0x9d, 0xfb, 0xb1, 0x10, 0x71, 0x42, 0x3d, 0x95, 0x85, 0xe5, 0xda, 0x23, 0xbc, + 0x3a, 0xb4, 0x5e, 0x5c, 0xbb, 0xc0, 0xd1, 0x94, 0x25, 0x65, 0xcc, 0xb8, 0xb7, 0x66, 0x34, 0x89, + 0x32, 0x22, 0x37, 0xfa, 0x0f, 0x93, 0x1f, 0x00, 0xde, 0x5e, 0xb4, 0xf2, 0x45, 0x4e, 0x89, 0xa4, + 0xe8, 0x1e, 0x34, 0x58, 0x64, 0x83, 0x31, 0x98, 0xde, 0x9c, 0x0f, 0xea, 0x5f, 0x0f, 0x8c, 0x37, + 0xcb, 0xc0, 0x60, 0x11, 0x1a, 0xc1, 0x1b, 0x2c, 0x25, 0x31, 0xb5, 0x8d, 0xa6, 0x15, 0xe8, 0x04, + 0x2d, 0xe1, 0x30, 0x2f, 0xb9, 0x64, 0x29, 0xb5, 0xcd, 0x31, 0x98, 0x5a, 0xfe, 0x63, 0x7c, 0x81, + 0x0c, 0xff, 0x37, 0x02, 0x07, 0xda, 0x11, 0xb4, 0x56, 0xe7, 0x3d, 0x1c, 0x1e, 0x6a, 0x08, 0xc1, + 0x3e, 0x27, 0x29, 0xd5, 0x0b, 0x04, 0x2a, 0x46, 0x18, 0x0e, 0x45, 0x26, 0x99, 0xe0, 0x85, 0x1a, + 0x6e, 0xf9, 0x23, 0xac, 0xaf, 0x82, 0x5b, 0x40, 0xfc, 0x92, 0x57, 0x41, 0x2b, 0x9a, 0xfc, 0xe9, + 0x62, 0x7d, 0xcc, 0xa2, 0xf3, 0xb1, 0x5e, 0xc3, 0x41, 0x42, 0x42, 0x9a, 0x14, 0xb6, 0x39, 0x36, + 0xa7, 0x96, 0x8f, 0xaf, 0xa2, 0xd2, 0x13, 0xf0, 0x3b, 0x65, 0x78, 0xc5, 0x65, 0x5e, 0x05, 0x07, + 0x37, 0x7a, 0x08, 0x6f, 0x15, 0x9c, 0x64, 0xc5, 0x46, 0xc8, 0xcf, 0x5f, 0x68, 0x65, 0xf7, 0xd5, + 0x10, 0xab, 0xad, 0xbd, 0xa5, 0x95, 0xf3, 0x0c, 0x5a, 0x1d, 0x27, 0xba, 0x03, 0xcd, 0x46, 0xa8, + 0xf1, 0x9b, 0xb0, 0xd9, 0x70, 0x4b, 0x92, 0xf2, 0xb8, 0xa1, 0x4a, 0x9e, 0x1b, 0x4f, 0xc1, 0xe4, + 0x51, 0x07, 0x73, 0x49, 0x13, 0x7a, 0x39, 0xe6, 0xfc, 0xc3, 0x6e, 0xef, 0xf6, 0x7e, 0xee, 0xdd, + 0xde, 0xd7, 0xda, 0x05, 0xbb, 0xda, 0x05, 0xdf, 0x6b, 0x17, 0xfc, 0xae, 0x5d, 0xf0, 0xed, 0xaf, + 0x0b, 0x3e, 0xf9, 0x67, 0x3c, 0xe5, 0x99, 0xfe, 0x84, 0x03, 0x75, 0xfb, 0x27, 0xff, 0x02, 0x00, + 0x00, 0xff, 0xff, 0xc4, 0x03, 0x7d, 0xc8, 0x07, 0x03, 0x00, 0x00, } diff --git a/api/services/events/v1/container.proto b/api/events/container.proto similarity index 81% rename from api/services/events/v1/container.proto rename to api/events/container.proto index ca8acb8b9..0981115e2 100644 --- a/api/services/events/v1/container.proto +++ b/api/events/container.proto @@ -1,12 +1,12 @@ syntax = "proto3"; -package containerd.services.events.v1; +package containerd.events; import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; -option go_package = "github.com/containerd/containerd/api/services/events/v1;events"; +option go_package = "github.com/containerd/containerd/api/events;events"; option (containerd.plugin.fieldpath_all) = true; message ContainerCreate { diff --git a/api/services/events/v1/content.pb.go b/api/events/content.pb.go similarity index 80% rename from api/services/events/v1/content.pb.go rename to api/events/content.pb.go index 13ccf7b53..af70fb230 100644 --- a/api/services/events/v1/content.pb.go +++ b/api/events/content.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: github.com/containerd/containerd/api/services/events/v1/content.proto +// source: github.com/containerd/containerd/api/events/content.proto package events @@ -30,7 +30,7 @@ func (*ContentDelete) ProtoMessage() {} func (*ContentDelete) Descriptor() ([]byte, []int) { return fileDescriptorContent, []int{0} } func init() { - proto.RegisterType((*ContentDelete)(nil), "containerd.services.events.v1.ContentDelete") + proto.RegisterType((*ContentDelete)(nil), "containerd.events.ContentDelete") } // Field returns the value for the given fieldpath as a string, if defined. @@ -305,25 +305,23 @@ var ( ) func init() { - proto.RegisterFile("github.com/containerd/containerd/api/services/events/v1/content.proto", fileDescriptorContent) + proto.RegisterFile("github.com/containerd/containerd/api/events/content.proto", fileDescriptorContent) } var fileDescriptorContent = []byte{ - // 242 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x4d, 0xcf, 0x2c, 0xc9, + // 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, 0x17, 0xa7, 0x16, 0x95, 0x65, 0x26, 0xa7, 0x16, 0xeb, - 0xa7, 0x96, 0xa5, 0xe6, 0x95, 0x14, 0xeb, 0x97, 0x19, 0x82, 0x55, 0xa4, 0xe6, 0x95, 0xe8, 0x15, - 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0xc9, 0x22, 0x34, 0xe8, 0xc1, 0x14, 0xeb, 0x41, 0x14, 0xeb, 0x95, - 0x19, 0x4a, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x55, 0xea, 0x83, 0x58, 0x10, 0x4d, 0x52, 0x0e, - 0x04, 0xed, 0x06, 0xab, 0x4b, 0x2a, 0x4d, 0xd3, 0x2f, 0xc8, 0x29, 0x4d, 0xcf, 0xcc, 0xd3, 0x4f, - 0xcb, 0x4c, 0xcd, 0x49, 0x29, 0x48, 0x2c, 0xc9, 0x80, 0x98, 0xa0, 0x14, 0xcd, 0xc5, 0xeb, 0x0c, - 0x71, 0x87, 0x4b, 0x6a, 0x4e, 0x6a, 0x49, 0xaa, 0x90, 0x17, 0x17, 0x5b, 0x4a, 0x66, 0x7a, 0x6a, - 0x71, 0x89, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xa7, 0x93, 0xd1, 0x89, 0x7b, 0xf2, 0x0c, 0xb7, 0xee, - 0xc9, 0x6b, 0x21, 0x59, 0x95, 0x5f, 0x90, 0x9a, 0x07, 0xb7, 0xa3, 0x58, 0x3f, 0x3d, 0x5f, 0x17, - 0xa2, 0x45, 0xcf, 0x05, 0x4c, 0x05, 0x41, 0x4d, 0x70, 0x8a, 0x39, 0xf1, 0x50, 0x8e, 0xe1, 0xc6, - 0x43, 0x39, 0x86, 0x86, 0x47, 0x72, 0x8c, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, - 0xe0, 0x91, 0x1c, 0xe3, 0x82, 0x2f, 0x72, 0x8c, 0x51, 0x76, 0x64, 0x06, 0x9c, 0x35, 0x84, 0x95, - 0xc4, 0x06, 0xf6, 0x81, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x51, 0xce, 0xec, 0x89, 0x81, 0x01, - 0x00, 0x00, + 0x4a, 0x41, 0x66, 0x26, 0x16, 0x64, 0xea, 0xa7, 0x96, 0xa5, 0xe6, 0x95, 0x14, 0x83, 0x45, 0x53, + 0xf3, 0x4a, 0xf4, 0x0a, 0x8a, 0xf2, 0x4b, 0xf2, 0x85, 0x04, 0x11, 0x8a, 0xf4, 0x20, 0x0a, 0xa4, + 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0xb2, 0xfa, 0x20, 0x16, 0x44, 0xa1, 0x94, 0x03, 0x41, 0x3b, + 0xc0, 0xea, 0x92, 0x4a, 0xd3, 0xf4, 0x0b, 0x72, 0x4a, 0xd3, 0x33, 0xf3, 0xf4, 0xd3, 0x32, 0x53, + 0x73, 0x52, 0x0a, 0x12, 0x4b, 0x32, 0x20, 0x26, 0x28, 0x45, 0x73, 0xf1, 0x3a, 0x43, 0xec, 0x76, + 0x49, 0xcd, 0x49, 0x2d, 0x49, 0x15, 0xf2, 0xe2, 0x62, 0x4b, 0xc9, 0x4c, 0x4f, 0x2d, 0x2e, 0x91, + 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x74, 0x32, 0x3a, 0x71, 0x4f, 0x9e, 0xe1, 0xd6, 0x3d, 0x79, 0x2d, + 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, 0x49, 0x6c, 0x60, + 0x57, 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xee, 0x71, 0x10, 0x4c, 0x5d, 0x01, 0x00, 0x00, } diff --git a/api/services/events/v1/content.proto b/api/events/content.proto similarity index 72% rename from api/services/events/v1/content.proto rename to api/events/content.proto index 95358f523..5e5e3021d 100644 --- a/api/services/events/v1/content.proto +++ b/api/events/content.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -package containerd.services.events.v1; +package containerd.events; import "gogoproto/gogo.proto"; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; -option go_package = "github.com/containerd/containerd/api/services/events/v1;events"; +option go_package = "github.com/containerd/containerd/api/events;events"; option (containerd.plugin.fieldpath_all) = true; message ContentDelete { diff --git a/api/events/doc.go b/api/events/doc.go new file mode 100644 index 000000000..ac1e83fb7 --- /dev/null +++ b/api/events/doc.go @@ -0,0 +1,3 @@ +// Package events has protobuf types for various events that are used in +// containerd. +package events diff --git a/api/services/events/v1/image.pb.go b/api/events/image.pb.go similarity index 92% rename from api/services/events/v1/image.pb.go rename to api/events/image.pb.go index 315641f2f..2003a14fd 100644 --- a/api/services/events/v1/image.pb.go +++ b/api/events/image.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: github.com/containerd/containerd/api/services/events/v1/image.proto +// source: github.com/containerd/containerd/api/events/image.proto package events @@ -921,28 +921,28 @@ var ( ) func init() { - proto.RegisterFile("github.com/containerd/containerd/api/services/events/v1/image.proto", fileDescriptorImage) + proto.RegisterFile("github.com/containerd/containerd/api/events/image.proto", fileDescriptorImage) } var fileDescriptorImage = []byte{ - // 296 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x4e, 0xcf, 0x2c, 0xc9, + // 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, 0x17, 0xa7, 0x16, 0x95, 0x65, 0x26, 0xa7, 0x16, 0xeb, - 0xa7, 0x96, 0xa5, 0xe6, 0x95, 0x14, 0xeb, 0x97, 0x19, 0xea, 0x67, 0xe6, 0x26, 0xa6, 0xa7, 0xea, - 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0xc9, 0x22, 0x94, 0xeb, 0xc1, 0x94, 0xea, 0x81, 0x15, 0x14, - 0xeb, 0x95, 0x19, 0x4a, 0x39, 0x10, 0xb4, 0x03, 0x6c, 0x4c, 0x52, 0x69, 0x9a, 0x7e, 0x41, 0x4e, - 0x69, 0x7a, 0x66, 0x9e, 0x7e, 0x5a, 0x66, 0x6a, 0x4e, 0x4a, 0x41, 0x62, 0x49, 0x06, 0xc4, 0x02, - 0xa5, 0x35, 0x8c, 0x5c, 0xdc, 0x9e, 0x20, 0xf3, 0x9c, 0x8b, 0x52, 0x13, 0x4b, 0x52, 0x85, 0x84, - 0xb8, 0x58, 0xf2, 0x12, 0x73, 0x53, 0x25, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0xc0, 0x6c, 0x21, - 0x3f, 0x2e, 0xb6, 0x9c, 0xc4, 0xa4, 0xd4, 0x9c, 0x62, 0x09, 0x26, 0x05, 0x66, 0x0d, 0x6e, 0x23, - 0x33, 0x3d, 0xbc, 0xae, 0xd2, 0x43, 0x32, 0x4f, 0xcf, 0x07, 0xac, 0xd1, 0x35, 0xaf, 0xa4, 0xa8, - 0x32, 0x08, 0x6a, 0x8a, 0x94, 0x25, 0x17, 0x37, 0x92, 0xb0, 0x90, 0x00, 0x17, 0x73, 0x76, 0x6a, - 0x25, 0xd4, 0x46, 0x10, 0x53, 0x48, 0x84, 0x8b, 0xb5, 0x2c, 0x31, 0xa7, 0x34, 0x55, 0x82, 0x09, - 0x2c, 0x06, 0xe1, 0x58, 0x31, 0x59, 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, 0x98, - 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, 0x47, - 0x66, 0x22, 0xb2, 0x86, 0xb0, 0x92, 0xd8, 0xc0, 0xb1, 0x6c, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, - 0x44, 0x99, 0x59, 0x31, 0x8d, 0x02, 0x00, 0x00, + 0x4a, 0x41, 0x66, 0x26, 0x16, 0x64, 0xea, 0xa7, 0x96, 0xa5, 0xe6, 0x95, 0x14, 0xeb, 0x67, 0xe6, + 0x26, 0xa6, 0xa7, 0xea, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0xc9, 0x22, 0x94, 0xe8, 0x15, 0xa7, + 0x16, 0x95, 0x65, 0x26, 0xa7, 0x16, 0xeb, 0x81, 0x15, 0x14, 0xeb, 0x95, 0x19, 0x4a, 0x39, 0x10, + 0x34, 0x17, 0x6c, 0x4c, 0x52, 0x69, 0x9a, 0x7e, 0x41, 0x4e, 0x69, 0x7a, 0x66, 0x9e, 0x7e, 0x5a, + 0x66, 0x6a, 0x4e, 0x4a, 0x41, 0x62, 0x49, 0x06, 0xc4, 0x02, 0xa5, 0x35, 0x8c, 0x5c, 0xdc, 0x9e, + 0x20, 0xf3, 0x9c, 0x8b, 0x52, 0x13, 0x4b, 0x52, 0x85, 0x84, 0xb8, 0x58, 0xf2, 0x12, 0x73, 0x53, + 0x25, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0xc0, 0x6c, 0x21, 0x3f, 0x2e, 0xb6, 0x9c, 0xc4, 0xa4, + 0xd4, 0x9c, 0x62, 0x09, 0x26, 0x05, 0x66, 0x0d, 0x6e, 0x23, 0x33, 0x3d, 0xbc, 0xae, 0xd2, 0x43, + 0x32, 0x4f, 0xcf, 0x07, 0xac, 0xd1, 0x35, 0xaf, 0xa4, 0xa8, 0x32, 0x08, 0x6a, 0x8a, 0x94, 0x25, + 0x17, 0x37, 0x92, 0xb0, 0x90, 0x00, 0x17, 0x73, 0x76, 0x6a, 0x25, 0xd4, 0x46, 0x10, 0x53, 0x48, + 0x84, 0x8b, 0xb5, 0x2c, 0x31, 0xa7, 0x34, 0x55, 0x82, 0x09, 0x2c, 0x06, 0xe1, 0x58, 0x31, 0x59, + 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, 0x49, + 0x6c, 0xe0, 0x98, 0x35, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xea, 0x1f, 0xed, 0xe5, 0x75, 0x02, + 0x00, 0x00, } diff --git a/api/services/events/v1/image.proto b/api/events/image.proto similarity index 81% rename from api/services/events/v1/image.proto rename to api/events/image.proto index cbab0bbd4..9593979d7 100644 --- a/api/services/events/v1/image.proto +++ b/api/events/image.proto @@ -4,7 +4,7 @@ package containerd.services.images.v1; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; -option go_package = "github.com/containerd/containerd/api/services/events/v1;events"; +option go_package = "github.com/containerd/containerd/api/events;events"; option (containerd.plugin.fieldpath_all) = true; message ImageCreate { diff --git a/api/services/events/v1/namespace.pb.go b/api/events/namespace.pb.go similarity index 90% rename from api/services/events/v1/namespace.pb.go rename to api/events/namespace.pb.go index 9603d20fb..99a46958a 100644 --- a/api/services/events/v1/namespace.pb.go +++ b/api/events/namespace.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: github.com/containerd/containerd/api/services/events/v1/namespace.proto +// source: github.com/containerd/containerd/api/events/namespace.proto package events @@ -47,9 +47,9 @@ func (*NamespaceDelete) ProtoMessage() {} func (*NamespaceDelete) Descriptor() ([]byte, []int) { return fileDescriptorNamespace, []int{2} } func init() { - proto.RegisterType((*NamespaceCreate)(nil), "containerd.services.events.v1.NamespaceCreate") - proto.RegisterType((*NamespaceUpdate)(nil), "containerd.services.events.v1.NamespaceUpdate") - proto.RegisterType((*NamespaceDelete)(nil), "containerd.services.events.v1.NamespaceDelete") + proto.RegisterType((*NamespaceCreate)(nil), "containerd.events.NamespaceCreate") + proto.RegisterType((*NamespaceUpdate)(nil), "containerd.events.NamespaceUpdate") + proto.RegisterType((*NamespaceDelete)(nil), "containerd.events.NamespaceDelete") } // Field returns the value for the given fieldpath as a string, if defined. @@ -922,29 +922,28 @@ var ( ) func init() { - proto.RegisterFile("github.com/containerd/containerd/api/services/events/v1/namespace.proto", fileDescriptorNamespace) + proto.RegisterFile("github.com/containerd/containerd/api/events/namespace.proto", fileDescriptorNamespace) } var fileDescriptorNamespace = []byte{ - // 310 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x4f, 0xcf, 0x2c, 0xc9, + // 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, 0x17, 0xa7, 0x16, 0x95, 0x65, 0x26, 0xa7, 0x16, 0xeb, - 0xa7, 0x96, 0xa5, 0xe6, 0x95, 0x14, 0xeb, 0x97, 0x19, 0xea, 0xe7, 0x25, 0xe6, 0xa6, 0x16, 0x17, - 0x24, 0x26, 0xa7, 0xea, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0xc9, 0x22, 0xb4, 0xe8, 0xc1, 0x94, - 0xeb, 0x41, 0x94, 0xeb, 0x95, 0x19, 0x4a, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x55, 0xea, 0x83, - 0x58, 0x10, 0x4d, 0x52, 0x0e, 0x04, 0x6d, 0x07, 0xab, 0x4b, 0x2a, 0x4d, 0xd3, 0x2f, 0xc8, 0x29, - 0x4d, 0xcf, 0xcc, 0xd3, 0x4f, 0xcb, 0x4c, 0xcd, 0x49, 0x29, 0x48, 0x2c, 0xc9, 0x80, 0x98, 0xa0, - 0xb4, 0x85, 0x91, 0x8b, 0xdf, 0x0f, 0xe6, 0x14, 0xe7, 0xa2, 0xd4, 0xc4, 0x92, 0x54, 0x21, 0x21, - 0x2e, 0x16, 0x90, 0xeb, 0x24, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0xc0, 0x6c, 0xa1, 0x20, 0x2e, - 0xb6, 0x9c, 0xc4, 0xa4, 0xd4, 0x9c, 0x62, 0x09, 0x26, 0x05, 0x66, 0x0d, 0x6e, 0x23, 0x2b, 0x3d, - 0xbc, 0xee, 0xd5, 0x43, 0x33, 0x53, 0xcf, 0x07, 0xac, 0xd9, 0x35, 0xaf, 0xa4, 0xa8, 0x32, 0x08, - 0x6a, 0x92, 0x94, 0x25, 0x17, 0x37, 0x92, 0xb0, 0x90, 0x00, 0x17, 0x73, 0x76, 0x6a, 0x25, 0xd4, - 0x56, 0x10, 0x53, 0x48, 0x84, 0x8b, 0xb5, 0x2c, 0x31, 0xa7, 0x34, 0x55, 0x82, 0x09, 0x2c, 0x06, - 0xe1, 0x58, 0x31, 0x59, 0x30, 0xa2, 0x3a, 0x3b, 0xb4, 0x20, 0x85, 0xea, 0xce, 0x86, 0x98, 0x49, - 0x6d, 0x67, 0xab, 0x22, 0xb9, 0xda, 0x25, 0x35, 0x27, 0x15, 0xbb, 0xab, 0x9d, 0x62, 0x4e, 0x3c, - 0x94, 0x63, 0xb8, 0xf1, 0x50, 0x8e, 0xa1, 0xe1, 0x91, 0x1c, 0xe3, 0x89, 0x47, 0x72, 0x8c, 0x17, - 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0xb8, 0xe0, 0x8b, 0x1c, 0x63, 0x94, 0x1d, 0x99, 0x49, - 0xce, 0x1a, 0xc2, 0x4a, 0x62, 0x03, 0xc7, 0xbc, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x58, 0x7e, - 0x6c, 0xc6, 0xbb, 0x02, 0x00, 0x00, + 0x4a, 0x41, 0x66, 0x26, 0x16, 0x64, 0xea, 0xa7, 0x96, 0xa5, 0xe6, 0x95, 0x14, 0xeb, 0xe7, 0x25, + 0xe6, 0xa6, 0x16, 0x17, 0x24, 0x26, 0xa7, 0xea, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0x09, 0x22, + 0x94, 0xe9, 0x41, 0x94, 0x48, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x65, 0xf5, 0x41, 0x2c, 0x88, + 0x42, 0x29, 0x07, 0x82, 0xb6, 0x80, 0xd5, 0x25, 0x95, 0xa6, 0xe9, 0x17, 0xe4, 0x94, 0xa6, 0x67, + 0xe6, 0xe9, 0xa7, 0x65, 0xa6, 0xe6, 0xa4, 0x14, 0x24, 0x96, 0x64, 0x40, 0x4c, 0x50, 0x5a, 0xc1, + 0xc8, 0xc5, 0xef, 0x07, 0xb3, 0xde, 0xb9, 0x28, 0x35, 0xb1, 0x24, 0x55, 0x48, 0x88, 0x8b, 0x05, + 0xe4, 0x22, 0x09, 0x46, 0x05, 0x46, 0x0d, 0xce, 0x20, 0x30, 0x5b, 0xc8, 0x8d, 0x8b, 0x2d, 0x27, + 0x31, 0x29, 0x35, 0xa7, 0x58, 0x82, 0x49, 0x81, 0x59, 0x83, 0xdb, 0x48, 0x4f, 0x0f, 0xc3, 0x8d, + 0x7a, 0x68, 0xe6, 0xe8, 0xf9, 0x80, 0x35, 0xb8, 0xe6, 0x95, 0x14, 0x55, 0x06, 0x41, 0x75, 0x4b, + 0x59, 0x72, 0x71, 0x23, 0x09, 0x0b, 0x09, 0x70, 0x31, 0x67, 0xa7, 0x56, 0x42, 0x6d, 0x02, 0x31, + 0x85, 0x44, 0xb8, 0x58, 0xcb, 0x12, 0x73, 0x4a, 0x53, 0x25, 0x98, 0xc0, 0x62, 0x10, 0x8e, 0x15, + 0x93, 0x05, 0x23, 0xaa, 0x53, 0x43, 0x0b, 0x52, 0xa8, 0xe2, 0x54, 0x88, 0x39, 0xd4, 0x76, 0xaa, + 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, 0x12, 0x1b, 0x38, 0x56, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x0a, 0x22, 0xd4, 0x70, + 0x7f, 0x02, 0x00, 0x00, } diff --git a/api/services/events/v1/namespace.proto b/api/events/namespace.proto similarity index 75% rename from api/services/events/v1/namespace.proto rename to api/events/namespace.proto index 2d6be2b4d..6dc0d67bd 100644 --- a/api/services/events/v1/namespace.proto +++ b/api/events/namespace.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -package containerd.services.events.v1; +package containerd.events; import "gogoproto/gogo.proto"; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; -option go_package = "github.com/containerd/containerd/api/services/events/v1;events"; +option go_package = "github.com/containerd/containerd/api/events;events"; option (containerd.plugin.fieldpath_all) = true; message NamespaceCreate { diff --git a/api/services/events/v1/snapshot.pb.go b/api/events/snapshot.pb.go similarity index 88% rename from api/services/events/v1/snapshot.pb.go rename to api/events/snapshot.pb.go index 9b7a0147e..e0486a328 100644 --- a/api/services/events/v1/snapshot.pb.go +++ b/api/events/snapshot.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: github.com/containerd/containerd/api/services/events/v1/snapshot.proto +// source: github.com/containerd/containerd/api/events/snapshot.proto package events @@ -45,9 +45,9 @@ func (*SnapshotRemove) ProtoMessage() {} func (*SnapshotRemove) Descriptor() ([]byte, []int) { return fileDescriptorSnapshot, []int{2} } func init() { - proto.RegisterType((*SnapshotPrepare)(nil), "containerd.services.events.v1.SnapshotPrepare") - proto.RegisterType((*SnapshotCommit)(nil), "containerd.services.events.v1.SnapshotCommit") - proto.RegisterType((*SnapshotRemove)(nil), "containerd.services.events.v1.SnapshotRemove") + proto.RegisterType((*SnapshotPrepare)(nil), "containerd.events.SnapshotPrepare") + proto.RegisterType((*SnapshotCommit)(nil), "containerd.events.SnapshotCommit") + proto.RegisterType((*SnapshotRemove)(nil), "containerd.events.SnapshotRemove") } // Field returns the value for the given fieldpath as a string, if defined. @@ -680,25 +680,24 @@ var ( ) func init() { - proto.RegisterFile("github.com/containerd/containerd/api/services/events/v1/snapshot.proto", fileDescriptorSnapshot) + proto.RegisterFile("github.com/containerd/containerd/api/events/snapshot.proto", fileDescriptorSnapshot) } var fileDescriptorSnapshot = []byte{ - // 252 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x4b, 0xcf, 0x2c, 0xc9, + // 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, 0x17, 0xa7, 0x16, 0x95, 0x65, 0x26, 0xa7, 0x16, 0xeb, - 0xa7, 0x96, 0xa5, 0xe6, 0x95, 0x14, 0xeb, 0x97, 0x19, 0xea, 0x17, 0xe7, 0x25, 0x16, 0x14, 0x67, - 0xe4, 0x97, 0xe8, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0xc9, 0x22, 0x74, 0xe8, 0xc1, 0x54, 0xeb, - 0x41, 0x54, 0xeb, 0x95, 0x19, 0x4a, 0x39, 0x10, 0xb4, 0x06, 0x6c, 0x4c, 0x52, 0x69, 0x9a, 0x7e, - 0x41, 0x4e, 0x69, 0x7a, 0x66, 0x9e, 0x7e, 0x5a, 0x66, 0x6a, 0x4e, 0x4a, 0x41, 0x62, 0x49, 0x06, - 0xc4, 0x02, 0x25, 0x6b, 0x2e, 0xfe, 0x60, 0xa8, 0x95, 0x01, 0x45, 0xa9, 0x05, 0x89, 0x45, 0xa9, - 0x42, 0x02, 0x5c, 0xcc, 0xd9, 0xa9, 0x95, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x9c, 0x41, 0x20, 0xa6, - 0x90, 0x18, 0x17, 0x1b, 0x48, 0x26, 0xaf, 0x44, 0x82, 0x09, 0x2c, 0x08, 0xe5, 0x29, 0x99, 0x71, - 0xf1, 0xc1, 0x34, 0x3b, 0xe7, 0xe7, 0xe6, 0x66, 0x96, 0x60, 0xd1, 0x2b, 0xc4, 0xc5, 0x92, 0x97, - 0x98, 0x9b, 0x0a, 0xd5, 0x09, 0x66, 0x2b, 0x29, 0x21, 0xf4, 0x05, 0xa5, 0xe6, 0xe6, 0x97, 0x61, - 0xb1, 0xd3, 0x29, 0xe6, 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, 0xd9, 0x91, 0x19, 0xbe, 0xd6, 0x10, 0x56, 0x12, 0x1b, 0xd8, 0xf7, 0xc6, 0x80, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x3a, 0x82, 0x7a, 0xa7, 0xa8, 0x01, 0x00, 0x00, + 0x4a, 0x41, 0x66, 0x26, 0x16, 0x64, 0xea, 0xa7, 0x96, 0xa5, 0xe6, 0x95, 0x14, 0xeb, 0x17, 0xe7, + 0x25, 0x16, 0x14, 0x67, 0xe4, 0x97, 0xe8, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0x09, 0x22, 0x54, + 0xe9, 0x41, 0x54, 0x48, 0x39, 0x10, 0x34, 0x0e, 0xac, 0x35, 0xa9, 0x34, 0x4d, 0xbf, 0x20, 0xa7, + 0x34, 0x3d, 0x33, 0x4f, 0x3f, 0x2d, 0x33, 0x35, 0x27, 0xa5, 0x20, 0xb1, 0x24, 0x03, 0x62, 0xa8, + 0x92, 0x35, 0x17, 0x7f, 0x30, 0xd4, 0x9a, 0x80, 0xa2, 0xd4, 0x82, 0xc4, 0xa2, 0x54, 0x21, 0x01, + 0x2e, 0xe6, 0xec, 0xd4, 0x4a, 0x09, 0x46, 0x05, 0x46, 0x0d, 0xce, 0x20, 0x10, 0x53, 0x48, 0x8c, + 0x8b, 0x0d, 0x24, 0x93, 0x57, 0x22, 0xc1, 0x04, 0x16, 0x84, 0xf2, 0x94, 0xcc, 0xb8, 0xf8, 0x60, + 0x9a, 0x9d, 0xf3, 0x73, 0x73, 0x33, 0x4b, 0xb0, 0xe8, 0x15, 0xe2, 0x62, 0xc9, 0x4b, 0xcc, 0x4d, + 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, 0x95, 0xc4, 0x06, 0xf6, 0xb1, 0x31, 0x20, 0x00, 0x00, 0xff, + 0xff, 0x62, 0x68, 0x19, 0xf5, 0x84, 0x01, 0x00, 0x00, } diff --git a/api/services/events/v1/snapshot.proto b/api/events/snapshot.proto similarity index 71% rename from api/services/events/v1/snapshot.proto rename to api/events/snapshot.proto index b6af0ea4b..17c068ded 100644 --- a/api/services/events/v1/snapshot.proto +++ b/api/events/snapshot.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -package containerd.services.events.v1; +package containerd.events; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; -option go_package = "github.com/containerd/containerd/api/services/events/v1;events"; +option go_package = "github.com/containerd/containerd/api/events;events"; option (containerd.plugin.fieldpath_all) = true; message SnapshotPrepare { diff --git a/api/services/events/v1/task.pb.go b/api/events/task.pb.go similarity index 91% rename from api/services/events/v1/task.pb.go rename to api/events/task.pb.go index 31beca0f3..61eb385ca 100644 --- a/api/services/events/v1/task.pb.go +++ b/api/events/task.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: github.com/containerd/containerd/api/services/events/v1/task.proto +// source: github.com/containerd/containerd/api/events/task.proto package events @@ -135,17 +135,17 @@ func (*TaskCheckpointed) ProtoMessage() {} func (*TaskCheckpointed) Descriptor() ([]byte, []int) { return fileDescriptorTask, []int{10} } func init() { - proto.RegisterType((*TaskCreate)(nil), "containerd.services.events.v1.TaskCreate") - proto.RegisterType((*TaskStart)(nil), "containerd.services.events.v1.TaskStart") - proto.RegisterType((*TaskDelete)(nil), "containerd.services.events.v1.TaskDelete") - proto.RegisterType((*TaskIO)(nil), "containerd.services.events.v1.TaskIO") - proto.RegisterType((*TaskExit)(nil), "containerd.services.events.v1.TaskExit") - proto.RegisterType((*TaskOOM)(nil), "containerd.services.events.v1.TaskOOM") - proto.RegisterType((*TaskExecAdded)(nil), "containerd.services.events.v1.TaskExecAdded") - proto.RegisterType((*TaskExecStarted)(nil), "containerd.services.events.v1.TaskExecStarted") - proto.RegisterType((*TaskPaused)(nil), "containerd.services.events.v1.TaskPaused") - proto.RegisterType((*TaskResumed)(nil), "containerd.services.events.v1.TaskResumed") - proto.RegisterType((*TaskCheckpointed)(nil), "containerd.services.events.v1.TaskCheckpointed") + proto.RegisterType((*TaskCreate)(nil), "containerd.events.TaskCreate") + proto.RegisterType((*TaskStart)(nil), "containerd.events.TaskStart") + proto.RegisterType((*TaskDelete)(nil), "containerd.events.TaskDelete") + proto.RegisterType((*TaskIO)(nil), "containerd.events.TaskIO") + proto.RegisterType((*TaskExit)(nil), "containerd.events.TaskExit") + proto.RegisterType((*TaskOOM)(nil), "containerd.events.TaskOOM") + proto.RegisterType((*TaskExecAdded)(nil), "containerd.events.TaskExecAdded") + proto.RegisterType((*TaskExecStarted)(nil), "containerd.events.TaskExecStarted") + proto.RegisterType((*TaskPaused)(nil), "containerd.events.TaskPaused") + proto.RegisterType((*TaskResumed)(nil), "containerd.events.TaskResumed") + proto.RegisterType((*TaskCheckpointed)(nil), "containerd.events.TaskCheckpointed") } // Field returns the value for the given fieldpath as a string, if defined. @@ -972,7 +972,7 @@ func (this *TaskDelete) String() string { `ContainerID:` + fmt.Sprintf("%v", this.ContainerID) + `,`, `Pid:` + fmt.Sprintf("%v", this.Pid) + `,`, `ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`, - `ExitedAt:` + strings.Replace(strings.Replace(this.ExitedAt.String(), "Timestamp", "google_protobuf3.Timestamp", 1), `&`, ``, 1) + `,`, + `ExitedAt:` + strings.Replace(strings.Replace(this.ExitedAt.String(), "Timestamp", "google_protobuf2.Timestamp", 1), `&`, ``, 1) + `,`, `}`, }, "") return s @@ -999,7 +999,7 @@ func (this *TaskExit) String() string { `ID:` + fmt.Sprintf("%v", this.ID) + `,`, `Pid:` + fmt.Sprintf("%v", this.Pid) + `,`, `ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`, - `ExitedAt:` + strings.Replace(strings.Replace(this.ExitedAt.String(), "Timestamp", "google_protobuf3.Timestamp", 1), `&`, ``, 1) + `,`, + `ExitedAt:` + strings.Replace(strings.Replace(this.ExitedAt.String(), "Timestamp", "google_protobuf2.Timestamp", 1), `&`, ``, 1) + `,`, `}`, }, "") return s @@ -2560,50 +2560,49 @@ var ( ) func init() { - proto.RegisterFile("github.com/containerd/containerd/api/services/events/v1/task.proto", fileDescriptorTask) + proto.RegisterFile("github.com/containerd/containerd/api/events/task.proto", fileDescriptorTask) } var fileDescriptorTask = []byte{ - // 648 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x95, 0xc1, 0x6e, 0xd3, 0x40, - 0x10, 0x86, 0x6b, 0xa7, 0x75, 0x93, 0x0d, 0x55, 0x2b, 0xab, 0x82, 0x28, 0x12, 0x76, 0x64, 0x84, - 0x94, 0x93, 0xad, 0x16, 0x89, 0x0b, 0x2a, 0x6a, 0xd2, 0x70, 0xc8, 0xa1, 0x0a, 0xb8, 0x3d, 0x21, - 0xa4, 0xc8, 0xb1, 0x27, 0xc9, 0xd2, 0xc4, 0x6b, 0x79, 0xc7, 0x51, 0x91, 0x38, 0xf0, 0x08, 0x3c, - 0x02, 0x4f, 0xc1, 0x33, 0xf4, 0xc0, 0x81, 0x23, 0xa7, 0x40, 0xfd, 0x0c, 0x9c, 0x38, 0xa1, 0xf5, - 0x3a, 0x6e, 0xa1, 0xa2, 0x20, 0x4b, 0xdc, 0x76, 0xc6, 0x33, 0xff, 0xcc, 0x7c, 0x3b, 0xd9, 0x90, - 0xee, 0x84, 0xe2, 0x34, 0x19, 0xd9, 0x3e, 0x9b, 0x3b, 0x3e, 0x0b, 0xd1, 0xa3, 0x21, 0xc4, 0xc1, - 0xf5, 0xa3, 0x17, 0x51, 0x87, 0x43, 0xbc, 0xa0, 0x3e, 0x70, 0x07, 0x16, 0x10, 0x22, 0x77, 0x16, - 0x7b, 0x0e, 0x7a, 0xfc, 0xcc, 0x8e, 0x62, 0x86, 0x4c, 0xbf, 0x7f, 0x15, 0x6d, 0xaf, 0x22, 0x6d, - 0x19, 0x69, 0x2f, 0xf6, 0x9a, 0xbb, 0x13, 0x36, 0x61, 0x59, 0xa4, 0x23, 0x4e, 0x32, 0xa9, 0x69, - 0x4e, 0x18, 0x9b, 0xcc, 0xc0, 0xc9, 0xac, 0x51, 0x32, 0x76, 0x90, 0xce, 0x81, 0xa3, 0x37, 0x8f, - 0xf2, 0x80, 0xc7, 0xff, 0xd4, 0x19, 0xbe, 0x89, 0x80, 0x3b, 0x73, 0x96, 0x84, 0x98, 0xe7, 0x1d, - 0xfe, 0x35, 0xaf, 0x28, 0x19, 0xcd, 0x92, 0x09, 0x0d, 0x9d, 0x31, 0x85, 0x59, 0x10, 0x79, 0x38, - 0x95, 0x0a, 0xd6, 0x0f, 0x85, 0x90, 0x53, 0x8f, 0x9f, 0x1d, 0xc5, 0xe0, 0x21, 0xe8, 0xfb, 0xe4, - 0x4e, 0x91, 0x3c, 0xa4, 0x41, 0x43, 0x69, 0x29, 0xed, 0x5a, 0x77, 0x3b, 0x5d, 0x9a, 0xf5, 0xa3, - 0x95, 0xbf, 0xdf, 0x73, 0xeb, 0x45, 0x50, 0x3f, 0xd0, 0xef, 0x12, 0x6d, 0x94, 0x84, 0xc1, 0x0c, - 0x1a, 0xaa, 0x88, 0x76, 0x73, 0x4b, 0x77, 0x88, 0x16, 0x33, 0x86, 0x63, 0xde, 0xa8, 0xb4, 0x2a, - 0xed, 0xfa, 0xfe, 0x3d, 0xfb, 0x1a, 0xbb, 0x6c, 0x16, 0xfb, 0x58, 0xcc, 0xe2, 0xe6, 0x61, 0xfa, - 0x01, 0x51, 0x29, 0x6b, 0xac, 0xb7, 0x94, 0x76, 0x7d, 0xff, 0xa1, 0x7d, 0x2b, 0x68, 0x5b, 0xf4, - 0xdc, 0x1f, 0x74, 0xb5, 0x74, 0x69, 0xaa, 0xfd, 0x81, 0xab, 0x52, 0xa6, 0x1b, 0x84, 0xf8, 0x53, - 0xf0, 0xcf, 0x22, 0x46, 0x43, 0x6c, 0x6c, 0x64, 0xbd, 0x5c, 0xf3, 0xe8, 0x3b, 0xa4, 0x12, 0xd1, - 0xa0, 0xa1, 0xb5, 0x94, 0xf6, 0x96, 0x2b, 0x8e, 0xd6, 0x0b, 0x52, 0x13, 0x3a, 0x27, 0xe8, 0xc5, - 0x58, 0x6a, 0xf4, 0x5c, 0x52, 0xbd, 0x92, 0xfc, 0x98, 0xf3, 0xec, 0xc1, 0x0c, 0x4a, 0xf2, 0xbc, - 0x21, 0xaa, 0x9b, 0xa4, 0x0e, 0xe7, 0x14, 0x87, 0x1c, 0x3d, 0x4c, 0x04, 0x4e, 0xf1, 0x85, 0x08, - 0xd7, 0x49, 0xe6, 0xd1, 0x3b, 0xa4, 0x26, 0x2c, 0x08, 0x86, 0x1e, 0xe6, 0x00, 0x9b, 0xb6, 0x5c, - 0x3a, 0x7b, 0xb5, 0x01, 0xf6, 0xe9, 0x6a, 0xe9, 0xba, 0xd5, 0x8b, 0xa5, 0xb9, 0xf6, 0xfe, 0xab, - 0xa9, 0xb8, 0x55, 0x99, 0xd6, 0x41, 0xeb, 0x35, 0xd1, 0x24, 0x53, 0x7d, 0x97, 0x6c, 0x70, 0x0c, - 0x68, 0x28, 0x9b, 0x75, 0xa5, 0x21, 0x6e, 0x99, 0x63, 0xc0, 0x12, 0x5c, 0xdd, 0xb2, 0xb4, 0x72, - 0x3f, 0xc4, 0x71, 0xd6, 0x96, 0xf4, 0x43, 0x1c, 0xeb, 0x4d, 0x52, 0x45, 0x88, 0xe7, 0x34, 0xf4, - 0x66, 0x59, 0x47, 0x55, 0xb7, 0xb0, 0xad, 0x4f, 0x0a, 0xa9, 0x8a, 0x62, 0xcf, 0xce, 0x29, 0x96, - 0x5c, 0x39, 0x35, 0x27, 0x54, 0xcb, 0x57, 0xa0, 0xe7, 0xaa, 0xb4, 0x40, 0x57, 0xf9, 0x23, 0xba, - 0xf5, 0xdb, 0xd1, 0x6d, 0x94, 0x42, 0x77, 0x40, 0x36, 0xc5, 0x34, 0x83, 0xc1, 0x71, 0x99, 0x61, - 0xac, 0x29, 0xd9, 0x92, 0x30, 0xc0, 0xef, 0x04, 0x01, 0x04, 0xa5, 0x88, 0x3c, 0x20, 0x9b, 0x70, - 0x0e, 0xfe, 0xb0, 0xc0, 0x42, 0xd2, 0xa5, 0xa9, 0x09, 0xcd, 0x7e, 0xcf, 0xd5, 0xc4, 0xa7, 0x7e, - 0x60, 0xbd, 0x25, 0xdb, 0xab, 0x4a, 0xd9, 0xce, 0xff, 0xc7, 0x5a, 0x37, 0xaf, 0xc2, 0x3a, 0x94, - 0xbf, 0x8c, 0xe7, 0x5e, 0xc2, 0xcb, 0x15, 0xb6, 0x3a, 0xa4, 0x2e, 0x14, 0x5c, 0xe0, 0xc9, 0xbc, - 0xa4, 0xc4, 0x98, 0xec, 0x64, 0xcf, 0x5d, 0xf1, 0x2c, 0x94, 0x64, 0xf0, 0xeb, 0x63, 0xa3, 0xfe, - 0xfe, 0xd8, 0x74, 0x5f, 0x5d, 0x5c, 0x1a, 0x6b, 0x5f, 0x2e, 0x8d, 0xb5, 0x77, 0xa9, 0xa1, 0x5c, - 0xa4, 0x86, 0xf2, 0x39, 0x35, 0x94, 0x6f, 0xa9, 0xa1, 0x7c, 0xf8, 0x6e, 0x28, 0x2f, 0x9f, 0x96, - 0xfc, 0x27, 0x7a, 0x22, 0x4f, 0x23, 0x2d, 0xdb, 0xcc, 0x47, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, - 0x76, 0xdf, 0xe7, 0xaa, 0xd2, 0x06, 0x00, 0x00, + // 632 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x95, 0xcd, 0x6e, 0xd3, 0x40, + 0x10, 0xc7, 0x6b, 0xa7, 0x75, 0x93, 0x09, 0x55, 0x8b, 0x55, 0x41, 0xc8, 0xc1, 0x8e, 0xcc, 0x25, + 0x27, 0x5b, 0x04, 0x89, 0x0b, 0x42, 0x6a, 0xd2, 0x70, 0xc8, 0xa1, 0x4a, 0x71, 0x7b, 0xe2, 0x12, + 0x6d, 0xb2, 0x9b, 0x64, 0x69, 0xe2, 0xb5, 0xec, 0x31, 0x2a, 0x12, 0x07, 0x1e, 0x81, 0x47, 0xe0, + 0x29, 0x78, 0x86, 0x1e, 0x38, 0x70, 0xe4, 0x14, 0xa8, 0x1f, 0x80, 0x13, 0x0f, 0x80, 0xd6, 0xeb, + 0xb8, 0x85, 0x8a, 0x2f, 0x4b, 0x9c, 0xb2, 0x33, 0x3b, 0xfb, 0x9f, 0x99, 0xdf, 0x4e, 0xd6, 0xf0, + 0x68, 0xc6, 0x71, 0x9e, 0x8c, 0xdd, 0x89, 0x58, 0x7a, 0x13, 0x11, 0x20, 0xe1, 0x01, 0x8b, 0xe8, + 0xf5, 0x25, 0x09, 0xb9, 0xc7, 0x5e, 0xb2, 0x00, 0x63, 0x0f, 0x49, 0x7c, 0xe6, 0x86, 0x91, 0x40, + 0x61, 0xde, 0xbe, 0x8a, 0x70, 0xd5, 0x6e, 0x73, 0x7f, 0x26, 0x66, 0x22, 0xdb, 0xf5, 0xe4, 0x4a, + 0x05, 0x36, 0xed, 0x99, 0x10, 0xb3, 0x05, 0xf3, 0x32, 0x6b, 0x9c, 0x4c, 0x3d, 0xe4, 0x4b, 0x16, + 0x23, 0x59, 0x86, 0x79, 0xc0, 0xdf, 0x55, 0x80, 0xaf, 0x42, 0x16, 0x7b, 0x4b, 0x91, 0x04, 0x98, + 0x9f, 0x3b, 0xf8, 0xe3, 0xb9, 0x22, 0x65, 0xb8, 0x48, 0x66, 0x3c, 0xf0, 0xa6, 0x9c, 0x2d, 0x68, + 0x48, 0x70, 0xae, 0x14, 0x9c, 0xaf, 0x1a, 0xc0, 0x29, 0x89, 0xcf, 0x0e, 0x23, 0x46, 0x90, 0x99, + 0x1d, 0xb8, 0x55, 0x1c, 0x1e, 0x71, 0xda, 0xd0, 0x5a, 0x5a, 0xbb, 0xd6, 0xdb, 0x4d, 0x57, 0x76, + 0xfd, 0x70, 0xed, 0x1f, 0xf4, 0xfd, 0x7a, 0x11, 0x34, 0xa0, 0xe6, 0x1d, 0x30, 0xc6, 0x49, 0x40, + 0x17, 0xac, 0xa1, 0xcb, 0x68, 0x3f, 0xb7, 0x4c, 0x0f, 0x8c, 0x48, 0x08, 0x9c, 0xc6, 0x8d, 0x4a, + 0xab, 0xd2, 0xae, 0x77, 0xee, 0xba, 0xd7, 0x78, 0x65, 0xbd, 0xb8, 0x47, 0xb2, 0x17, 0x3f, 0x0f, + 0x33, 0x1f, 0x80, 0xce, 0x45, 0x63, 0xb3, 0xa5, 0xb5, 0xeb, 0x9d, 0x7b, 0xee, 0x0d, 0xb8, 0xae, + 0xac, 0x73, 0x30, 0xec, 0x19, 0xe9, 0xca, 0xd6, 0x07, 0x43, 0x5f, 0xe7, 0xc2, 0xb4, 0x00, 0x26, + 0x73, 0x36, 0x39, 0x0b, 0x05, 0x0f, 0xb0, 0xb1, 0x95, 0xe5, 0xbf, 0xe6, 0x31, 0xf7, 0xa0, 0x12, + 0x72, 0xda, 0x30, 0x5a, 0x5a, 0x7b, 0xc7, 0x97, 0x4b, 0xe7, 0x19, 0xd4, 0xa4, 0xce, 0x09, 0x92, + 0x08, 0x4b, 0xb5, 0x9b, 0x4b, 0xea, 0x57, 0x92, 0xef, 0x73, 0x86, 0x7d, 0xb6, 0x60, 0x25, 0x19, + 0xde, 0x10, 0x35, 0x6d, 0xa8, 0xb3, 0x73, 0x8e, 0xa3, 0x18, 0x09, 0x26, 0x12, 0xa1, 0xdc, 0x01, + 0xe9, 0x3a, 0xc9, 0x3c, 0x66, 0x17, 0x6a, 0xd2, 0x62, 0x74, 0x44, 0x30, 0x87, 0xd6, 0x74, 0xd5, + 0xa0, 0xb9, 0xeb, 0x5b, 0x77, 0x4f, 0xd7, 0x83, 0xd6, 0xab, 0x5e, 0xac, 0xec, 0x8d, 0xb7, 0x9f, + 0x6d, 0xcd, 0xaf, 0xaa, 0x63, 0x5d, 0x74, 0x5e, 0x80, 0xa1, 0x98, 0x9a, 0xfb, 0xb0, 0x15, 0x23, + 0xe5, 0x81, 0x2a, 0xd6, 0x57, 0x86, 0xbc, 0xd9, 0x18, 0xa9, 0x48, 0x70, 0x7d, 0xb3, 0xca, 0xca, + 0xfd, 0x2c, 0x8a, 0xb2, 0xb2, 0x94, 0x9f, 0x45, 0x91, 0xd9, 0x84, 0x2a, 0xb2, 0x68, 0xc9, 0x03, + 0xb2, 0xc8, 0x2a, 0xaa, 0xfa, 0x85, 0xed, 0x7c, 0xd0, 0xa0, 0x2a, 0x93, 0x3d, 0x3d, 0xe7, 0x58, + 0x72, 0xcc, 0xf4, 0x9c, 0x50, 0x2d, 0x1f, 0x81, 0xbe, 0xaf, 0xf3, 0x02, 0x5d, 0xe5, 0x97, 0xe8, + 0x36, 0x7f, 0x8f, 0x6e, 0xab, 0x14, 0xba, 0x27, 0xb0, 0x2d, 0xbb, 0x19, 0x0e, 0x8f, 0xca, 0x34, + 0xe3, 0xcc, 0x61, 0x47, 0xc1, 0x60, 0x93, 0x2e, 0xa5, 0x8c, 0x96, 0x22, 0x72, 0x1f, 0xb6, 0xd9, + 0x39, 0x9b, 0x8c, 0x0a, 0x2c, 0x90, 0xae, 0x6c, 0x43, 0x6a, 0x0e, 0xfa, 0xbe, 0x21, 0xb7, 0x06, + 0xd4, 0x79, 0x0d, 0xbb, 0xeb, 0x4c, 0xd9, 0xcc, 0xff, 0xc7, 0x5c, 0x37, 0xaf, 0xc2, 0x39, 0x50, + 0xff, 0x8c, 0x63, 0x92, 0xc4, 0xe5, 0x12, 0x3b, 0x5d, 0xa8, 0x4b, 0x05, 0x9f, 0xc5, 0xc9, 0xb2, + 0xa4, 0xc4, 0x14, 0xf6, 0xb2, 0x27, 0xae, 0x78, 0x16, 0x4a, 0x32, 0xf8, 0xf1, 0xb1, 0xd1, 0x7f, + 0x7e, 0x6c, 0x7a, 0xc7, 0x17, 0x97, 0xd6, 0xc6, 0xa7, 0x4b, 0x6b, 0xe3, 0x4d, 0x6a, 0x69, 0x17, + 0xa9, 0xa5, 0x7d, 0x4c, 0x2d, 0xed, 0x4b, 0x6a, 0x69, 0xef, 0xbe, 0x59, 0xda, 0xf3, 0xce, 0x3f, + 0x7c, 0x65, 0x1e, 0xab, 0x9f, 0xb1, 0x91, 0x4d, 0xe3, 0xc3, 0xef, 0x01, 0x00, 0x00, 0xff, 0xff, + 0x13, 0x1c, 0x5d, 0xf2, 0xa2, 0x06, 0x00, 0x00, } diff --git a/api/services/events/v1/task.proto b/api/events/task.proto similarity index 92% rename from api/services/events/v1/task.proto rename to api/events/task.proto index 79f87a6c5..4e6335809 100644 --- a/api/services/events/v1/task.proto +++ b/api/events/task.proto @@ -1,13 +1,13 @@ syntax = "proto3"; -package containerd.services.events.v1; +package containerd.events; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; import "github.com/containerd/containerd/api/types/mount.proto"; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; -option go_package = "github.com/containerd/containerd/api/services/events/v1;events"; +option go_package = "github.com/containerd/containerd/api/events;events"; option (containerd.plugin.fieldpath_all) = true; message TaskCreate { diff --git a/api/next.pb.txt b/api/next.pb.txt index 7433bfe5d..5bd94c306 100755 --- a/api/next.pb.txt +++ b/api/next.pb.txt @@ -28,6 +28,765 @@ file { } syntax: "proto3" } +file { + name: "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto" + package: "containerd.plugin" + dependency: "google/protobuf/descriptor.proto" + extension { + name: "fieldpath_all" + extendee: ".google.protobuf.FileOptions" + number: 63300 + label: LABEL_OPTIONAL + type: TYPE_BOOL + json_name: "fieldpathAll" + } + extension { + name: "fieldpath" + extendee: ".google.protobuf.MessageOptions" + number: 64400 + label: LABEL_OPTIONAL + type: TYPE_BOOL + json_name: "fieldpath" + } +} +file { + name: "github.com/containerd/containerd/api/events/container.proto" + package: "containerd.events" + dependency: "gogoproto/gogo.proto" + dependency: "google/protobuf/any.proto" + dependency: "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto" + message_type { + name: "ContainerCreate" + field { + name: "id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "id" + } + field { + name: "image" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "image" + } + field { + name: "runtime" + number: 3 + label: LABEL_OPTIONAL + type: TYPE_MESSAGE + type_name: ".containerd.events.ContainerCreate.Runtime" + json_name: "runtime" + } + nested_type { + name: "Runtime" + field { + name: "name" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "name" + } + field { + name: "options" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_MESSAGE + type_name: ".google.protobuf.Any" + json_name: "options" + } + } + } + message_type { + name: "ContainerUpdate" + field { + name: "id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "id" + } + field { + name: "image" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "image" + } + field { + name: "labels" + number: 3 + label: LABEL_REPEATED + type: TYPE_MESSAGE + type_name: ".containerd.events.ContainerUpdate.LabelsEntry" + json_name: "labels" + } + field { + name: "snapshot_key" + number: 4 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "snapshotKey" + } + nested_type { + name: "LabelsEntry" + field { + name: "key" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "key" + } + field { + name: "value" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "value" + } + options { + map_entry: true + } + } + } + message_type { + name: "ContainerDelete" + field { + name: "id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "id" + } + } + options { + go_package: "github.com/containerd/containerd/api/events;events" + 63300: 1 + } + syntax: "proto3" +} +file { + name: "github.com/containerd/containerd/api/events/content.proto" + package: "containerd.events" + dependency: "gogoproto/gogo.proto" + dependency: "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto" + message_type { + name: "ContentDelete" + field { + name: "digest" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + options { + 65003: "github.com/opencontainers/go-digest.Digest" + 65001: 0 + } + json_name: "digest" + } + } + options { + go_package: "github.com/containerd/containerd/api/events;events" + 63300: 1 + } + syntax: "proto3" +} +file { + name: "github.com/containerd/containerd/api/events/image.proto" + package: "containerd.services.images.v1" + dependency: "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto" + message_type { + name: "ImageCreate" + field { + name: "name" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "name" + } + field { + name: "labels" + number: 2 + label: LABEL_REPEATED + type: TYPE_MESSAGE + type_name: ".containerd.services.images.v1.ImageCreate.LabelsEntry" + json_name: "labels" + } + nested_type { + name: "LabelsEntry" + field { + name: "key" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "key" + } + field { + name: "value" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "value" + } + options { + map_entry: true + } + } + } + message_type { + name: "ImageUpdate" + field { + name: "name" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "name" + } + field { + name: "labels" + number: 2 + label: LABEL_REPEATED + type: TYPE_MESSAGE + type_name: ".containerd.services.images.v1.ImageUpdate.LabelsEntry" + json_name: "labels" + } + nested_type { + name: "LabelsEntry" + field { + name: "key" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "key" + } + field { + name: "value" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "value" + } + options { + map_entry: true + } + } + } + message_type { + name: "ImageDelete" + field { + name: "name" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "name" + } + } + options { + go_package: "github.com/containerd/containerd/api/events;events" + 63300: 1 + } + syntax: "proto3" +} +file { + name: "github.com/containerd/containerd/api/events/namespace.proto" + package: "containerd.events" + dependency: "gogoproto/gogo.proto" + dependency: "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto" + message_type { + name: "NamespaceCreate" + field { + name: "name" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "name" + } + field { + name: "labels" + number: 2 + label: LABEL_REPEATED + type: TYPE_MESSAGE + type_name: ".containerd.events.NamespaceCreate.LabelsEntry" + json_name: "labels" + } + nested_type { + name: "LabelsEntry" + field { + name: "key" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "key" + } + field { + name: "value" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "value" + } + options { + map_entry: true + } + } + } + message_type { + name: "NamespaceUpdate" + field { + name: "name" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "name" + } + field { + name: "labels" + number: 2 + label: LABEL_REPEATED + type: TYPE_MESSAGE + type_name: ".containerd.events.NamespaceUpdate.LabelsEntry" + json_name: "labels" + } + nested_type { + name: "LabelsEntry" + field { + name: "key" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "key" + } + field { + name: "value" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "value" + } + options { + map_entry: true + } + } + } + message_type { + name: "NamespaceDelete" + field { + name: "name" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "name" + } + } + options { + go_package: "github.com/containerd/containerd/api/events;events" + 63300: 1 + } + syntax: "proto3" +} +file { + name: "github.com/containerd/containerd/api/events/snapshot.proto" + package: "containerd.events" + dependency: "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto" + message_type { + name: "SnapshotPrepare" + field { + name: "key" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "key" + } + field { + name: "parent" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "parent" + } + } + message_type { + name: "SnapshotCommit" + field { + name: "key" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "key" + } + field { + name: "name" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "name" + } + } + message_type { + name: "SnapshotRemove" + field { + name: "key" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "key" + } + } + options { + go_package: "github.com/containerd/containerd/api/events;events" + 63300: 1 + } + syntax: "proto3" +} +file { + name: "google/protobuf/timestamp.proto" + package: "google.protobuf" + message_type { + name: "Timestamp" + field { + name: "seconds" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_INT64 + json_name: "seconds" + } + field { + name: "nanos" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_INT32 + json_name: "nanos" + } + } + options { + java_package: "com.google.protobuf" + java_outer_classname: "TimestampProto" + java_multiple_files: true + go_package: "github.com/golang/protobuf/ptypes/timestamp" + cc_enable_arenas: true + objc_class_prefix: "GPB" + csharp_namespace: "Google.Protobuf.WellKnownTypes" + } + syntax: "proto3" +} +file { + name: "github.com/containerd/containerd/api/types/mount.proto" + package: "containerd.types" + dependency: "gogoproto/gogo.proto" + message_type { + name: "Mount" + field { + name: "type" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "type" + } + field { + name: "source" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "source" + } + field { + name: "target" + number: 3 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "target" + } + field { + name: "options" + number: 4 + label: LABEL_REPEATED + type: TYPE_STRING + json_name: "options" + } + } + options { + go_package: "github.com/containerd/containerd/api/types;types" + } + syntax: "proto3" +} +file { + name: "github.com/containerd/containerd/api/events/task.proto" + package: "containerd.events" + dependency: "gogoproto/gogo.proto" + dependency: "google/protobuf/timestamp.proto" + dependency: "github.com/containerd/containerd/api/types/mount.proto" + dependency: "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto" + message_type { + name: "TaskCreate" + field { + name: "container_id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "containerId" + } + field { + name: "bundle" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "bundle" + } + field { + name: "rootfs" + number: 3 + label: LABEL_REPEATED + type: TYPE_MESSAGE + type_name: ".containerd.types.Mount" + json_name: "rootfs" + } + field { + name: "io" + number: 4 + label: LABEL_OPTIONAL + type: TYPE_MESSAGE + type_name: ".containerd.events.TaskIO" + options { + 65004: "IO" + } + json_name: "io" + } + field { + name: "checkpoint" + number: 5 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "checkpoint" + } + field { + name: "pid" + number: 6 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "pid" + } + } + message_type { + name: "TaskStart" + field { + name: "container_id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "containerId" + } + field { + name: "pid" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "pid" + } + } + message_type { + name: "TaskDelete" + field { + name: "container_id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "containerId" + } + field { + name: "pid" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "pid" + } + field { + name: "exit_status" + number: 3 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "exitStatus" + } + field { + name: "exited_at" + number: 4 + label: LABEL_OPTIONAL + type: TYPE_MESSAGE + type_name: ".google.protobuf.Timestamp" + options { + 65010: 1 + 65001: 0 + } + json_name: "exitedAt" + } + } + message_type { + name: "TaskIO" + field { + name: "stdin" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "stdin" + } + field { + name: "stdout" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "stdout" + } + field { + name: "stderr" + number: 3 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "stderr" + } + field { + name: "terminal" + number: 4 + label: LABEL_OPTIONAL + type: TYPE_BOOL + json_name: "terminal" + } + } + message_type { + name: "TaskExit" + field { + name: "container_id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "containerId" + } + field { + name: "id" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "id" + } + field { + name: "pid" + number: 3 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "pid" + } + field { + name: "exit_status" + number: 4 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "exitStatus" + } + field { + name: "exited_at" + number: 5 + label: LABEL_OPTIONAL + type: TYPE_MESSAGE + type_name: ".google.protobuf.Timestamp" + options { + 65010: 1 + 65001: 0 + } + json_name: "exitedAt" + } + } + message_type { + name: "TaskOOM" + field { + name: "container_id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "containerId" + } + } + message_type { + name: "TaskExecAdded" + field { + name: "container_id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "containerId" + } + field { + name: "exec_id" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "execId" + } + } + message_type { + name: "TaskExecStarted" + field { + name: "container_id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "containerId" + } + field { + name: "exec_id" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "execId" + } + field { + name: "pid" + number: 3 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "pid" + } + } + message_type { + name: "TaskPaused" + field { + name: "container_id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "containerId" + } + } + message_type { + name: "TaskResumed" + field { + name: "container_id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "containerId" + } + } + message_type { + name: "TaskCheckpointed" + field { + name: "container_id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "containerId" + } + field { + name: "checkpoint" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "checkpoint" + } + } + options { + go_package: "github.com/containerd/containerd/api/events;events" + 63300: 1 + } + syntax: "proto3" +} file { name: "google/protobuf/empty.proto" package: "google.protobuf" @@ -68,37 +827,6 @@ file { } syntax: "proto3" } -file { - name: "google/protobuf/timestamp.proto" - package: "google.protobuf" - message_type { - name: "Timestamp" - field { - name: "seconds" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_INT64 - json_name: "seconds" - } - field { - name: "nanos" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_INT32 - json_name: "nanos" - } - } - options { - java_package: "com.google.protobuf" - java_outer_classname: "TimestampProto" - java_multiple_files: true - go_package: "github.com/golang/protobuf/ptypes/timestamp" - cc_enable_arenas: true - objc_class_prefix: "GPB" - csharp_namespace: "Google.Protobuf.WellKnownTypes" - } - syntax: "proto3" -} file { name: "github.com/containerd/containerd/api/services/containers/v1/containers.proto" package: "containerd.services.containers.v1" @@ -975,46 +1703,6 @@ file { } syntax: "proto3" } -file { - name: "github.com/containerd/containerd/api/types/mount.proto" - package: "containerd.types" - dependency: "gogoproto/gogo.proto" - message_type { - name: "Mount" - field { - name: "type" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "type" - } - field { - name: "source" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "source" - } - field { - name: "target" - number: 3 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "target" - } - field { - name: "options" - number: 4 - label: LABEL_REPEATED - type: TYPE_STRING - json_name: "options" - } - } - options { - go_package: "github.com/containerd/containerd/api/types;types" - } - syntax: "proto3" -} file { name: "github.com/containerd/containerd/api/types/descriptor.proto" package: "containerd.types" @@ -1178,169 +1866,6 @@ file { } syntax: "proto3" } -file { - name: "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto" - package: "containerd.plugin" - dependency: "google/protobuf/descriptor.proto" - extension { - name: "fieldpath_all" - extendee: ".google.protobuf.FileOptions" - number: 63300 - label: LABEL_OPTIONAL - type: TYPE_BOOL - json_name: "fieldpathAll" - } - extension { - name: "fieldpath" - extendee: ".google.protobuf.MessageOptions" - number: 64400 - label: LABEL_OPTIONAL - type: TYPE_BOOL - json_name: "fieldpath" - } -} -file { - name: "github.com/containerd/containerd/api/services/events/v1/container.proto" - package: "containerd.services.events.v1" - dependency: "gogoproto/gogo.proto" - dependency: "google/protobuf/any.proto" - dependency: "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto" - message_type { - name: "ContainerCreate" - field { - name: "id" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "id" - } - field { - name: "image" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "image" - } - field { - name: "runtime" - number: 3 - label: LABEL_OPTIONAL - type: TYPE_MESSAGE - type_name: ".containerd.services.events.v1.ContainerCreate.Runtime" - json_name: "runtime" - } - nested_type { - name: "Runtime" - field { - name: "name" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "name" - } - field { - name: "options" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_MESSAGE - type_name: ".google.protobuf.Any" - json_name: "options" - } - } - } - message_type { - name: "ContainerUpdate" - field { - name: "id" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "id" - } - field { - name: "image" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "image" - } - field { - name: "labels" - number: 3 - label: LABEL_REPEATED - type: TYPE_MESSAGE - type_name: ".containerd.services.events.v1.ContainerUpdate.LabelsEntry" - json_name: "labels" - } - field { - name: "snapshot_key" - number: 4 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "snapshotKey" - } - nested_type { - name: "LabelsEntry" - field { - name: "key" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "key" - } - field { - name: "value" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "value" - } - options { - map_entry: true - } - } - } - message_type { - name: "ContainerDelete" - field { - name: "id" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "id" - } - } - options { - go_package: "github.com/containerd/containerd/api/services/events/v1;events" - 63300: 1 - } - syntax: "proto3" -} -file { - name: "github.com/containerd/containerd/api/services/events/v1/content.proto" - package: "containerd.services.events.v1" - dependency: "gogoproto/gogo.proto" - dependency: "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto" - message_type { - name: "ContentDelete" - field { - name: "digest" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - options { - 65003: "github.com/opencontainers/go-digest.Digest" - 65001: 0 - } - json_name: "digest" - } - } - options { - go_package: "github.com/containerd/containerd/api/services/events/v1;events" - 63300: 1 - } - syntax: "proto3" -} file { name: "github.com/containerd/containerd/api/services/events/v1/events.proto" package: "containerd.services.events.v1" @@ -1452,531 +1977,6 @@ file { } syntax: "proto3" } -file { - name: "github.com/containerd/containerd/api/services/events/v1/image.proto" - package: "containerd.services.images.v1" - dependency: "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto" - message_type { - name: "ImageCreate" - field { - name: "name" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "name" - } - field { - name: "labels" - number: 2 - label: LABEL_REPEATED - type: TYPE_MESSAGE - type_name: ".containerd.services.images.v1.ImageCreate.LabelsEntry" - json_name: "labels" - } - nested_type { - name: "LabelsEntry" - field { - name: "key" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "key" - } - field { - name: "value" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "value" - } - options { - map_entry: true - } - } - } - message_type { - name: "ImageUpdate" - field { - name: "name" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "name" - } - field { - name: "labels" - number: 2 - label: LABEL_REPEATED - type: TYPE_MESSAGE - type_name: ".containerd.services.images.v1.ImageUpdate.LabelsEntry" - json_name: "labels" - } - nested_type { - name: "LabelsEntry" - field { - name: "key" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "key" - } - field { - name: "value" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "value" - } - options { - map_entry: true - } - } - } - message_type { - name: "ImageDelete" - field { - name: "name" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "name" - } - } - options { - go_package: "github.com/containerd/containerd/api/services/events/v1;events" - 63300: 1 - } - syntax: "proto3" -} -file { - name: "github.com/containerd/containerd/api/services/events/v1/namespace.proto" - package: "containerd.services.events.v1" - dependency: "gogoproto/gogo.proto" - dependency: "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto" - message_type { - name: "NamespaceCreate" - field { - name: "name" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "name" - } - field { - name: "labels" - number: 2 - label: LABEL_REPEATED - type: TYPE_MESSAGE - type_name: ".containerd.services.events.v1.NamespaceCreate.LabelsEntry" - json_name: "labels" - } - nested_type { - name: "LabelsEntry" - field { - name: "key" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "key" - } - field { - name: "value" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "value" - } - options { - map_entry: true - } - } - } - message_type { - name: "NamespaceUpdate" - field { - name: "name" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "name" - } - field { - name: "labels" - number: 2 - label: LABEL_REPEATED - type: TYPE_MESSAGE - type_name: ".containerd.services.events.v1.NamespaceUpdate.LabelsEntry" - json_name: "labels" - } - nested_type { - name: "LabelsEntry" - field { - name: "key" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "key" - } - field { - name: "value" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "value" - } - options { - map_entry: true - } - } - } - message_type { - name: "NamespaceDelete" - field { - name: "name" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "name" - } - } - options { - go_package: "github.com/containerd/containerd/api/services/events/v1;events" - 63300: 1 - } - syntax: "proto3" -} -file { - name: "github.com/containerd/containerd/api/services/events/v1/snapshot.proto" - package: "containerd.services.events.v1" - dependency: "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto" - message_type { - name: "SnapshotPrepare" - field { - name: "key" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "key" - } - field { - name: "parent" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "parent" - } - } - message_type { - name: "SnapshotCommit" - field { - name: "key" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "key" - } - field { - name: "name" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "name" - } - } - message_type { - name: "SnapshotRemove" - field { - name: "key" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "key" - } - } - options { - go_package: "github.com/containerd/containerd/api/services/events/v1;events" - 63300: 1 - } - syntax: "proto3" -} -file { - name: "github.com/containerd/containerd/api/services/events/v1/task.proto" - package: "containerd.services.events.v1" - dependency: "gogoproto/gogo.proto" - dependency: "google/protobuf/timestamp.proto" - dependency: "github.com/containerd/containerd/api/types/mount.proto" - dependency: "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto" - message_type { - name: "TaskCreate" - field { - name: "container_id" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "containerId" - } - field { - name: "bundle" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "bundle" - } - field { - name: "rootfs" - number: 3 - label: LABEL_REPEATED - type: TYPE_MESSAGE - type_name: ".containerd.types.Mount" - json_name: "rootfs" - } - field { - name: "io" - number: 4 - label: LABEL_OPTIONAL - type: TYPE_MESSAGE - type_name: ".containerd.services.events.v1.TaskIO" - options { - 65004: "IO" - } - json_name: "io" - } - field { - name: "checkpoint" - number: 5 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "checkpoint" - } - field { - name: "pid" - number: 6 - label: LABEL_OPTIONAL - type: TYPE_UINT32 - json_name: "pid" - } - } - message_type { - name: "TaskStart" - field { - name: "container_id" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "containerId" - } - field { - name: "pid" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_UINT32 - json_name: "pid" - } - } - message_type { - name: "TaskDelete" - field { - name: "container_id" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "containerId" - } - field { - name: "pid" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_UINT32 - json_name: "pid" - } - field { - name: "exit_status" - number: 3 - label: LABEL_OPTIONAL - type: TYPE_UINT32 - json_name: "exitStatus" - } - field { - name: "exited_at" - number: 4 - label: LABEL_OPTIONAL - type: TYPE_MESSAGE - type_name: ".google.protobuf.Timestamp" - options { - 65010: 1 - 65001: 0 - } - json_name: "exitedAt" - } - } - message_type { - name: "TaskIO" - field { - name: "stdin" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "stdin" - } - field { - name: "stdout" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "stdout" - } - field { - name: "stderr" - number: 3 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "stderr" - } - field { - name: "terminal" - number: 4 - label: LABEL_OPTIONAL - type: TYPE_BOOL - json_name: "terminal" - } - } - message_type { - name: "TaskExit" - field { - name: "container_id" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "containerId" - } - field { - name: "id" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "id" - } - field { - name: "pid" - number: 3 - label: LABEL_OPTIONAL - type: TYPE_UINT32 - json_name: "pid" - } - field { - name: "exit_status" - number: 4 - label: LABEL_OPTIONAL - type: TYPE_UINT32 - json_name: "exitStatus" - } - field { - name: "exited_at" - number: 5 - label: LABEL_OPTIONAL - type: TYPE_MESSAGE - type_name: ".google.protobuf.Timestamp" - options { - 65010: 1 - 65001: 0 - } - json_name: "exitedAt" - } - } - message_type { - name: "TaskOOM" - field { - name: "container_id" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "containerId" - } - } - message_type { - name: "TaskExecAdded" - field { - name: "container_id" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "containerId" - } - field { - name: "exec_id" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "execId" - } - } - message_type { - name: "TaskExecStarted" - field { - name: "container_id" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "containerId" - } - field { - name: "exec_id" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "execId" - } - field { - name: "pid" - number: 3 - label: LABEL_OPTIONAL - type: TYPE_UINT32 - json_name: "pid" - } - } - message_type { - name: "TaskPaused" - field { - name: "container_id" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "containerId" - } - } - message_type { - name: "TaskResumed" - field { - name: "container_id" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "containerId" - } - } - message_type { - name: "TaskCheckpointed" - field { - name: "container_id" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "containerId" - } - field { - name: "checkpoint" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "checkpoint" - } - } - options { - go_package: "github.com/containerd/containerd/api/services/events/v1;events" - 63300: 1 - } - syntax: "proto3" -} file { name: "github.com/containerd/containerd/api/services/images/v1/images.proto" package: "containerd.services.images.v1" diff --git a/api/services/events/v1/doc.go b/api/services/events/v1/doc.go new file mode 100644 index 000000000..070604bb8 --- /dev/null +++ b/api/services/events/v1/doc.go @@ -0,0 +1,2 @@ +// Package events defines the event pushing and subscription service. +package events diff --git a/api/services/events/v1/events.pb.go b/api/services/events/v1/events.pb.go index bcefb8806..24bda7564 100644 --- a/api/services/events/v1/events.pb.go +++ b/api/services/events/v1/events.pb.go @@ -1,6 +1,18 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: github.com/containerd/containerd/api/services/events/v1/events.proto +/* + Package events is a generated protocol buffer package. + + It is generated from these files: + github.com/containerd/containerd/api/services/events/v1/events.proto + + It has these top-level messages: + PublishRequest + ForwardRequest + SubscribeRequest + Envelope +*/ package events import proto "github.com/gogo/protobuf/proto" @@ -34,6 +46,12 @@ var _ = fmt.Errorf var _ = math.Inf var _ = time.Kitchen +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + type PublishRequest struct { Topic string `protobuf:"bytes,1,opt,name=topic,proto3" json:"topic,omitempty"` Event *google_protobuf1.Any `protobuf:"bytes,2,opt,name=event" json:"event,omitempty"` diff --git a/events/exchange/exchange_test.go b/events/exchange/exchange_test.go index ebe4cbc7e..485843d5c 100644 --- a/events/exchange/exchange_test.go +++ b/events/exchange/exchange_test.go @@ -8,6 +8,7 @@ import ( "testing" "time" + eventstypes "github.com/containerd/containerd/api/events" v1 "github.com/containerd/containerd/api/services/events/v1" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" @@ -19,9 +20,9 @@ import ( func TestExchangeBasic(t *testing.T) { ctx := namespaces.WithNamespace(context.Background(), t.Name()) testevents := []events.Event{ - &v1.ContainerCreate{ID: "asdf"}, - &v1.ContainerCreate{ID: "qwer"}, - &v1.ContainerCreate{ID: "zxcv"}, + &eventstypes.ContainerCreate{ID: "asdf"}, + &eventstypes.ContainerCreate{ID: "qwer"}, + &eventstypes.ContainerCreate{ID: "zxcv"}, } exchange := NewExchange() @@ -80,7 +81,7 @@ func TestExchangeBasic(t *testing.T) { if err != nil { t.Fatal(err) } - received = append(received, ev.(*v1.ContainerCreate)) + received = append(received, ev.(*eventstypes.ContainerCreate)) case err := <-subscriber.errq: if err != nil { t.Fatal(err) @@ -118,7 +119,7 @@ func TestExchangeValidateTopic(t *testing.T) { }, } { t.Run(testcase.input, func(t *testing.T) { - event := &v1.ContainerCreate{ID: t.Name()} + event := &eventstypes.ContainerCreate{ID: t.Name()} if err := exchange.Publish(ctx, testcase.input, event); errors.Cause(err) != testcase.err { if err == nil { t.Fatalf("expected error %v, received nil", testcase.err) diff --git a/linux/process.go b/linux/process.go index 7660ee898..10acc69d5 100644 --- a/linux/process.go +++ b/linux/process.go @@ -5,7 +5,7 @@ package linux import ( "context" - eventsapi "github.com/containerd/containerd/api/services/events/v1" + eventstypes "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/api/types/task" "github.com/containerd/containerd/errdefs" shim "github.com/containerd/containerd/linux/shim/v1" @@ -103,7 +103,7 @@ func (p *Process) Start(ctx context.Context) error { if err != nil { return errdefs.FromGRPC(err) } - p.t.events.Publish(ctx, runtime.TaskExecStartedEventTopic, &eventsapi.TaskExecStarted{ + p.t.events.Publish(ctx, runtime.TaskExecStartedEventTopic, &eventstypes.TaskExecStarted{ ContainerID: p.t.id, Pid: r.Pid, ExecID: p.id, diff --git a/linux/runtime.go b/linux/runtime.go index af07a6001..77a8fb664 100644 --- a/linux/runtime.go +++ b/linux/runtime.go @@ -11,7 +11,7 @@ import ( "time" "github.com/boltdb/bolt" - eventsapi "github.com/containerd/containerd/api/services/events/v1" + eventstypes "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/api/types" "github.com/containerd/containerd/containers" "github.com/containerd/containerd/errdefs" @@ -286,11 +286,11 @@ func (r *Runtime) Create(ctx context.Context, id string, opts runtime.CreateOpts return nil, err } } - r.events.Publish(ctx, runtime.TaskCreateEventTopic, &eventsapi.TaskCreate{ + r.events.Publish(ctx, runtime.TaskCreateEventTopic, &eventstypes.TaskCreate{ ContainerID: sopts.ID, Bundle: sopts.Bundle, Rootfs: sopts.Rootfs, - IO: &eventsapi.TaskIO{ + IO: &eventstypes.TaskIO{ Stdin: sopts.Stdin, Stdout: sopts.Stdout, Stderr: sopts.Stderr, @@ -337,7 +337,7 @@ func (r *Runtime) Delete(ctx context.Context, c runtime.Task) (*runtime.Exit, er if err := bundle.Delete(); err != nil { log.G(ctx).WithError(err).Error("failed to delete bundle") } - r.events.Publish(ctx, runtime.TaskDeleteEventTopic, &eventsapi.TaskDelete{ + r.events.Publish(ctx, runtime.TaskDeleteEventTopic, &eventstypes.TaskDelete{ ContainerID: lc.id, ExitStatus: rsp.ExitStatus, ExitedAt: rsp.ExitedAt, @@ -452,7 +452,7 @@ func (r *Runtime) cleanupAfterDeadShim(ctx context.Context, bundle *bundle, ns, // Notify Client exitedAt := time.Now().UTC() - r.events.Publish(ctx, runtime.TaskExitEventTopic, &eventsapi.TaskExit{ + r.events.Publish(ctx, runtime.TaskExitEventTopic, &eventstypes.TaskExit{ ContainerID: id, ID: id, Pid: uint32(pid), @@ -464,7 +464,7 @@ func (r *Runtime) cleanupAfterDeadShim(ctx context.Context, bundle *bundle, ns, log.G(ctx).WithError(err).Error("delete bundle") } - r.events.Publish(ctx, runtime.TaskDeleteEventTopic, &eventsapi.TaskDelete{ + r.events.Publish(ctx, runtime.TaskDeleteEventTopic, &eventstypes.TaskDelete{ ContainerID: id, Pid: uint32(pid), ExitStatus: 128 + uint32(unix.SIGKILL), diff --git a/linux/shim/service.go b/linux/shim/service.go index 566811dee..763a96db5 100644 --- a/linux/shim/service.go +++ b/linux/shim/service.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/codes" "github.com/containerd/console" - eventsapi "github.com/containerd/containerd/api/services/events/v1" + eventstypes "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/api/types/task" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" @@ -447,7 +447,7 @@ func (s *Service) checkProcesses(e runc.Exit) { } } p.SetExited(e.Status) - s.events <- &eventsapi.TaskExit{ + s.events <- &eventstypes.TaskExit{ ContainerID: s.id, ID: p.ID(), Pid: uint32(e.Pid), @@ -488,25 +488,25 @@ func (s *Service) forward(publisher events.Publisher) { func getTopic(ctx context.Context, e interface{}) string { switch e.(type) { - case *eventsapi.TaskCreate: + case *eventstypes.TaskCreate: return runtime.TaskCreateEventTopic - case *eventsapi.TaskStart: + case *eventstypes.TaskStart: return runtime.TaskStartEventTopic - case *eventsapi.TaskOOM: + case *eventstypes.TaskOOM: return runtime.TaskOOMEventTopic - case *eventsapi.TaskExit: + case *eventstypes.TaskExit: return runtime.TaskExitEventTopic - case *eventsapi.TaskDelete: + case *eventstypes.TaskDelete: return runtime.TaskDeleteEventTopic - case *eventsapi.TaskExecAdded: + case *eventstypes.TaskExecAdded: return runtime.TaskExecAddedEventTopic - case *eventsapi.TaskExecStarted: + case *eventstypes.TaskExecStarted: return runtime.TaskExecStartedEventTopic - case *eventsapi.TaskPaused: + case *eventstypes.TaskPaused: return runtime.TaskPausedEventTopic - case *eventsapi.TaskResumed: + case *eventstypes.TaskResumed: return runtime.TaskResumedEventTopic - case *eventsapi.TaskCheckpointed: + case *eventstypes.TaskCheckpointed: return runtime.TaskCheckpointedEventTopic default: logrus.Warnf("no topic for type %#v", e) diff --git a/linux/task.go b/linux/task.go index d708cdb84..4a915fcc9 100644 --- a/linux/task.go +++ b/linux/task.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc" "github.com/containerd/cgroups" - eventsapi "github.com/containerd/containerd/api/services/events/v1" + eventstypes "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/api/types/task" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events/exchange" @@ -90,7 +90,7 @@ func (t *Task) Start(ctx context.Context) error { return err } } - t.events.Publish(ctx, runtime.TaskStartEventTopic, &eventsapi.TaskStart{ + t.events.Publish(ctx, runtime.TaskStartEventTopic, &eventstypes.TaskStart{ ContainerID: t.id, Pid: uint32(t.pid), }) @@ -138,7 +138,7 @@ func (t *Task) Pause(ctx context.Context) error { if _, err := t.shim.Pause(ctx, empty); err != nil { return errdefs.FromGRPC(err) } - t.events.Publish(ctx, runtime.TaskPausedEventTopic, &eventsapi.TaskPaused{ + t.events.Publish(ctx, runtime.TaskPausedEventTopic, &eventstypes.TaskPaused{ ContainerID: t.id, }) return nil @@ -149,7 +149,7 @@ func (t *Task) Resume(ctx context.Context) error { if _, err := t.shim.Resume(ctx, empty); err != nil { return errdefs.FromGRPC(err) } - t.events.Publish(ctx, runtime.TaskResumedEventTopic, &eventsapi.TaskResumed{ + t.events.Publish(ctx, runtime.TaskResumedEventTopic, &eventstypes.TaskResumed{ ContainerID: t.id, }) return nil @@ -243,7 +243,7 @@ func (t *Task) Checkpoint(ctx context.Context, path string, options *types.Any) if _, err := t.shim.Checkpoint(ctx, r); err != nil { return errdefs.FromGRPC(err) } - t.events.Publish(ctx, runtime.TaskCheckpointedEventTopic, &eventsapi.TaskCheckpointed{ + t.events.Publish(ctx, runtime.TaskCheckpointedEventTopic, &eventstypes.TaskCheckpointed{ ContainerID: t.id, }) return nil diff --git a/metrics/cgroups/cgroups.go b/metrics/cgroups/cgroups.go index dda6b2517..2d843040b 100644 --- a/metrics/cgroups/cgroups.go +++ b/metrics/cgroups/cgroups.go @@ -4,7 +4,7 @@ package cgroups import ( "github.com/containerd/cgroups" - eventsapi "github.com/containerd/containerd/api/services/events/v1" + eventstypes "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/events" "github.com/containerd/containerd/linux" "github.com/containerd/containerd/log" @@ -91,7 +91,7 @@ func (m *cgroupsMonitor) Stop(c runtime.Task) error { func (m *cgroupsMonitor) trigger(id, namespace string, cg cgroups.Cgroup) { ctx := namespaces.WithNamespace(m.context, namespace) - if err := m.publisher.Publish(ctx, runtime.TaskOOMEventTopic, &eventsapi.TaskOOM{ + if err := m.publisher.Publish(ctx, runtime.TaskOOMEventTopic, &eventstypes.TaskOOM{ ContainerID: id, }); err != nil { log.G(m.context).WithError(err).Error("post OOM event") diff --git a/services/containers/service.go b/services/containers/service.go index 81af3f169..45db310cf 100644 --- a/services/containers/service.go +++ b/services/containers/service.go @@ -2,8 +2,8 @@ package containers import ( "github.com/boltdb/bolt" + eventstypes "github.com/containerd/containerd/api/events" api "github.com/containerd/containerd/api/services/containers/v1" - eventsapi "github.com/containerd/containerd/api/services/events/v1" "github.com/containerd/containerd/containers" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" @@ -95,10 +95,10 @@ func (s *service) Create(ctx context.Context, req *api.CreateContainerRequest) ( }); err != nil { return &resp, errdefs.ToGRPC(err) } - if err := s.publisher.Publish(ctx, "/containers/create", &eventsapi.ContainerCreate{ + if err := s.publisher.Publish(ctx, "/containers/create", &eventstypes.ContainerCreate{ ID: resp.Container.ID, Image: resp.Container.Image, - Runtime: &eventsapi.ContainerCreate_Runtime{ + Runtime: &eventstypes.ContainerCreate_Runtime{ Name: resp.Container.Runtime.Name, Options: resp.Container.Runtime.Options, }, @@ -137,7 +137,7 @@ func (s *service) Update(ctx context.Context, req *api.UpdateContainerRequest) ( return &resp, errdefs.ToGRPC(err) } - if err := s.publisher.Publish(ctx, "/containers/update", &eventsapi.ContainerUpdate{ + if err := s.publisher.Publish(ctx, "/containers/update", &eventstypes.ContainerUpdate{ ID: resp.Container.ID, Image: resp.Container.Image, Labels: resp.Container.Labels, @@ -156,7 +156,7 @@ func (s *service) Delete(ctx context.Context, req *api.DeleteContainerRequest) ( return &empty.Empty{}, errdefs.ToGRPC(err) } - if err := s.publisher.Publish(ctx, "/containers/delete", &eventsapi.ContainerDelete{ + if err := s.publisher.Publish(ctx, "/containers/delete", &eventstypes.ContainerDelete{ ID: req.ID, }); err != nil { return &empty.Empty{}, err diff --git a/services/content/service.go b/services/content/service.go index 3784579d5..e8d3b2ff2 100644 --- a/services/content/service.go +++ b/services/content/service.go @@ -4,8 +4,8 @@ import ( "io" "sync" + eventstypes "github.com/containerd/containerd/api/events" api "github.com/containerd/containerd/api/services/content/v1" - eventsapi "github.com/containerd/containerd/api/services/events/v1" "github.com/containerd/containerd/content" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" @@ -147,7 +147,7 @@ func (s *service) Delete(ctx context.Context, req *api.DeleteContentRequest) (*e return nil, errdefs.ToGRPC(err) } - if err := s.publisher.Publish(ctx, "/content/delete", &eventsapi.ContentDelete{ + if err := s.publisher.Publish(ctx, "/content/delete", &eventstypes.ContentDelete{ Digest: req.Digest, }); err != nil { return nil, err diff --git a/services/images/service.go b/services/images/service.go index 3843df554..751c1fc81 100644 --- a/services/images/service.go +++ b/services/images/service.go @@ -2,7 +2,7 @@ package images import ( "github.com/boltdb/bolt" - eventsapi "github.com/containerd/containerd/api/services/events/v1" + eventstypes "github.com/containerd/containerd/api/events" imagesapi "github.com/containerd/containerd/api/services/images/v1" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" @@ -101,7 +101,7 @@ func (s *service) Create(ctx context.Context, req *imagesapi.CreateImageRequest) return nil, errdefs.ToGRPC(err) } - if err := s.publisher.Publish(ctx, "/images/create", &eventsapi.ImageCreate{ + if err := s.publisher.Publish(ctx, "/images/create", &eventstypes.ImageCreate{ Name: resp.Image.Name, Labels: resp.Image.Labels, }); err != nil { @@ -140,7 +140,7 @@ func (s *service) Update(ctx context.Context, req *imagesapi.UpdateImageRequest) return nil, errdefs.ToGRPC(err) } - if err := s.publisher.Publish(ctx, "/images/update", &eventsapi.ImageUpdate{ + if err := s.publisher.Publish(ctx, "/images/update", &eventstypes.ImageUpdate{ Name: resp.Image.Name, Labels: resp.Image.Labels, }); err != nil { @@ -157,7 +157,7 @@ func (s *service) Delete(ctx context.Context, req *imagesapi.DeleteImageRequest) return nil, err } - if err := s.publisher.Publish(ctx, "/images/delete", &eventsapi.ImageDelete{ + if err := s.publisher.Publish(ctx, "/images/delete", &eventstypes.ImageDelete{ Name: req.Name, }); err != nil { return nil, err diff --git a/services/namespaces/service.go b/services/namespaces/service.go index b795ab52f..cbb9468fd 100644 --- a/services/namespaces/service.go +++ b/services/namespaces/service.go @@ -4,7 +4,7 @@ import ( "strings" "github.com/boltdb/bolt" - eventsapi "github.com/containerd/containerd/api/services/events/v1" + eventstypes "github.com/containerd/containerd/api/events" api "github.com/containerd/containerd/api/services/namespaces/v1" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" @@ -119,7 +119,7 @@ func (s *service) Create(ctx context.Context, req *api.CreateNamespaceRequest) ( return &resp, err } - if err := s.publisher.Publish(ctx, "/namespaces/create", &eventsapi.NamespaceCreate{ + if err := s.publisher.Publish(ctx, "/namespaces/create", &eventstypes.NamespaceCreate{ Name: req.Namespace.Name, Labels: req.Namespace.Labels, }); err != nil { @@ -172,7 +172,7 @@ func (s *service) Update(ctx context.Context, req *api.UpdateNamespaceRequest) ( return &resp, err } - if err := s.publisher.Publish(ctx, "/namespaces/update", &eventsapi.NamespaceUpdate{ + if err := s.publisher.Publish(ctx, "/namespaces/update", &eventstypes.NamespaceUpdate{ Name: req.Namespace.Name, Labels: req.Namespace.Labels, }); err != nil { @@ -190,7 +190,7 @@ func (s *service) Delete(ctx context.Context, req *api.DeleteNamespaceRequest) ( } // set the namespace in the context before publishing the event ctx = namespaces.WithNamespace(ctx, req.Name) - if err := s.publisher.Publish(ctx, "/namespaces/delete", &eventsapi.NamespaceDelete{ + if err := s.publisher.Publish(ctx, "/namespaces/delete", &eventstypes.NamespaceDelete{ Name: req.Name, }); err != nil { return &empty.Empty{}, err diff --git a/services/snapshot/service.go b/services/snapshot/service.go index 716b4c42c..3bf3e04fc 100644 --- a/services/snapshot/service.go +++ b/services/snapshot/service.go @@ -3,7 +3,7 @@ package snapshot import ( gocontext "context" - eventsapi "github.com/containerd/containerd/api/services/events/v1" + eventstypes "github.com/containerd/containerd/api/events" snapshotapi "github.com/containerd/containerd/api/services/snapshot/v1" "github.com/containerd/containerd/api/types" "github.com/containerd/containerd/errdefs" @@ -81,7 +81,7 @@ func (s *service) Prepare(ctx context.Context, pr *snapshotapi.PrepareSnapshotRe return nil, errdefs.ToGRPC(err) } - if err := s.publisher.Publish(ctx, "/snapshot/prepare", &eventsapi.SnapshotPrepare{ + if err := s.publisher.Publish(ctx, "/snapshot/prepare", &eventstypes.SnapshotPrepare{ Key: pr.Key, Parent: pr.Parent, }); err != nil { @@ -142,7 +142,7 @@ func (s *service) Commit(ctx context.Context, cr *snapshotapi.CommitSnapshotRequ return nil, errdefs.ToGRPC(err) } - if err := s.publisher.Publish(ctx, "/snapshot/commit", &eventsapi.SnapshotCommit{ + if err := s.publisher.Publish(ctx, "/snapshot/commit", &eventstypes.SnapshotCommit{ Key: cr.Key, Name: cr.Name, }); err != nil { @@ -162,7 +162,7 @@ func (s *service) Remove(ctx context.Context, rr *snapshotapi.RemoveSnapshotRequ return nil, errdefs.ToGRPC(err) } - if err := s.publisher.Publish(ctx, "/snapshot/remove", &eventsapi.SnapshotRemove{ + if err := s.publisher.Publish(ctx, "/snapshot/remove", &eventstypes.SnapshotRemove{ Key: rr.Key, }); err != nil { return nil, err diff --git a/windows/process.go b/windows/process.go index 816ef1121..2ad0711c9 100644 --- a/windows/process.go +++ b/windows/process.go @@ -10,7 +10,7 @@ import ( "time" "github.com/Microsoft/hcsshim" - eventsapi "github.com/containerd/containerd/api/services/events/v1" + eventstypes "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/runtime" @@ -186,7 +186,7 @@ func (p *process) Start(ctx context.Context) (err error) { p.task.publisher.Publish(ctx, runtime.TaskExitEventTopic, - &eventsapi.TaskExit{ + &eventstypes.TaskExit{ ContainerID: p.task.id, ID: p.id, Pid: p.pid, diff --git a/windows/runtime.go b/windows/runtime.go index e6553fac8..fd26b270c 100644 --- a/windows/runtime.go +++ b/windows/runtime.go @@ -11,7 +11,7 @@ import ( "github.com/Microsoft/hcsshim" "github.com/boltdb/bolt" - eventsapi "github.com/containerd/containerd/api/services/events/v1" + eventstypes "github.com/containerd/containerd/api/events" containerdtypes "github.com/containerd/containerd/api/types" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" @@ -198,7 +198,7 @@ func (r *windowsRuntime) Delete(ctx context.Context, t runtime.Task) (*runtime.E r.publisher.Publish(ctx, runtime.TaskDeleteEventTopic, - &eventsapi.TaskDelete{ + &eventstypes.TaskDelete{ ContainerID: wt.id, Pid: wt.pid, ExitStatus: rtExit.Status, @@ -322,9 +322,9 @@ func (r *windowsRuntime) newTask(ctx context.Context, namespace, id string, spec r.publisher.Publish(ctx, runtime.TaskCreateEventTopic, - &eventsapi.TaskCreate{ + &eventstypes.TaskCreate{ ContainerID: id, - IO: &eventsapi.TaskIO{ + IO: &eventstypes.TaskIO{ Stdin: io.Stdin, Stdout: io.Stdout, Stderr: io.Stderr, diff --git a/windows/task.go b/windows/task.go index 492d03674..89bce1694 100644 --- a/windows/task.go +++ b/windows/task.go @@ -8,7 +8,7 @@ import ( "time" "github.com/Microsoft/hcsshim" - eventsapi "github.com/containerd/containerd/api/services/events/v1" + eventstypes "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/runtime" @@ -126,7 +126,7 @@ func (t *task) Start(ctx context.Context) error { } t.publisher.Publish(ctx, runtime.TaskStartEventTopic, - &eventsapi.TaskStart{ + &eventstypes.TaskStart{ ContainerID: t.id, Pid: t.pid, }) @@ -143,7 +143,7 @@ func (t *task) Pause(ctx context.Context) error { t.publisher.Publish(ctx, runtime.TaskPausedEventTopic, - &eventsapi.TaskPaused{ + &eventstypes.TaskPaused{ ContainerID: t.id, }) return nil @@ -164,7 +164,7 @@ func (t *task) Resume(ctx context.Context) error { t.publisher.Publish(ctx, runtime.TaskResumedEventTopic, - &eventsapi.TaskResumed{ + &eventstypes.TaskResumed{ ContainerID: t.id, }) return nil @@ -206,7 +206,7 @@ func (t *task) Exec(ctx context.Context, id string, opts runtime.ExecOpts) (runt t.publisher.Publish(ctx, runtime.TaskExecAddedEventTopic, - &eventsapi.TaskExecAdded{ + &eventstypes.TaskExecAdded{ ContainerID: t.id, ExecID: id, })