github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

api/events: split event types from events service

Browse Source 
To avoid importing all of grpc when consuming events, the types of
events have been split in to a separate package. This should allow a
reduction in memory usage in cases where a package is consuming events
but not using the gprc service directly.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
Stephen J Day 2017-11-16 12:46:35 -08:00
parent f49b1b7179
commit 09b5ca1072
No known key found for this signature in database
GPG Key ID: 67B3DED84EDC823F
31 changed files with 1038 additions and 1020 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Protobuild.toml
View File

@ -30,6 +30,11 @@ plugins = ["grpc", "fieldpath"]
"google/protobuf/duration.proto" = "github.com/gogo/protobuf/types" "google/protobuf/duration.proto" = "github.com/gogo/protobuf/types"
"google/rpc/status.proto" = "github.com/containerd/containerd/protobuf/google/rpc" "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. # Aggregrate the API descriptors to lock down API changes.
[[descriptors]] [[descriptors]]
prefix = "github.com/containerd/containerd/api" prefix = "github.com/containerd/containerd/api"

84
api/services/events/v1/container.pb.go → api/events/container.pb.go
View File

@ -1,27 +1,22 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT. // 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. Package events is a generated protocol buffer package.
It is generated from these files: It is generated from these files:
github.com/containerd/containerd/api/services/events/v1/container.proto github.com/containerd/containerd/api/events/container.proto
github.com/containerd/containerd/api/services/events/v1/content.proto github.com/containerd/containerd/api/events/content.proto
github.com/containerd/containerd/api/services/events/v1/events.proto github.com/containerd/containerd/api/events/image.proto
github.com/containerd/containerd/api/services/events/v1/image.proto github.com/containerd/containerd/api/events/namespace.proto
github.com/containerd/containerd/api/services/events/v1/namespace.proto github.com/containerd/containerd/api/events/snapshot.proto
github.com/containerd/containerd/api/services/events/v1/snapshot.proto github.com/containerd/containerd/api/events/task.proto
github.com/containerd/containerd/api/services/events/v1/task.proto
It has these top-level messages: It has these top-level messages:
ContainerCreate ContainerCreate
ContainerUpdate ContainerUpdate
ContainerDelete ContainerDelete
ContentDelete ContentDelete
PublishRequest
ForwardRequest
SubscribeRequest
Envelope
ImageCreate ImageCreate
ImageUpdate ImageUpdate
ImageDelete ImageDelete
@ -112,10 +107,10 @@ func (*ContainerDelete) ProtoMessage() {}
func (*ContainerDelete) Descriptor() ([]byte, []int) { return fileDescriptorContainer, []int{2} } func (*ContainerDelete) Descriptor() ([]byte, []int) { return fileDescriptorContainer, []int{2} }
func init() { func init() {
proto.RegisterType((*ContainerCreate)(nil), "containerd.services.events.v1.ContainerCreate") proto.RegisterType((*ContainerCreate)(nil), "containerd.events.ContainerCreate")
proto.RegisterType((*ContainerCreate_Runtime)(nil), "containerd.services.events.v1.ContainerCreate.Runtime") proto.RegisterType((*ContainerCreate_Runtime)(nil), "containerd.events.ContainerCreate.Runtime")
proto.RegisterType((*ContainerUpdate)(nil), "containerd.services.events.v1.ContainerUpdate") proto.RegisterType((*ContainerUpdate)(nil), "containerd.events.ContainerUpdate")
proto.RegisterType((*ContainerDelete)(nil), "containerd.services.events.v1.ContainerDelete") proto.RegisterType((*ContainerDelete)(nil), "containerd.events.ContainerDelete")
} }
// Field returns the value for the given fieldpath as a string, if defined. // Field returns the value for the given fieldpath as a string, if defined.
@ -1210,36 +1205,35 @@ var (
) )
func init() { 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{ var fileDescriptorContainer = []byte{
// 427 bytes of a gzipped FileDescriptorProto // 411 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x52, 0x5d, 0x8b, 0xd4, 0x30, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xcf, 0xaa, 0xd3, 0x40,
0x14, 0xdd, 0x74, 0xd6, 0x19, 0x4c, 0x05, 0x25, 0x0c, 0x52, 0x07, 0xac, 0xe3, 0x3c, 0x8d, 0x2f, 0x14, 0xc6, 0x3b, 0x49, 0x6d, 0x71, 0x22, 0xa8, 0x43, 0x91, 0x98, 0x45, 0xac, 0x5d, 0x55, 0x17,
0x09, 0x3b, 0x82, 0xe8, 0x0a, 0xa2, 0xbb, 0x2b, 0x22, 0x2a, 0x48, 0xc0, 0x17, 0x11, 0x24, 0x9d, 0x13, 0x88, 0x1b, 0xb5, 0x1b, 0x6d, 0xab, 0x20, 0x2a, 0x48, 0xc0, 0x8d, 0x1b, 0x99, 0x34, 0xd3,
0xde, 0xed, 0x04, 0xdb, 0xa4, 0xb4, 0x69, 0xa1, 0x6f, 0xfe, 0x14, 0x7f, 0xce, 0x3e, 0xfa, 0xe8, 0x74, 0x30, 0x99, 0x09, 0xc9, 0xa4, 0x90, 0x9d, 0x8f, 0xe2, 0xe3, 0x74, 0xe9, 0xc2, 0x85, 0x2b,
0x93, 0xec, 0xf6, 0x1f, 0x08, 0xfe, 0x00, 0x69, 0x32, 0xdd, 0x2d, 0x82, 0x9f, 0x6f, 0xe7, 0xe6, 0xb1, 0x01, 0xdf, 0xc0, 0x07, 0x90, 0xcc, 0x34, 0x6d, 0xf0, 0x72, 0xef, 0xa5, 0xab, 0x9c, 0x3f,
0x9e, 0x73, 0xef, 0x39, 0xb7, 0xc5, 0xcf, 0x12, 0x69, 0x36, 0x55, 0x44, 0xd7, 0x3a, 0x63, 0x6b, 0xdf, 0x97, 0x73, 0x7e, 0x87, 0x81, 0xb3, 0x98, 0xc9, 0x4d, 0x19, 0xe2, 0x95, 0x48, 0xbd, 0x95,
0xad, 0x8c, 0x90, 0x0a, 0x8a, 0x78, 0x08, 0x45, 0x2e, 0x59, 0x09, 0x45, 0x2d, 0xd7, 0x50, 0x32, 0xe0, 0x92, 0x30, 0x4e, 0xf3, 0xa8, 0x1b, 0x92, 0x8c, 0x79, 0x74, 0x4b, 0xb9, 0x2c, 0x4e, 0x55,
0xa8, 0x41, 0x99, 0x92, 0xd5, 0x7b, 0x17, 0x0c, 0x9a, 0x17, 0xda, 0x68, 0x72, 0xf3, 0x42, 0x42, 0x9c, 0xe5, 0x42, 0x0a, 0x74, 0xf7, 0x24, 0xc3, 0x5a, 0xe2, 0x8c, 0x62, 0x11, 0x0b, 0xd5, 0xf5,
0x7b, 0x3a, 0x75, 0x74, 0x5a, 0xef, 0xcd, 0xa6, 0x89, 0x4e, 0xb4, 0x65, 0xb2, 0x0e, 0x39, 0xd1, 0x9a, 0x48, 0x0b, 0x9d, 0xfb, 0xb1, 0x10, 0x71, 0x42, 0x3d, 0x95, 0x85, 0xe5, 0xda, 0x23, 0xbc,
0xec, 0x46, 0xa2, 0x75, 0x92, 0x02, 0xb3, 0x55, 0x54, 0x1d, 0x33, 0xa1, 0x9a, 0x6d, 0xeb, 0xf1, 0x3a, 0xb4, 0x5e, 0x5c, 0xbb, 0xc0, 0xd1, 0x94, 0x25, 0x65, 0xcc, 0xb8, 0xb7, 0x66, 0x34, 0x89,
0x1f, 0x8d, 0x9d, 0x8b, 0xf2, 0xb4, 0x4a, 0xa4, 0x62, 0xc7, 0x12, 0xd2, 0x38, 0x17, 0x66, 0xe3, 0x32, 0x22, 0x37, 0xfa, 0x0f, 0x93, 0x1f, 0x00, 0xde, 0x5e, 0xb4, 0xf2, 0x45, 0x4e, 0x89, 0xa4,
0x26, 0x2c, 0x4e, 0x11, 0xbe, 0x7a, 0xd8, 0xd3, 0x0f, 0x0b, 0x10, 0x06, 0xc8, 0x75, 0xec, 0xc9, 0xe8, 0x1e, 0x34, 0x58, 0x64, 0x83, 0x31, 0x98, 0xde, 0x9c, 0x0f, 0xea, 0x5f, 0x0f, 0x8c, 0x37,
0x38, 0x40, 0x73, 0xb4, 0xbc, 0x7c, 0x30, 0x6e, 0xbf, 0xde, 0xf2, 0x9e, 0x1f, 0x71, 0x4f, 0xc6, 0xcb, 0xc0, 0x60, 0x11, 0x1a, 0xc1, 0x1b, 0x2c, 0x25, 0x31, 0xb5, 0x8d, 0xa6, 0x15, 0xe8, 0x04,
0x64, 0x8a, 0x2f, 0xc9, 0x4c, 0x24, 0x10, 0x78, 0x5d, 0x8b, 0xbb, 0x82, 0xbc, 0xc6, 0x93, 0xa2, 0x2d, 0xe1, 0x30, 0x2f, 0xb9, 0x64, 0x29, 0xb5, 0xcd, 0x31, 0x98, 0x5a, 0xfe, 0x63, 0x7c, 0x81,
0x52, 0x46, 0x66, 0x10, 0x8c, 0xe6, 0x68, 0xe9, 0xaf, 0xee, 0xd1, 0xdf, 0xa6, 0xa4, 0x3f, 0xad, 0x0c, 0xff, 0x37, 0x02, 0x07, 0xda, 0x11, 0xb4, 0x56, 0xe7, 0x3d, 0x1c, 0x1e, 0x6a, 0x08, 0xc1,
0xa3, 0xdc, 0xa9, 0x79, 0x3f, 0x66, 0xf6, 0x0a, 0x4f, 0xb6, 0x6f, 0x84, 0xe0, 0x5d, 0x25, 0x32, 0x3e, 0x27, 0x29, 0xd5, 0x0b, 0x04, 0x2a, 0x46, 0x18, 0x0e, 0x45, 0x26, 0x99, 0xe0, 0x85, 0x1a,
0x70, 0x66, 0xb8, 0xc5, 0x84, 0xe2, 0x89, 0xce, 0x8d, 0xd4, 0xaa, 0xb4, 0x46, 0xfc, 0xd5, 0x94, 0x6e, 0xf9, 0x23, 0xac, 0xaf, 0x82, 0x5b, 0x40, 0xfc, 0x92, 0x57, 0x41, 0x2b, 0x9a, 0xfc, 0xe9,
0xba, 0x0b, 0xd1, 0x3e, 0x2c, 0x7d, 0xa2, 0x1a, 0xde, 0x93, 0x16, 0xdf, 0x86, 0x11, 0xdf, 0xe4, 0x62, 0x7d, 0xcc, 0xa2, 0xf3, 0xb1, 0x5e, 0xc3, 0x41, 0x42, 0x42, 0x9a, 0x14, 0xb6, 0x39, 0x36,
0xf1, 0xbf, 0x47, 0xe4, 0x78, 0x9c, 0x8a, 0x08, 0xd2, 0x32, 0x18, 0xcd, 0x47, 0x4b, 0x7f, 0xb5, 0xa7, 0x96, 0x8f, 0xaf, 0xa2, 0xd2, 0x13, 0xf0, 0x3b, 0x65, 0x78, 0xc5, 0x65, 0x5e, 0x05, 0x07,
0xff, 0xb7, 0x09, 0xdd, 0x36, 0xfa, 0xd2, 0x8a, 0x9f, 0x2a, 0x53, 0x34, 0x7c, 0x3b, 0x89, 0xdc, 0x37, 0x7a, 0x08, 0x6f, 0x15, 0x9c, 0x64, 0xc5, 0x46, 0xc8, 0xcf, 0x5f, 0x68, 0x65, 0xf7, 0xd5,
0xc6, 0x57, 0x4a, 0x25, 0xf2, 0x72, 0xa3, 0xcd, 0xfb, 0x0f, 0xd0, 0x04, 0xbb, 0x76, 0xa1, 0xdf, 0x10, 0xab, 0xad, 0xbd, 0xa5, 0x95, 0xf3, 0x0c, 0x5a, 0x1d, 0x27, 0xba, 0x03, 0xcd, 0x46, 0xa8,
0xbf, 0xbd, 0x80, 0x66, 0xf6, 0x00, 0xfb, 0x03, 0x25, 0xb9, 0x86, 0x47, 0x1d, 0xd1, 0x9d, 0xa2, 0xf1, 0x9b, 0xb0, 0xd9, 0x70, 0x4b, 0x92, 0xf2, 0xb8, 0xa1, 0x4a, 0x9e, 0x1b, 0x4f, 0xc1, 0xe4,
0x83, 0x9d, 0xdb, 0x5a, 0xa4, 0xd5, 0xb9, 0x5b, 0x5b, 0xec, 0x7b, 0xf7, 0xd1, 0xe2, 0xce, 0x20, 0x51, 0x07, 0x73, 0x49, 0x13, 0x7a, 0x39, 0xe6, 0xfc, 0xc3, 0x6e, 0xef, 0xf6, 0x7e, 0xee, 0xdd,
0xf2, 0x11, 0xa4, 0xf0, 0xeb, 0xc8, 0x07, 0xef, 0x4e, 0xce, 0xc2, 0x9d, 0x2f, 0x67, 0xe1, 0xce, 0xde, 0xd7, 0xda, 0x05, 0xbb, 0xda, 0x05, 0xdf, 0x6b, 0x17, 0xfc, 0xae, 0x5d, 0xf0, 0xed, 0xaf,
0xc7, 0x36, 0x44, 0x27, 0x6d, 0x88, 0x3e, 0xb7, 0x21, 0x3a, 0x6d, 0x43, 0xf4, 0xe9, 0x7b, 0x88, 0x0b, 0x3e, 0xf9, 0x67, 0x3c, 0xe5, 0x99, 0xfe, 0x84, 0x03, 0x75, 0xfb, 0x27, 0xff, 0x02, 0x00,
0xde, 0x3e, 0xfa, 0xcf, 0x5f, 0xff, 0xa1, 0x43, 0xd1, 0xd8, 0x7e, 0x93, 0xbb, 0x3f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xc4, 0x03, 0x7d, 0xc8, 0x07, 0x03, 0x00, 0x00,
0x00, 0xff, 0xff, 0x26, 0x0d, 0x55, 0x1c, 0x43, 0x03, 0x00, 0x00,
} }

4
api/services/events/v1/container.proto → api/events/container.proto
View File

@ -1,12 +1,12 @@
syntax = "proto3"; syntax = "proto3";
package containerd.services.events.v1; package containerd.events;
import "gogoproto/gogo.proto"; import "gogoproto/gogo.proto";
import "google/protobuf/any.proto"; import "google/protobuf/any.proto";
import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
option go_package = "github.com/containerd/containerd/api/services/events/v1;events"; option go_package = "github.com/containerd/containerd/api/events;events";
option (containerd.plugin.fieldpath_all) = true; option (containerd.plugin.fieldpath_all) = true;
message ContainerCreate { message ContainerCreate {

36
api/services/events/v1/content.pb.go → api/events/content.pb.go
View File

@ -1,5 +1,5 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT. // 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 package events
@ -30,7 +30,7 @@ func (*ContentDelete) ProtoMessage() {}
func (*ContentDelete) Descriptor() ([]byte, []int) { return fileDescriptorContent, []int{0} } func (*ContentDelete) Descriptor() ([]byte, []int) { return fileDescriptorContent, []int{0} }
func init() { 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. // Field returns the value for the given fieldpath as a string, if defined.
@ -305,25 +305,23 @@ var (
) )
func init() { 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{ var fileDescriptorContent = []byte{
// 242 bytes of a gzipped FileDescriptorProto // 224 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x4d, 0xcf, 0x2c, 0xc9, 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, 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, 0x4a, 0x41, 0x66, 0x26, 0x16, 0x64, 0xea, 0xa7, 0x96, 0xa5, 0xe6, 0x95, 0x14, 0x83, 0x45, 0x53,
0xa7, 0x96, 0xa5, 0xe6, 0x95, 0x14, 0xeb, 0x97, 0x19, 0x82, 0x55, 0xa4, 0xe6, 0x95, 0xe8, 0x15, 0xf3, 0x4a, 0xf4, 0x0a, 0x8a, 0xf2, 0x4b, 0xf2, 0x85, 0x04, 0x11, 0x8a, 0xf4, 0x20, 0x0a, 0xa4,
0x14, 0xe5, 0x97, 0xe4, 0x0b, 0xc9, 0x22, 0x34, 0xe8, 0xc1, 0x14, 0xeb, 0x41, 0x14, 0xeb, 0x95, 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0xb2, 0xfa, 0x20, 0x16, 0x44, 0xa1, 0x94, 0x03, 0x41, 0x3b,
0x19, 0x4a, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x55, 0xea, 0x83, 0x58, 0x10, 0x4d, 0x52, 0x0e, 0xc0, 0xea, 0x92, 0x4a, 0xd3, 0xf4, 0x0b, 0x72, 0x4a, 0xd3, 0x33, 0xf3, 0xf4, 0xd3, 0x32, 0x53,
0x04, 0xed, 0x06, 0xab, 0x4b, 0x2a, 0x4d, 0xd3, 0x2f, 0xc8, 0x29, 0x4d, 0xcf, 0xcc, 0xd3, 0x4f, 0x73, 0x52, 0x0a, 0x12, 0x4b, 0x32, 0x20, 0x26, 0x28, 0x45, 0x73, 0xf1, 0x3a, 0x43, 0xec, 0x76,
0xcb, 0x4c, 0xcd, 0x49, 0x29, 0x48, 0x2c, 0xc9, 0x80, 0x98, 0xa0, 0x14, 0xcd, 0xc5, 0xeb, 0x0c, 0x49, 0xcd, 0x49, 0x2d, 0x49, 0x15, 0xf2, 0xe2, 0x62, 0x4b, 0xc9, 0x4c, 0x4f, 0x2d, 0x2e, 0x91,
0x71, 0x87, 0x4b, 0x6a, 0x4e, 0x6a, 0x49, 0xaa, 0x90, 0x17, 0x17, 0x5b, 0x4a, 0x66, 0x7a, 0x6a, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x74, 0x32, 0x3a, 0x71, 0x4f, 0x9e, 0xe1, 0xd6, 0x3d, 0x79, 0x2d,
0x71, 0x89, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xa7, 0x93, 0xd1, 0x89, 0x7b, 0xf2, 0x0c, 0xb7, 0xee, 0x24, 0xab, 0xf2, 0x0b, 0x52, 0xf3, 0xe0, 0x76, 0x14, 0xeb, 0xa7, 0xe7, 0xeb, 0x42, 0xb4, 0xe8,
0xc9, 0x6b, 0x21, 0x59, 0x95, 0x5f, 0x90, 0x9a, 0x07, 0xb7, 0xa3, 0x58, 0x3f, 0x3d, 0x5f, 0x17, 0xb9, 0x80, 0xa9, 0x20, 0xa8, 0x09, 0x4e, 0x01, 0x27, 0x1e, 0xca, 0x31, 0xdc, 0x78, 0x28, 0xc7,
0xa2, 0x45, 0xcf, 0x05, 0x4c, 0x05, 0x41, 0x4d, 0x70, 0x8a, 0x39, 0xf1, 0x50, 0x8e, 0xe1, 0xc6, 0xd0, 0xf0, 0x48, 0x8e, 0xf1, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92,
0x43, 0x39, 0x86, 0x86, 0x47, 0x72, 0x8c, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0x63, 0x5c, 0xf0, 0x45, 0x8e, 0x31, 0xca, 0x88, 0x84, 0x00, 0xb2, 0x86, 0x50, 0x49, 0x6c, 0x60,
0xe0, 0x91, 0x1c, 0xe3, 0x82, 0x2f, 0x72, 0x8c, 0x51, 0x76, 0x64, 0x06, 0x9c, 0x35, 0x84, 0x95, 0x57, 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xee, 0x71, 0x10, 0x4c, 0x5d, 0x01, 0x00, 0x00,
0xc4, 0x06, 0xf6, 0x81, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x51, 0xce, 0xec, 0x89, 0x81, 0x01,
0x00, 0x00,
} }

4
api/services/events/v1/content.proto → api/events/content.proto
View File

@ -1,11 +1,11 @@
syntax = "proto3"; syntax = "proto3";
package containerd.services.events.v1; package containerd.events;
import "gogoproto/gogo.proto"; import "gogoproto/gogo.proto";
import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
option go_package = "github.com/containerd/containerd/api/services/events/v1;events"; option go_package = "github.com/containerd/containerd/api/events;events";
option (containerd.plugin.fieldpath_all) = true; option (containerd.plugin.fieldpath_all) = true;
message ContentDelete { message ContentDelete {

3
api/events/doc.go Normal file
View File

@ -0,0 +1,3 @@
// Package events has protobuf types for various events that are used in
// containerd.
package events

42
api/services/events/v1/image.pb.go → api/events/image.pb.go
View File

@ -1,5 +1,5 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT. // 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 package events
@ -921,28 +921,28 @@ var (
) )
func init() { 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{ var fileDescriptorImage = []byte{
// 296 bytes of a gzipped FileDescriptorProto // 290 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x4e, 0xcf, 0x2c, 0xc9, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0x4f, 0xcf, 0x2c, 0xc9,
0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d,
0x4a, 0x41, 0x66, 0x26, 0x16, 0x64, 0xea, 0x17, 0xa7, 0x16, 0x95, 0x65, 0x26, 0xa7, 0x16, 0xeb, 0x4a, 0x41, 0x66, 0x26, 0x16, 0x64, 0xea, 0xa7, 0x96, 0xa5, 0xe6, 0x95, 0x14, 0xeb, 0x67, 0xe6,
0xa7, 0x96, 0xa5, 0xe6, 0x95, 0x14, 0xeb, 0x97, 0x19, 0xea, 0x67, 0xe6, 0x26, 0xa6, 0xa7, 0xea, 0x26, 0xa6, 0xa7, 0xea, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0xc9, 0x22, 0x94, 0xe8, 0x15, 0xa7,
0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0xc9, 0x22, 0x94, 0xeb, 0xc1, 0x94, 0xea, 0x81, 0x15, 0x14, 0x16, 0x95, 0x65, 0x26, 0xa7, 0x16, 0xeb, 0x81, 0x15, 0x14, 0xeb, 0x95, 0x19, 0x4a, 0x39, 0x10,
0xeb, 0x95, 0x19, 0x4a, 0x39, 0x10, 0xb4, 0x03, 0x6c, 0x4c, 0x52, 0x69, 0x9a, 0x7e, 0x41, 0x4e, 0x34, 0x17, 0x6c, 0x4c, 0x52, 0x69, 0x9a, 0x7e, 0x41, 0x4e, 0x69, 0x7a, 0x66, 0x9e, 0x7e, 0x5a,
0x69, 0x7a, 0x66, 0x9e, 0x7e, 0x5a, 0x66, 0x6a, 0x4e, 0x4a, 0x41, 0x62, 0x49, 0x06, 0xc4, 0x02, 0x66, 0x6a, 0x4e, 0x4a, 0x41, 0x62, 0x49, 0x06, 0xc4, 0x02, 0xa5, 0x35, 0x8c, 0x5c, 0xdc, 0x9e,
0xa5, 0x35, 0x8c, 0x5c, 0xdc, 0x9e, 0x20, 0xf3, 0x9c, 0x8b, 0x52, 0x13, 0x4b, 0x52, 0x85, 0x84, 0x20, 0xf3, 0x9c, 0x8b, 0x52, 0x13, 0x4b, 0x52, 0x85, 0x84, 0xb8, 0x58, 0xf2, 0x12, 0x73, 0x53,
0xb8, 0x58, 0xf2, 0x12, 0x73, 0x53, 0x25, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0xc0, 0x6c, 0x21, 0x25, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0xc0, 0x6c, 0x21, 0x3f, 0x2e, 0xb6, 0x9c, 0xc4, 0xa4,
0x3f, 0x2e, 0xb6, 0x9c, 0xc4, 0xa4, 0xd4, 0x9c, 0x62, 0x09, 0x26, 0x05, 0x66, 0x0d, 0x6e, 0x23, 0xd4, 0x9c, 0x62, 0x09, 0x26, 0x05, 0x66, 0x0d, 0x6e, 0x23, 0x33, 0x3d, 0xbc, 0xae, 0xd2, 0x43,
0x33, 0x3d, 0xbc, 0xae, 0xd2, 0x43, 0x32, 0x4f, 0xcf, 0x07, 0xac, 0xd1, 0x35, 0xaf, 0xa4, 0xa8, 0x32, 0x4f, 0xcf, 0x07, 0xac, 0xd1, 0x35, 0xaf, 0xa4, 0xa8, 0x32, 0x08, 0x6a, 0x8a, 0x94, 0x25,
0x32, 0x08, 0x6a, 0x8a, 0x94, 0x25, 0x17, 0x37, 0x92, 0xb0, 0x90, 0x00, 0x17, 0x73, 0x76, 0x6a, 0x17, 0x37, 0x92, 0xb0, 0x90, 0x00, 0x17, 0x73, 0x76, 0x6a, 0x25, 0xd4, 0x46, 0x10, 0x53, 0x48,
0x25, 0xd4, 0x46, 0x10, 0x53, 0x48, 0x84, 0x8b, 0xb5, 0x2c, 0x31, 0xa7, 0x34, 0x55, 0x82, 0x09, 0x84, 0x8b, 0xb5, 0x2c, 0x31, 0xa7, 0x34, 0x55, 0x82, 0x09, 0x2c, 0x06, 0xe1, 0x58, 0x31, 0x59,
0x2c, 0x06, 0xe1, 0x58, 0x31, 0x59, 0x30, 0x22, 0x9c, 0x1b, 0x5a, 0x90, 0x42, 0x55, 0xe7, 0x42, 0x30, 0x22, 0x9c, 0x1b, 0x5a, 0x90, 0x42, 0x55, 0xe7, 0x42, 0xcc, 0xa3, 0xb6, 0x73, 0x15, 0xa1,
0xcc, 0xa3, 0xb6, 0x73, 0x15, 0xa1, 0xae, 0x75, 0x49, 0xcd, 0x49, 0xc5, 0xee, 0x5a, 0xa7, 0x98, 0xae, 0x75, 0x49, 0xcd, 0x49, 0xc5, 0xee, 0x5a, 0xa7, 0x80, 0x13, 0x0f, 0xe5, 0x18, 0x6e, 0x3c,
0x13, 0x0f, 0xe5, 0x18, 0x6e, 0x3c, 0x94, 0x63, 0x68, 0x78, 0x24, 0xc7, 0x78, 0xe2, 0x91, 0x1c, 0x94, 0x63, 0x68, 0x78, 0x24, 0xc7, 0x78, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f,
0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x2e, 0xf8, 0x22, 0xc7, 0x18, 0x65, 0x47, 0x1e, 0xc9, 0x31, 0x2e, 0xf8, 0x22, 0xc7, 0x18, 0x65, 0x44, 0x42, 0xc2, 0xb1, 0x86, 0x50, 0x49,
0x66, 0x22, 0xb2, 0x86, 0xb0, 0x92, 0xd8, 0xc0, 0xb1, 0x6c, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x6c, 0xe0, 0x98, 0x35, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xea, 0x1f, 0xed, 0xe5, 0x75, 0x02,
0x44, 0x99, 0x59, 0x31, 0x8d, 0x02, 0x00, 0x00, 0x00, 0x00,
} }

2
api/services/events/v1/image.proto → api/events/image.proto
View File

@ -4,7 +4,7 @@ package containerd.services.images.v1;
import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
option go_package = "github.com/containerd/containerd/api/services/events/v1;events"; option go_package = "github.com/containerd/containerd/api/events;events";
option (containerd.plugin.fieldpath_all) = true; option (containerd.plugin.fieldpath_all) = true;
message ImageCreate { message ImageCreate {

49
api/services/events/v1/namespace.pb.go → api/events/namespace.pb.go
View File

@ -1,5 +1,5 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT. // 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 package events
@ -47,9 +47,9 @@ func (*NamespaceDelete) ProtoMessage() {}
func (*NamespaceDelete) Descriptor() ([]byte, []int) { return fileDescriptorNamespace, []int{2} } func (*NamespaceDelete) Descriptor() ([]byte, []int) { return fileDescriptorNamespace, []int{2} }
func init() { func init() {
proto.RegisterType((*NamespaceCreate)(nil), "containerd.services.events.v1.NamespaceCreate") proto.RegisterType((*NamespaceCreate)(nil), "containerd.events.NamespaceCreate")
proto.RegisterType((*NamespaceUpdate)(nil), "containerd.services.events.v1.NamespaceUpdate") proto.RegisterType((*NamespaceUpdate)(nil), "containerd.events.NamespaceUpdate")
proto.RegisterType((*NamespaceDelete)(nil), "containerd.services.events.v1.NamespaceDelete") proto.RegisterType((*NamespaceDelete)(nil), "containerd.events.NamespaceDelete")
} }
// Field returns the value for the given fieldpath as a string, if defined. // Field returns the value for the given fieldpath as a string, if defined.
@ -922,29 +922,28 @@ var (
) )
func init() { 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{ var fileDescriptorNamespace = []byte{
// 310 bytes of a gzipped FileDescriptorProto // 292 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x4f, 0xcf, 0x2c, 0xc9, 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, 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, 0x4a, 0x41, 0x66, 0x26, 0x16, 0x64, 0xea, 0xa7, 0x96, 0xa5, 0xe6, 0x95, 0x14, 0xeb, 0xe7, 0x25,
0xa7, 0x96, 0xa5, 0xe6, 0x95, 0x14, 0xeb, 0x97, 0x19, 0xea, 0xe7, 0x25, 0xe6, 0xa6, 0x16, 0x17, 0xe6, 0xa6, 0x16, 0x17, 0x24, 0x26, 0xa7, 0xea, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0x09, 0x22,
0x24, 0x26, 0xa7, 0xea, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0xc9, 0x22, 0xb4, 0xe8, 0xc1, 0x94, 0x94, 0xe9, 0x41, 0x94, 0x48, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x65, 0xf5, 0x41, 0x2c, 0x88,
0xeb, 0x41, 0x94, 0xeb, 0x95, 0x19, 0x4a, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x55, 0xea, 0x83, 0x42, 0x29, 0x07, 0x82, 0xb6, 0x80, 0xd5, 0x25, 0x95, 0xa6, 0xe9, 0x17, 0xe4, 0x94, 0xa6, 0x67,
0x58, 0x10, 0x4d, 0x52, 0x0e, 0x04, 0x6d, 0x07, 0xab, 0x4b, 0x2a, 0x4d, 0xd3, 0x2f, 0xc8, 0x29, 0xe6, 0xe9, 0xa7, 0x65, 0xa6, 0xe6, 0xa4, 0x14, 0x24, 0x96, 0x64, 0x40, 0x4c, 0x50, 0x5a, 0xc1,
0x4d, 0xcf, 0xcc, 0xd3, 0x4f, 0xcb, 0x4c, 0xcd, 0x49, 0x29, 0x48, 0x2c, 0xc9, 0x80, 0x98, 0xa0, 0xc8, 0xc5, 0xef, 0x07, 0xb3, 0xde, 0xb9, 0x28, 0x35, 0xb1, 0x24, 0x55, 0x48, 0x88, 0x8b, 0x05,
0xb4, 0x85, 0x91, 0x8b, 0xdf, 0x0f, 0xe6, 0x14, 0xe7, 0xa2, 0xd4, 0xc4, 0x92, 0x54, 0x21, 0x21, 0xe4, 0x22, 0x09, 0x46, 0x05, 0x46, 0x0d, 0xce, 0x20, 0x30, 0x5b, 0xc8, 0x8d, 0x8b, 0x2d, 0x27,
0x2e, 0x16, 0x90, 0xeb, 0x24, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0xc0, 0x6c, 0xa1, 0x20, 0x2e, 0x31, 0x29, 0x35, 0xa7, 0x58, 0x82, 0x49, 0x81, 0x59, 0x83, 0xdb, 0x48, 0x4f, 0x0f, 0xc3, 0x8d,
0xb6, 0x9c, 0xc4, 0xa4, 0xd4, 0x9c, 0x62, 0x09, 0x26, 0x05, 0x66, 0x0d, 0x6e, 0x23, 0x2b, 0x3d, 0x7a, 0x68, 0xe6, 0xe8, 0xf9, 0x80, 0x35, 0xb8, 0xe6, 0x95, 0x14, 0x55, 0x06, 0x41, 0x75, 0x4b,
0xbc, 0xee, 0xd5, 0x43, 0x33, 0x53, 0xcf, 0x07, 0xac, 0xd9, 0x35, 0xaf, 0xa4, 0xa8, 0x32, 0x08, 0x59, 0x72, 0x71, 0x23, 0x09, 0x0b, 0x09, 0x70, 0x31, 0x67, 0xa7, 0x56, 0x42, 0x6d, 0x02, 0x31,
0x6a, 0x92, 0x94, 0x25, 0x17, 0x37, 0x92, 0xb0, 0x90, 0x00, 0x17, 0x73, 0x76, 0x6a, 0x25, 0xd4, 0x85, 0x44, 0xb8, 0x58, 0xcb, 0x12, 0x73, 0x4a, 0x53, 0x25, 0x98, 0xc0, 0x62, 0x10, 0x8e, 0x15,
0x56, 0x10, 0x53, 0x48, 0x84, 0x8b, 0xb5, 0x2c, 0x31, 0xa7, 0x34, 0x55, 0x82, 0x09, 0x2c, 0x06, 0x93, 0x05, 0x23, 0xaa, 0x53, 0x43, 0x0b, 0x52, 0xa8, 0xe2, 0x54, 0x88, 0x39, 0xd4, 0x76, 0xaa,
0xe1, 0x58, 0x31, 0x59, 0x30, 0xa2, 0x3a, 0x3b, 0xb4, 0x20, 0x85, 0xea, 0xce, 0x86, 0x98, 0x49, 0x2a, 0x92, 0x4b, 0x5d, 0x52, 0x73, 0x52, 0xb1, 0xbb, 0xd4, 0x29, 0xe0, 0xc4, 0x43, 0x39, 0x86,
0x6d, 0x67, 0xab, 0x22, 0xb9, 0xda, 0x25, 0x35, 0x27, 0x15, 0xbb, 0xab, 0x9d, 0x62, 0x4e, 0x3c, 0x1b, 0x0f, 0xe5, 0x18, 0x1a, 0x1e, 0xc9, 0x31, 0x9e, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c,
0x94, 0x63, 0xb8, 0xf1, 0x50, 0x8e, 0xa1, 0xe1, 0x91, 0x1c, 0xe3, 0x89, 0x47, 0x72, 0x8c, 0x17, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x0b, 0xbe, 0xc8, 0x31, 0x46, 0x19, 0x91, 0x90, 0x84, 0xac, 0x21,
0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0xb8, 0xe0, 0x8b, 0x1c, 0x63, 0x94, 0x1d, 0x99, 0x49, 0x54, 0x12, 0x1b, 0x38, 0x56, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x0a, 0x22, 0xd4, 0x70,
0xce, 0x1a, 0xc2, 0x4a, 0x62, 0x03, 0xc7, 0xbc, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x58, 0x7e, 0x7f, 0x02, 0x00, 0x00,
0x6c, 0xc6, 0xbb, 0x02, 0x00, 0x00,
} }

4
api/services/events/v1/namespace.proto → api/events/namespace.proto
View File

@ -1,11 +1,11 @@
syntax = "proto3"; syntax = "proto3";
package containerd.services.events.v1; package containerd.events;
import "gogoproto/gogo.proto"; import "gogoproto/gogo.proto";
import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
option go_package = "github.com/containerd/containerd/api/services/events/v1;events"; option go_package = "github.com/containerd/containerd/api/events;events";
option (containerd.plugin.fieldpath_all) = true; option (containerd.plugin.fieldpath_all) = true;
message NamespaceCreate { message NamespaceCreate {

41
api/services/events/v1/snapshot.pb.go → api/events/snapshot.pb.go
View File

@ -1,5 +1,5 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT. // 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 package events
@ -45,9 +45,9 @@ func (*SnapshotRemove) ProtoMessage() {}
func (*SnapshotRemove) Descriptor() ([]byte, []int) { return fileDescriptorSnapshot, []int{2} } func (*SnapshotRemove) Descriptor() ([]byte, []int) { return fileDescriptorSnapshot, []int{2} }
func init() { func init() {
proto.RegisterType((*SnapshotPrepare)(nil), "containerd.services.events.v1.SnapshotPrepare") proto.RegisterType((*SnapshotPrepare)(nil), "containerd.events.SnapshotPrepare")
proto.RegisterType((*SnapshotCommit)(nil), "containerd.services.events.v1.SnapshotCommit") proto.RegisterType((*SnapshotCommit)(nil), "containerd.events.SnapshotCommit")
proto.RegisterType((*SnapshotRemove)(nil), "containerd.services.events.v1.SnapshotRemove") proto.RegisterType((*SnapshotRemove)(nil), "containerd.events.SnapshotRemove")
} }
// Field returns the value for the given fieldpath as a string, if defined. // Field returns the value for the given fieldpath as a string, if defined.
@ -680,25 +680,24 @@ var (
) )
func init() { 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{ var fileDescriptorSnapshot = []byte{
// 252 bytes of a gzipped FileDescriptorProto // 233 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x4b, 0xcf, 0x2c, 0xc9, 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, 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, 0x4a, 0x41, 0x66, 0x26, 0x16, 0x64, 0xea, 0xa7, 0x96, 0xa5, 0xe6, 0x95, 0x14, 0xeb, 0x17, 0xe7,
0xa7, 0x96, 0xa5, 0xe6, 0x95, 0x14, 0xeb, 0x97, 0x19, 0xea, 0x17, 0xe7, 0x25, 0x16, 0x14, 0x67, 0x25, 0x16, 0x14, 0x67, 0xe4, 0x97, 0xe8, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0x09, 0x22, 0x54,
0xe4, 0x97, 0xe8, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0xc9, 0x22, 0x74, 0xe8, 0xc1, 0x54, 0xeb, 0xe9, 0x41, 0x54, 0x48, 0x39, 0x10, 0x34, 0x0e, 0xac, 0x35, 0xa9, 0x34, 0x4d, 0xbf, 0x20, 0xa7,
0x41, 0x54, 0xeb, 0x95, 0x19, 0x4a, 0x39, 0x10, 0xb4, 0x06, 0x6c, 0x4c, 0x52, 0x69, 0x9a, 0x7e, 0x34, 0x3d, 0x33, 0x4f, 0x3f, 0x2d, 0x33, 0x35, 0x27, 0xa5, 0x20, 0xb1, 0x24, 0x03, 0x62, 0xa8,
0x41, 0x4e, 0x69, 0x7a, 0x66, 0x9e, 0x7e, 0x5a, 0x66, 0x6a, 0x4e, 0x4a, 0x41, 0x62, 0x49, 0x06, 0x92, 0x35, 0x17, 0x7f, 0x30, 0xd4, 0x9a, 0x80, 0xa2, 0xd4, 0x82, 0xc4, 0xa2, 0x54, 0x21, 0x01,
0xc4, 0x02, 0x25, 0x6b, 0x2e, 0xfe, 0x60, 0xa8, 0x95, 0x01, 0x45, 0xa9, 0x05, 0x89, 0x45, 0xa9, 0x2e, 0xe6, 0xec, 0xd4, 0x4a, 0x09, 0x46, 0x05, 0x46, 0x0d, 0xce, 0x20, 0x10, 0x53, 0x48, 0x8c,
0x42, 0x02, 0x5c, 0xcc, 0xd9, 0xa9, 0x95, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x9c, 0x41, 0x20, 0xa6, 0x8b, 0x0d, 0x24, 0x93, 0x57, 0x22, 0xc1, 0x04, 0x16, 0x84, 0xf2, 0x94, 0xcc, 0xb8, 0xf8, 0x60,
0x90, 0x18, 0x17, 0x1b, 0x48, 0x26, 0xaf, 0x44, 0x82, 0x09, 0x2c, 0x08, 0xe5, 0x29, 0x99, 0x71, 0x9a, 0x9d, 0xf3, 0x73, 0x73, 0x33, 0x4b, 0xb0, 0xe8, 0x15, 0xe2, 0x62, 0xc9, 0x4b, 0xcc, 0x4d,
0xf1, 0xc1, 0x34, 0x3b, 0xe7, 0xe7, 0xe6, 0x66, 0x96, 0x60, 0xd1, 0x2b, 0xc4, 0xc5, 0x92, 0x97, 0x85, 0xea, 0x04, 0xb3, 0x95, 0x94, 0x10, 0xfa, 0x82, 0x52, 0x73, 0xf3, 0xcb, 0xb0, 0xd8, 0xe9,
0x98, 0x9b, 0x0a, 0xd5, 0x09, 0x66, 0x2b, 0x29, 0x21, 0xf4, 0x05, 0xa5, 0xe6, 0xe6, 0x97, 0x61, 0x14, 0x70, 0xe2, 0xa1, 0x1c, 0xc3, 0x8d, 0x87, 0x72, 0x0c, 0x0d, 0x8f, 0xe4, 0x18, 0x4f, 0x3c,
0xb1, 0xd3, 0x29, 0xe6, 0xc4, 0x43, 0x39, 0x86, 0x1b, 0x0f, 0xe5, 0x18, 0x1a, 0x1e, 0xc9, 0x31, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x05, 0x5f, 0xe4, 0x18, 0xa3,
0x9e, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x0b, 0xbe, 0xc8, 0x8c, 0x48, 0x08, 0x47, 0x6b, 0x08, 0x95, 0xc4, 0x06, 0xf6, 0xb1, 0x31, 0x20, 0x00, 0x00, 0xff,
0x31, 0x46, 0xd9, 0x91, 0x19, 0xbe, 0xd6, 0x10, 0x56, 0x12, 0x1b, 0xd8, 0xf7, 0xc6, 0x80, 0x00, 0xff, 0x62, 0x68, 0x19, 0xf5, 0x84, 0x01, 0x00, 0x00,
0x00, 0x00, 0xff, 0xff, 0x3a, 0x82, 0x7a, 0xa7, 0xa8, 0x01, 0x00, 0x00,
} }

4
api/services/events/v1/snapshot.proto → api/events/snapshot.proto
View File

@ -1,10 +1,10 @@
syntax = "proto3"; syntax = "proto3";
package containerd.services.events.v1; package containerd.events;
import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
option go_package = "github.com/containerd/containerd/api/services/events/v1;events"; option go_package = "github.com/containerd/containerd/api/events;events";
option (containerd.plugin.fieldpath_all) = true; option (containerd.plugin.fieldpath_all) = true;
message SnapshotPrepare { message SnapshotPrepare {

113
api/services/events/v1/task.pb.go → api/events/task.pb.go
View File

@ -1,5 +1,5 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT. // 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 package events
@ -135,17 +135,17 @@ func (*TaskCheckpointed) ProtoMessage() {}
func (*TaskCheckpointed) Descriptor() ([]byte, []int) { return fileDescriptorTask, []int{10} } func (*TaskCheckpointed) Descriptor() ([]byte, []int) { return fileDescriptorTask, []int{10} }
func init() { func init() {
proto.RegisterType((*TaskCreate)(nil), "containerd.services.events.v1.TaskCreate") proto.RegisterType((*TaskCreate)(nil), "containerd.events.TaskCreate")
proto.RegisterType((*TaskStart)(nil), "containerd.services.events.v1.TaskStart") proto.RegisterType((*TaskStart)(nil), "containerd.events.TaskStart")
proto.RegisterType((*TaskDelete)(nil), "containerd.services.events.v1.TaskDelete") proto.RegisterType((*TaskDelete)(nil), "containerd.events.TaskDelete")
proto.RegisterType((*TaskIO)(nil), "containerd.services.events.v1.TaskIO") proto.RegisterType((*TaskIO)(nil), "containerd.events.TaskIO")
proto.RegisterType((*TaskExit)(nil), "containerd.services.events.v1.TaskExit") proto.RegisterType((*TaskExit)(nil), "containerd.events.TaskExit")
proto.RegisterType((*TaskOOM)(nil), "containerd.services.events.v1.TaskOOM") proto.RegisterType((*TaskOOM)(nil), "containerd.events.TaskOOM")
proto.RegisterType((*TaskExecAdded)(nil), "containerd.services.events.v1.TaskExecAdded") proto.RegisterType((*TaskExecAdded)(nil), "containerd.events.TaskExecAdded")
proto.RegisterType((*TaskExecStarted)(nil), "containerd.services.events.v1.TaskExecStarted") proto.RegisterType((*TaskExecStarted)(nil), "containerd.events.TaskExecStarted")
proto.RegisterType((*TaskPaused)(nil), "containerd.services.events.v1.TaskPaused") proto.RegisterType((*TaskPaused)(nil), "containerd.events.TaskPaused")
proto.RegisterType((*TaskResumed)(nil), "containerd.services.events.v1.TaskResumed") proto.RegisterType((*TaskResumed)(nil), "containerd.events.TaskResumed")
proto.RegisterType((*TaskCheckpointed)(nil), "containerd.services.events.v1.TaskCheckpointed") proto.RegisterType((*TaskCheckpointed)(nil), "containerd.events.TaskCheckpointed")
} }
// Field returns the value for the given fieldpath as a string, if defined. // 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) + `,`, `ContainerID:` + fmt.Sprintf("%v", this.ContainerID) + `,`,
`Pid:` + fmt.Sprintf("%v", this.Pid) + `,`, `Pid:` + fmt.Sprintf("%v", this.Pid) + `,`,
`ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`, `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 return s
@ -999,7 +999,7 @@ func (this *TaskExit) String() string {
`ID:` + fmt.Sprintf("%v", this.ID) + `,`, `ID:` + fmt.Sprintf("%v", this.ID) + `,`,
`Pid:` + fmt.Sprintf("%v", this.Pid) + `,`, `Pid:` + fmt.Sprintf("%v", this.Pid) + `,`,
`ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`, `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 return s
@ -2560,50 +2560,49 @@ var (
) )
func init() { 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{ var fileDescriptorTask = []byte{
// 648 bytes of a gzipped FileDescriptorProto // 632 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x95, 0xc1, 0x6e, 0xd3, 0x40, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x95, 0xcd, 0x6e, 0xd3, 0x40,
0x10, 0x86, 0x6b, 0xa7, 0x75, 0x93, 0x0d, 0x55, 0x2b, 0xab, 0x82, 0x28, 0x12, 0x76, 0x64, 0x84, 0x10, 0xc7, 0x6b, 0xa7, 0x75, 0x93, 0x09, 0x55, 0x8b, 0x55, 0x41, 0xc8, 0xc1, 0x8e, 0xcc, 0x25,
0x94, 0x93, 0xad, 0x16, 0x89, 0x0b, 0x2a, 0x6a, 0xd2, 0x70, 0xc8, 0xa1, 0x0a, 0xb8, 0x3d, 0x21, 0x27, 0x5b, 0x04, 0x89, 0x0b, 0x42, 0x6a, 0xd2, 0x70, 0xc8, 0xa1, 0x4a, 0x71, 0x7b, 0xe2, 0x12,
0xa4, 0xc8, 0xb1, 0x27, 0xc9, 0xd2, 0xc4, 0x6b, 0x79, 0xc7, 0x51, 0x91, 0x38, 0xf0, 0x08, 0x3c, 0x6d, 0xb2, 0x9b, 0x64, 0x69, 0xe2, 0xb5, 0xec, 0x31, 0x2a, 0x12, 0x07, 0x1e, 0x81, 0x47, 0xe0,
0x02, 0x4f, 0xc1, 0x33, 0xf4, 0xc0, 0x81, 0x23, 0xa7, 0x40, 0xfd, 0x0c, 0x9c, 0x38, 0xa1, 0xf5, 0x29, 0x78, 0x86, 0x1e, 0x38, 0x70, 0xe4, 0x14, 0xa8, 0x1f, 0x80, 0x13, 0x0f, 0x80, 0xd6, 0xeb,
0x3a, 0x6e, 0xa1, 0xa2, 0x20, 0x4b, 0xdc, 0x76, 0xc6, 0x33, 0xff, 0xcc, 0x7c, 0x3b, 0xd9, 0x90, 0xb8, 0x85, 0x8a, 0x2f, 0x4b, 0x9c, 0xb2, 0x33, 0x3b, 0xfb, 0x9f, 0x99, 0xdf, 0x4e, 0xd6, 0xf0,
0xee, 0x84, 0xe2, 0x34, 0x19, 0xd9, 0x3e, 0x9b, 0x3b, 0x3e, 0x0b, 0xd1, 0xa3, 0x21, 0xc4, 0xc1, 0x68, 0xc6, 0x71, 0x9e, 0x8c, 0xdd, 0x89, 0x58, 0x7a, 0x13, 0x11, 0x20, 0xe1, 0x01, 0x8b, 0xe8,
0xf5, 0xa3, 0x17, 0x51, 0x87, 0x43, 0xbc, 0xa0, 0x3e, 0x70, 0x07, 0x16, 0x10, 0x22, 0x77, 0x16, 0xf5, 0x25, 0x09, 0xb9, 0xc7, 0x5e, 0xb2, 0x00, 0x63, 0x0f, 0x49, 0x7c, 0xe6, 0x86, 0x91, 0x40,
0x7b, 0x0e, 0x7a, 0xfc, 0xcc, 0x8e, 0x62, 0x86, 0x4c, 0xbf, 0x7f, 0x15, 0x6d, 0xaf, 0x22, 0x6d, 0x61, 0xde, 0xbe, 0x8a, 0x70, 0xd5, 0x6e, 0x73, 0x7f, 0x26, 0x66, 0x22, 0xdb, 0xf5, 0xe4, 0x4a,
0x19, 0x69, 0x2f, 0xf6, 0x9a, 0xbb, 0x13, 0x36, 0x61, 0x59, 0xa4, 0x23, 0x4e, 0x32, 0xa9, 0x69, 0x05, 0x36, 0xed, 0x99, 0x10, 0xb3, 0x05, 0xf3, 0x32, 0x6b, 0x9c, 0x4c, 0x3d, 0xe4, 0x4b, 0x16,
0x4e, 0x18, 0x9b, 0xcc, 0xc0, 0xc9, 0xac, 0x51, 0x32, 0x76, 0x90, 0xce, 0x81, 0xa3, 0x37, 0x8f, 0x23, 0x59, 0x86, 0x79, 0xc0, 0xdf, 0x55, 0x80, 0xaf, 0x42, 0x16, 0x7b, 0x4b, 0x91, 0x04, 0x98,
0xf2, 0x80, 0xc7, 0xff, 0xd4, 0x19, 0xbe, 0x89, 0x80, 0x3b, 0x73, 0x96, 0x84, 0x98, 0xe7, 0x1d, 0x9f, 0x3b, 0xf8, 0xe3, 0xb9, 0x22, 0x65, 0xb8, 0x48, 0x66, 0x3c, 0xf0, 0xa6, 0x9c, 0x2d, 0x68,
0xfe, 0x35, 0xaf, 0x28, 0x19, 0xcd, 0x92, 0x09, 0x0d, 0x9d, 0x31, 0x85, 0x59, 0x10, 0x79, 0x38, 0x48, 0x70, 0xae, 0x14, 0x9c, 0xaf, 0x1a, 0xc0, 0x29, 0x89, 0xcf, 0x0e, 0x23, 0x46, 0x90, 0x99,
0x95, 0x0a, 0xd6, 0x0f, 0x85, 0x90, 0x53, 0x8f, 0x9f, 0x1d, 0xc5, 0xe0, 0x21, 0xe8, 0xfb, 0xe4, 0x1d, 0xb8, 0x55, 0x1c, 0x1e, 0x71, 0xda, 0xd0, 0x5a, 0x5a, 0xbb, 0xd6, 0xdb, 0x4d, 0x57, 0x76,
0x4e, 0x91, 0x3c, 0xa4, 0x41, 0x43, 0x69, 0x29, 0xed, 0x5a, 0x77, 0x3b, 0x5d, 0x9a, 0xf5, 0xa3, 0xfd, 0x70, 0xed, 0x1f, 0xf4, 0xfd, 0x7a, 0x11, 0x34, 0xa0, 0xe6, 0x1d, 0x30, 0xc6, 0x49, 0x40,
0x95, 0xbf, 0xdf, 0x73, 0xeb, 0x45, 0x50, 0x3f, 0xd0, 0xef, 0x12, 0x6d, 0x94, 0x84, 0xc1, 0x0c, 0x17, 0xac, 0xa1, 0xcb, 0x68, 0x3f, 0xb7, 0x4c, 0x0f, 0x8c, 0x48, 0x08, 0x9c, 0xc6, 0x8d, 0x4a,
0x1a, 0xaa, 0x88, 0x76, 0x73, 0x4b, 0x77, 0x88, 0x16, 0x33, 0x86, 0x63, 0xde, 0xa8, 0xb4, 0x2a, 0xab, 0xd2, 0xae, 0x77, 0xee, 0xba, 0xd7, 0x78, 0x65, 0xbd, 0xb8, 0x47, 0xb2, 0x17, 0x3f, 0x0f,
0xed, 0xfa, 0xfe, 0x3d, 0xfb, 0x1a, 0xbb, 0x6c, 0x16, 0xfb, 0x58, 0xcc, 0xe2, 0xe6, 0x61, 0xfa, 0x33, 0x1f, 0x80, 0xce, 0x45, 0x63, 0xb3, 0xa5, 0xb5, 0xeb, 0x9d, 0x7b, 0xee, 0x0d, 0xb8, 0xae,
0x01, 0x51, 0x29, 0x6b, 0xac, 0xb7, 0x94, 0x76, 0x7d, 0xff, 0xa1, 0x7d, 0x2b, 0x68, 0x5b, 0xf4, 0xac, 0x73, 0x30, 0xec, 0x19, 0xe9, 0xca, 0xd6, 0x07, 0x43, 0x5f, 0xe7, 0xc2, 0xb4, 0x00, 0x26,
0xdc, 0x1f, 0x74, 0xb5, 0x74, 0x69, 0xaa, 0xfd, 0x81, 0xab, 0x52, 0xa6, 0x1b, 0x84, 0xf8, 0x53, 0x73, 0x36, 0x39, 0x0b, 0x05, 0x0f, 0xb0, 0xb1, 0x95, 0xe5, 0xbf, 0xe6, 0x31, 0xf7, 0xa0, 0x12,
0xf0, 0xcf, 0x22, 0x46, 0x43, 0x6c, 0x6c, 0x64, 0xbd, 0x5c, 0xf3, 0xe8, 0x3b, 0xa4, 0x12, 0xd1, 0x72, 0xda, 0x30, 0x5a, 0x5a, 0x7b, 0xc7, 0x97, 0x4b, 0xe7, 0x19, 0xd4, 0xa4, 0xce, 0x09, 0x92,
0xa0, 0xa1, 0xb5, 0x94, 0xf6, 0x96, 0x2b, 0x8e, 0xd6, 0x0b, 0x52, 0x13, 0x3a, 0x27, 0xe8, 0xc5, 0x08, 0x4b, 0xb5, 0x9b, 0x4b, 0xea, 0x57, 0x92, 0xef, 0x73, 0x86, 0x7d, 0xb6, 0x60, 0x25, 0x19,
0x58, 0x6a, 0xf4, 0x5c, 0x52, 0xbd, 0x92, 0xfc, 0x98, 0xf3, 0xec, 0xc1, 0x0c, 0x4a, 0xf2, 0xbc, 0xde, 0x10, 0x35, 0x6d, 0xa8, 0xb3, 0x73, 0x8e, 0xa3, 0x18, 0x09, 0x26, 0x12, 0xa1, 0xdc, 0x01,
0x21, 0xaa, 0x9b, 0xa4, 0x0e, 0xe7, 0x14, 0x87, 0x1c, 0x3d, 0x4c, 0x04, 0x4e, 0xf1, 0x85, 0x08, 0xe9, 0x3a, 0xc9, 0x3c, 0x66, 0x17, 0x6a, 0xd2, 0x62, 0x74, 0x44, 0x30, 0x87, 0xd6, 0x74, 0xd5,
0xd7, 0x49, 0xe6, 0xd1, 0x3b, 0xa4, 0x26, 0x2c, 0x08, 0x86, 0x1e, 0xe6, 0x00, 0x9b, 0xb6, 0x5c, 0xa0, 0xb9, 0xeb, 0x5b, 0x77, 0x4f, 0xd7, 0x83, 0xd6, 0xab, 0x5e, 0xac, 0xec, 0x8d, 0xb7, 0x9f,
0x3a, 0x7b, 0xb5, 0x01, 0xf6, 0xe9, 0x6a, 0xe9, 0xba, 0xd5, 0x8b, 0xa5, 0xb9, 0xf6, 0xfe, 0xab, 0x6d, 0xcd, 0xaf, 0xaa, 0x63, 0x5d, 0x74, 0x5e, 0x80, 0xa1, 0x98, 0x9a, 0xfb, 0xb0, 0x15, 0x23,
0xa9, 0xb8, 0x55, 0x99, 0xd6, 0x41, 0xeb, 0x35, 0xd1, 0x24, 0x53, 0x7d, 0x97, 0x6c, 0x70, 0x0c, 0xe5, 0x81, 0x2a, 0xd6, 0x57, 0x86, 0xbc, 0xd9, 0x18, 0xa9, 0x48, 0x70, 0x7d, 0xb3, 0xca, 0xca,
0x68, 0x28, 0x9b, 0x75, 0xa5, 0x21, 0x6e, 0x99, 0x63, 0xc0, 0x12, 0x5c, 0xdd, 0xb2, 0xb4, 0x72, 0xfd, 0x2c, 0x8a, 0xb2, 0xb2, 0x94, 0x9f, 0x45, 0x91, 0xd9, 0x84, 0x2a, 0xb2, 0x68, 0xc9, 0x03,
0x3f, 0xc4, 0x71, 0xd6, 0x96, 0xf4, 0x43, 0x1c, 0xeb, 0x4d, 0x52, 0x45, 0x88, 0xe7, 0x34, 0xf4, 0xb2, 0xc8, 0x2a, 0xaa, 0xfa, 0x85, 0xed, 0x7c, 0xd0, 0xa0, 0x2a, 0x93, 0x3d, 0x3d, 0xe7, 0x58,
0x66, 0x59, 0x47, 0x55, 0xb7, 0xb0, 0xad, 0x4f, 0x0a, 0xa9, 0x8a, 0x62, 0xcf, 0xce, 0x29, 0x96, 0x72, 0xcc, 0xf4, 0x9c, 0x50, 0x2d, 0x1f, 0x81, 0xbe, 0xaf, 0xf3, 0x02, 0x5d, 0xe5, 0x97, 0xe8,
0x5c, 0x39, 0x35, 0x27, 0x54, 0xcb, 0x57, 0xa0, 0xe7, 0xaa, 0xb4, 0x40, 0x57, 0xf9, 0x23, 0xba, 0x36, 0x7f, 0x8f, 0x6e, 0xab, 0x14, 0xba, 0x27, 0xb0, 0x2d, 0xbb, 0x19, 0x0e, 0x8f, 0xca, 0x34,
0xf5, 0xdb, 0xd1, 0x6d, 0x94, 0x42, 0x77, 0x40, 0x36, 0xc5, 0x34, 0x83, 0xc1, 0x71, 0x99, 0x61, 0xe3, 0xcc, 0x61, 0x47, 0xc1, 0x60, 0x93, 0x2e, 0xa5, 0x8c, 0x96, 0x22, 0x72, 0x1f, 0xb6, 0xd9,
0xac, 0x29, 0xd9, 0x92, 0x30, 0xc0, 0xef, 0x04, 0x01, 0x04, 0xa5, 0x88, 0x3c, 0x20, 0x9b, 0x70, 0x39, 0x9b, 0x8c, 0x0a, 0x2c, 0x90, 0xae, 0x6c, 0x43, 0x6a, 0x0e, 0xfa, 0xbe, 0x21, 0xb7, 0x06,
0x0e, 0xfe, 0xb0, 0xc0, 0x42, 0xd2, 0xa5, 0xa9, 0x09, 0xcd, 0x7e, 0xcf, 0xd5, 0xc4, 0xa7, 0x7e, 0xd4, 0x79, 0x0d, 0xbb, 0xeb, 0x4c, 0xd9, 0xcc, 0xff, 0xc7, 0x5c, 0x37, 0xaf, 0xc2, 0x39, 0x50,
0x60, 0xbd, 0x25, 0xdb, 0xab, 0x4a, 0xd9, 0xce, 0xff, 0xc7, 0x5a, 0x37, 0xaf, 0xc2, 0x3a, 0x94, 0xff, 0x8c, 0x63, 0x92, 0xc4, 0xe5, 0x12, 0x3b, 0x5d, 0xa8, 0x4b, 0x05, 0x9f, 0xc5, 0xc9, 0xb2,
0xbf, 0x8c, 0xe7, 0x5e, 0xc2, 0xcb, 0x15, 0xb6, 0x3a, 0xa4, 0x2e, 0x14, 0x5c, 0xe0, 0xc9, 0xbc, 0xa4, 0xc4, 0x14, 0xf6, 0xb2, 0x27, 0xae, 0x78, 0x16, 0x4a, 0x32, 0xf8, 0xf1, 0xb1, 0xd1, 0x7f,
0xa4, 0xc4, 0x98, 0xec, 0x64, 0xcf, 0x5d, 0xf1, 0x2c, 0x94, 0x64, 0xf0, 0xeb, 0x63, 0xa3, 0xfe, 0x7e, 0x6c, 0x7a, 0xc7, 0x17, 0x97, 0xd6, 0xc6, 0xa7, 0x4b, 0x6b, 0xe3, 0x4d, 0x6a, 0x69, 0x17,
0xfe, 0xd8, 0x74, 0x5f, 0x5d, 0x5c, 0x1a, 0x6b, 0x5f, 0x2e, 0x8d, 0xb5, 0x77, 0xa9, 0xa1, 0x5c, 0xa9, 0xa5, 0x7d, 0x4c, 0x2d, 0xed, 0x4b, 0x6a, 0x69, 0xef, 0xbe, 0x59, 0xda, 0xf3, 0xce, 0x3f,
0xa4, 0x86, 0xf2, 0x39, 0x35, 0x94, 0x6f, 0xa9, 0xa1, 0x7c, 0xf8, 0x6e, 0x28, 0x2f, 0x9f, 0x96, 0x7c, 0x65, 0x1e, 0xab, 0x9f, 0xb1, 0x91, 0x4d, 0xe3, 0xc3, 0xef, 0x01, 0x00, 0x00, 0xff, 0xff,
0xfc, 0x27, 0x7a, 0x22, 0x4f, 0x23, 0x2d, 0xdb, 0xcc, 0x47, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x13, 0x1c, 0x5d, 0xf2, 0xa2, 0x06, 0x00, 0x00,
0x76, 0xdf, 0xe7, 0xaa, 0xd2, 0x06, 0x00, 0x00,
} }

4
api/services/events/v1/task.proto → api/events/task.proto
View File

@ -1,13 +1,13 @@
syntax = "proto3"; syntax = "proto3";
package containerd.services.events.v1; package containerd.events;
import "gogoproto/gogo.proto"; import "gogoproto/gogo.proto";
import "google/protobuf/timestamp.proto"; import "google/protobuf/timestamp.proto";
import "github.com/containerd/containerd/api/types/mount.proto"; import "github.com/containerd/containerd/api/types/mount.proto";
import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
option go_package = "github.com/containerd/containerd/api/services/events/v1;events"; option go_package = "github.com/containerd/containerd/api/events;events";
option (containerd.plugin.fieldpath_all) = true; option (containerd.plugin.fieldpath_all) = true;
message TaskCreate { message TaskCreate {

1518
api/next.pb.txt
View File

File diff suppressed because it is too large Load Diff

2
api/services/events/v1/doc.go Normal file
View File

@ -0,0 +1,2 @@
// Package events defines the event pushing and subscription service.
package events

18
api/services/events/v1/events.pb.go
View File

@ -1,6 +1,18 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT. // Code generated by protoc-gen-gogo. DO NOT EDIT.
// source: github.com/containerd/containerd/api/services/events/v1/events.proto // 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 package events
import proto "github.com/gogo/protobuf/proto" import proto "github.com/gogo/protobuf/proto"
@ -34,6 +46,12 @@ var _ = fmt.Errorf
var _ = math.Inf var _ = math.Inf
var _ = time.Kitchen 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 { type PublishRequest struct {
Topic string `protobuf:"bytes,1,opt,name=topic,proto3" json:"topic,omitempty"` 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"` Event *google_protobuf1.Any `protobuf:"bytes,2,opt,name=event" json:"event,omitempty"`

11
events/exchange/exchange_test.go
View File

@ -8,6 +8,7 @@ import (
"testing" "testing"
"time" "time"
eventstypes "github.com/containerd/containerd/api/events"
v1 "github.com/containerd/containerd/api/services/events/v1" v1 "github.com/containerd/containerd/api/services/events/v1"
"github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/events" "github.com/containerd/containerd/events"
@ -19,9 +20,9 @@ import (
func TestExchangeBasic(t *testing.T) { func TestExchangeBasic(t *testing.T) {
ctx := namespaces.WithNamespace(context.Background(), t.Name()) ctx := namespaces.WithNamespace(context.Background(), t.Name())
testevents := []events.Event{ testevents := []events.Event{
&v1.ContainerCreate{ID: "asdf"}, &eventstypes.ContainerCreate{ID: "asdf"},
&v1.ContainerCreate{ID: "qwer"}, &eventstypes.ContainerCreate{ID: "qwer"},
&v1.ContainerCreate{ID: "zxcv"}, &eventstypes.ContainerCreate{ID: "zxcv"},
} }
exchange := NewExchange() exchange := NewExchange()
@ -80,7 +81,7 @@ func TestExchangeBasic(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
received = append(received, ev.(*v1.ContainerCreate)) received = append(received, ev.(*eventstypes.ContainerCreate))
case err := <-subscriber.errq: case err := <-subscriber.errq:
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -118,7 +119,7 @@ func TestExchangeValidateTopic(t *testing.T) {
}, },
} { } {
t.Run(testcase.input, func(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 := exchange.Publish(ctx, testcase.input, event); errors.Cause(err) != testcase.err {
if err == nil { if err == nil {
t.Fatalf("expected error %v, received nil", testcase.err) t.Fatalf("expected error %v, received nil", testcase.err)

4
linux/process.go
View File

@ -5,7 +5,7 @@ package linux
import ( import (
"context" "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/api/types/task"
"github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/errdefs"
shim "github.com/containerd/containerd/linux/shim/v1" shim "github.com/containerd/containerd/linux/shim/v1"
@ -103,7 +103,7 @@ func (p *Process) Start(ctx context.Context) error {
if err != nil { if err != nil {
return errdefs.FromGRPC(err) 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, ContainerID: p.t.id,
Pid: r.Pid, Pid: r.Pid,
ExecID: p.id, ExecID: p.id,

12
linux/runtime.go
View File

@ -11,7 +11,7 @@ import (
"time" "time"
"github.com/boltdb/bolt" "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/api/types"
"github.com/containerd/containerd/containers" "github.com/containerd/containerd/containers"
"github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/errdefs"
@ -286,11 +286,11 @@ func (r *Runtime) Create(ctx context.Context, id string, opts runtime.CreateOpts
return nil, err return nil, err
} }
} }
r.events.Publish(ctx, runtime.TaskCreateEventTopic, &eventsapi.TaskCreate{ r.events.Publish(ctx, runtime.TaskCreateEventTopic, &eventstypes.TaskCreate{
ContainerID: sopts.ID, ContainerID: sopts.ID,
Bundle: sopts.Bundle, Bundle: sopts.Bundle,
Rootfs: sopts.Rootfs, Rootfs: sopts.Rootfs,
IO: &eventsapi.TaskIO{ IO: &eventstypes.TaskIO{
Stdin: sopts.Stdin, Stdin: sopts.Stdin,
Stdout: sopts.Stdout, Stdout: sopts.Stdout,
Stderr: sopts.Stderr, 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 { if err := bundle.Delete(); err != nil {
log.G(ctx).WithError(err).Error("failed to delete bundle") 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, ContainerID: lc.id,
ExitStatus: rsp.ExitStatus, ExitStatus: rsp.ExitStatus,
ExitedAt: rsp.ExitedAt, ExitedAt: rsp.ExitedAt,
@ -452,7 +452,7 @@ func (r *Runtime) cleanupAfterDeadShim(ctx context.Context, bundle *bundle, ns,
// Notify Client // Notify Client
exitedAt := time.Now().UTC() exitedAt := time.Now().UTC()
r.events.Publish(ctx, runtime.TaskExitEventTopic, &eventsapi.TaskExit{ r.events.Publish(ctx, runtime.TaskExitEventTopic, &eventstypes.TaskExit{
ContainerID: id, ContainerID: id,
ID: id, ID: id,
Pid: uint32(pid), 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") 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, ContainerID: id,
Pid: uint32(pid), Pid: uint32(pid),
ExitStatus: 128 + uint32(unix.SIGKILL), ExitStatus: 128 + uint32(unix.SIGKILL),

24
linux/shim/service.go
View File

@ -11,7 +11,7 @@ import (
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
"github.com/containerd/console" "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/api/types/task"
"github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/events" "github.com/containerd/containerd/events"
@ -447,7 +447,7 @@ func (s *Service) checkProcesses(e runc.Exit) {
} }
} }
p.SetExited(e.Status) p.SetExited(e.Status)
s.events <- &eventsapi.TaskExit{ s.events <- &eventstypes.TaskExit{
ContainerID: s.id, ContainerID: s.id,
ID: p.ID(), ID: p.ID(),
Pid: uint32(e.Pid), Pid: uint32(e.Pid),
@ -488,25 +488,25 @@ func (s *Service) forward(publisher events.Publisher) {
func getTopic(ctx context.Context, e interface{}) string { func getTopic(ctx context.Context, e interface{}) string {
switch e.(type) { switch e.(type) {
case *eventsapi.TaskCreate: case *eventstypes.TaskCreate:
return runtime.TaskCreateEventTopic return runtime.TaskCreateEventTopic
case *eventsapi.TaskStart: case *eventstypes.TaskStart:
return runtime.TaskStartEventTopic return runtime.TaskStartEventTopic
case *eventsapi.TaskOOM: case *eventstypes.TaskOOM:
return runtime.TaskOOMEventTopic return runtime.TaskOOMEventTopic
case *eventsapi.TaskExit: case *eventstypes.TaskExit:
return runtime.TaskExitEventTopic return runtime.TaskExitEventTopic
case *eventsapi.TaskDelete: case *eventstypes.TaskDelete:
return runtime.TaskDeleteEventTopic return runtime.TaskDeleteEventTopic
case *eventsapi.TaskExecAdded: case *eventstypes.TaskExecAdded:
return runtime.TaskExecAddedEventTopic return runtime.TaskExecAddedEventTopic
case *eventsapi.TaskExecStarted: case *eventstypes.TaskExecStarted:
return runtime.TaskExecStartedEventTopic return runtime.TaskExecStartedEventTopic
case *eventsapi.TaskPaused: case *eventstypes.TaskPaused:
return runtime.TaskPausedEventTopic return runtime.TaskPausedEventTopic
case *eventsapi.TaskResumed: case *eventstypes.TaskResumed:
return runtime.TaskResumedEventTopic return runtime.TaskResumedEventTopic
case *eventsapi.TaskCheckpointed: case *eventstypes.TaskCheckpointed:
return runtime.TaskCheckpointedEventTopic return runtime.TaskCheckpointedEventTopic
default: default:
logrus.Warnf("no topic for type %#v", e) logrus.Warnf("no topic for type %#v", e)

10
linux/task.go
View File

@ -9,7 +9,7 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
"github.com/containerd/cgroups" "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/api/types/task"
"github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/events/exchange" "github.com/containerd/containerd/events/exchange"
@ -90,7 +90,7 @@ func (t *Task) Start(ctx context.Context) error {
return err return err
} }
} }
t.events.Publish(ctx, runtime.TaskStartEventTopic, &eventsapi.TaskStart{ t.events.Publish(ctx, runtime.TaskStartEventTopic, &eventstypes.TaskStart{
ContainerID: t.id, ContainerID: t.id,
Pid: uint32(t.pid), 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 { if _, err := t.shim.Pause(ctx, empty); err != nil {
return errdefs.FromGRPC(err) return errdefs.FromGRPC(err)
} }
t.events.Publish(ctx, runtime.TaskPausedEventTopic, &eventsapi.TaskPaused{ t.events.Publish(ctx, runtime.TaskPausedEventTopic, &eventstypes.TaskPaused{
ContainerID: t.id, ContainerID: t.id,
}) })
return nil return nil
@ -149,7 +149,7 @@ func (t *Task) Resume(ctx context.Context) error {
if _, err := t.shim.Resume(ctx, empty); err != nil { if _, err := t.shim.Resume(ctx, empty); err != nil {
return errdefs.FromGRPC(err) return errdefs.FromGRPC(err)
} }
t.events.Publish(ctx, runtime.TaskResumedEventTopic, &eventsapi.TaskResumed{ t.events.Publish(ctx, runtime.TaskResumedEventTopic, &eventstypes.TaskResumed{
ContainerID: t.id, ContainerID: t.id,
}) })
return nil 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 { if _, err := t.shim.Checkpoint(ctx, r); err != nil {
return errdefs.FromGRPC(err) return errdefs.FromGRPC(err)
} }
t.events.Publish(ctx, runtime.TaskCheckpointedEventTopic, &eventsapi.TaskCheckpointed{ t.events.Publish(ctx, runtime.TaskCheckpointedEventTopic, &eventstypes.TaskCheckpointed{
ContainerID: t.id, ContainerID: t.id,
}) })
return nil return nil

4
metrics/cgroups/cgroups.go
View File

@ -4,7 +4,7 @@ package cgroups
import ( import (
"github.com/containerd/cgroups" "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/events"
"github.com/containerd/containerd/linux" "github.com/containerd/containerd/linux"
"github.com/containerd/containerd/log" "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) { func (m *cgroupsMonitor) trigger(id, namespace string, cg cgroups.Cgroup) {
ctx := namespaces.WithNamespace(m.context, namespace) 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, ContainerID: id,
}); err != nil { }); err != nil {
log.G(m.context).WithError(err).Error("post OOM event") log.G(m.context).WithError(err).Error("post OOM event")

10
services/containers/service.go
View File

@ -2,8 +2,8 @@ package containers
import ( import (
"github.com/boltdb/bolt" "github.com/boltdb/bolt"
eventstypes "github.com/containerd/containerd/api/events"
api "github.com/containerd/containerd/api/services/containers/v1" 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/containers"
"github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/events" "github.com/containerd/containerd/events"
@ -95,10 +95,10 @@ func (s *service) Create(ctx context.Context, req *api.CreateContainerRequest) (
}); err != nil { }); err != nil {
return &resp, errdefs.ToGRPC(err) 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, ID: resp.Container.ID,
Image: resp.Container.Image, Image: resp.Container.Image,
Runtime: &eventsapi.ContainerCreate_Runtime{ Runtime: &eventstypes.ContainerCreate_Runtime{
Name: resp.Container.Runtime.Name, Name: resp.Container.Runtime.Name,
Options: resp.Container.Runtime.Options, Options: resp.Container.Runtime.Options,
}, },
@ -137,7 +137,7 @@ func (s *service) Update(ctx context.Context, req *api.UpdateContainerRequest) (
return &resp, errdefs.ToGRPC(err) 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, ID: resp.Container.ID,
Image: resp.Container.Image, Image: resp.Container.Image,
Labels: resp.Container.Labels, Labels: resp.Container.Labels,
@ -156,7 +156,7 @@ func (s *service) Delete(ctx context.Context, req *api.DeleteContainerRequest) (
return &empty.Empty{}, errdefs.ToGRPC(err) 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, ID: req.ID,
}); err != nil { }); err != nil {
return &empty.Empty{}, err return &empty.Empty{}, err

4
services/content/service.go
View File

@ -4,8 +4,8 @@ import (
"io" "io"
"sync" "sync"
eventstypes "github.com/containerd/containerd/api/events"
api "github.com/containerd/containerd/api/services/content/v1" 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/content"
"github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/events" "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) 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, Digest: req.Digest,
}); err != nil { }); err != nil {
return nil, err return nil, err

8
services/images/service.go
View File

@ -2,7 +2,7 @@ package images
import ( import (
"github.com/boltdb/bolt" "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" imagesapi "github.com/containerd/containerd/api/services/images/v1"
"github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/events" "github.com/containerd/containerd/events"
@ -101,7 +101,7 @@ func (s *service) Create(ctx context.Context, req *imagesapi.CreateImageRequest)
return nil, errdefs.ToGRPC(err) 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, Name: resp.Image.Name,
Labels: resp.Image.Labels, Labels: resp.Image.Labels,
}); err != nil { }); err != nil {
@ -140,7 +140,7 @@ func (s *service) Update(ctx context.Context, req *imagesapi.UpdateImageRequest)
return nil, errdefs.ToGRPC(err) 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, Name: resp.Image.Name,
Labels: resp.Image.Labels, Labels: resp.Image.Labels,
}); err != nil { }); err != nil {
@ -157,7 +157,7 @@ func (s *service) Delete(ctx context.Context, req *imagesapi.DeleteImageRequest)
return nil, err 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, Name: req.Name,
}); err != nil { }); err != nil {
return nil, err return nil, err

8
services/namespaces/service.go
View File

@ -4,7 +4,7 @@ import (
"strings" "strings"
"github.com/boltdb/bolt" "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" api "github.com/containerd/containerd/api/services/namespaces/v1"
"github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/events" "github.com/containerd/containerd/events"
@ -119,7 +119,7 @@ func (s *service) Create(ctx context.Context, req *api.CreateNamespaceRequest) (
return &resp, err 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, Name: req.Namespace.Name,
Labels: req.Namespace.Labels, Labels: req.Namespace.Labels,
}); err != nil { }); err != nil {
@ -172,7 +172,7 @@ func (s *service) Update(ctx context.Context, req *api.UpdateNamespaceRequest) (
return &resp, err 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, Name: req.Namespace.Name,
Labels: req.Namespace.Labels, Labels: req.Namespace.Labels,
}); err != nil { }); 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 // set the namespace in the context before publishing the event
ctx = namespaces.WithNamespace(ctx, req.Name) 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, Name: req.Name,
}); err != nil { }); err != nil {
return &empty.Empty{}, err return &empty.Empty{}, err

8
services/snapshot/service.go
View File

@ -3,7 +3,7 @@ package snapshot
import ( import (
gocontext "context" 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" snapshotapi "github.com/containerd/containerd/api/services/snapshot/v1"
"github.com/containerd/containerd/api/types" "github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/errdefs"
@ -81,7 +81,7 @@ func (s *service) Prepare(ctx context.Context, pr *snapshotapi.PrepareSnapshotRe
return nil, errdefs.ToGRPC(err) 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, Key: pr.Key,
Parent: pr.Parent, Parent: pr.Parent,
}); err != nil { }); err != nil {
@ -142,7 +142,7 @@ func (s *service) Commit(ctx context.Context, cr *snapshotapi.CommitSnapshotRequ
return nil, errdefs.ToGRPC(err) 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, Key: cr.Key,
Name: cr.Name, Name: cr.Name,
}); err != nil { }); err != nil {
@ -162,7 +162,7 @@ func (s *service) Remove(ctx context.Context, rr *snapshotapi.RemoveSnapshotRequ
return nil, errdefs.ToGRPC(err) 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, Key: rr.Key,
}); err != nil { }); err != nil {
return nil, err return nil, err

4
windows/process.go
View File

@ -10,7 +10,7 @@ import (
"time" "time"
"github.com/Microsoft/hcsshim" "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/errdefs"
"github.com/containerd/containerd/log" "github.com/containerd/containerd/log"
"github.com/containerd/containerd/runtime" "github.com/containerd/containerd/runtime"
@ -186,7 +186,7 @@ func (p *process) Start(ctx context.Context) (err error) {
p.task.publisher.Publish(ctx, p.task.publisher.Publish(ctx,
runtime.TaskExitEventTopic, runtime.TaskExitEventTopic,
&eventsapi.TaskExit{ &eventstypes.TaskExit{
ContainerID: p.task.id, ContainerID: p.task.id,
ID: p.id, ID: p.id,
Pid: p.pid, Pid: p.pid,

8
windows/runtime.go
View File

@ -11,7 +11,7 @@ import (
"github.com/Microsoft/hcsshim" "github.com/Microsoft/hcsshim"
"github.com/boltdb/bolt" "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" containerdtypes "github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/events" "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, r.publisher.Publish(ctx,
runtime.TaskDeleteEventTopic, runtime.TaskDeleteEventTopic,
&eventsapi.TaskDelete{ &eventstypes.TaskDelete{
ContainerID: wt.id, ContainerID: wt.id,
Pid: wt.pid, Pid: wt.pid,
ExitStatus: rtExit.Status, ExitStatus: rtExit.Status,
@ -322,9 +322,9 @@ func (r *windowsRuntime) newTask(ctx context.Context, namespace, id string, spec
r.publisher.Publish(ctx, r.publisher.Publish(ctx,
runtime.TaskCreateEventTopic, runtime.TaskCreateEventTopic,
&eventsapi.TaskCreate{ &eventstypes.TaskCreate{
ContainerID: id, ContainerID: id,
IO: &eventsapi.TaskIO{ IO: &eventstypes.TaskIO{
Stdin: io.Stdin, Stdin: io.Stdin,
Stdout: io.Stdout, Stdout: io.Stdout,
Stderr: io.Stderr, Stderr: io.Stderr,

10
windows/task.go
View File

@ -8,7 +8,7 @@ import (
"time" "time"
"github.com/Microsoft/hcsshim" "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/errdefs"
"github.com/containerd/containerd/events" "github.com/containerd/containerd/events"
"github.com/containerd/containerd/runtime" "github.com/containerd/containerd/runtime"
@ -126,7 +126,7 @@ func (t *task) Start(ctx context.Context) error {
} }
t.publisher.Publish(ctx, t.publisher.Publish(ctx,
runtime.TaskStartEventTopic, runtime.TaskStartEventTopic,
&eventsapi.TaskStart{ &eventstypes.TaskStart{
ContainerID: t.id, ContainerID: t.id,
Pid: t.pid, Pid: t.pid,
}) })
@ -143,7 +143,7 @@ func (t *task) Pause(ctx context.Context) error {
t.publisher.Publish(ctx, t.publisher.Publish(ctx,
runtime.TaskPausedEventTopic, runtime.TaskPausedEventTopic,
&eventsapi.TaskPaused{ &eventstypes.TaskPaused{
ContainerID: t.id, ContainerID: t.id,
}) })
return nil return nil
@ -164,7 +164,7 @@ func (t *task) Resume(ctx context.Context) error {
t.publisher.Publish(ctx, t.publisher.Publish(ctx,
runtime.TaskResumedEventTopic, runtime.TaskResumedEventTopic,
&eventsapi.TaskResumed{ &eventstypes.TaskResumed{
ContainerID: t.id, ContainerID: t.id,
}) })
return nil return nil
@ -206,7 +206,7 @@ func (t *task) Exec(ctx context.Context, id string, opts runtime.ExecOpts) (runt
t.publisher.Publish(ctx, t.publisher.Publish(ctx,
runtime.TaskExecAddedEventTopic, runtime.TaskExecAddedEventTopic,
&eventsapi.TaskExecAdded{ &eventstypes.TaskExecAdded{
ContainerID: t.id, ContainerID: t.id,
ExecID: id, ExecID: id,
}) })