From 03f3f420557f20ac55445d1b68c38a25dfd4498b Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Fri, 15 Apr 2016 17:15:26 -0700 Subject: [PATCH] Godeps: Update rkt to v1.4.0 --- Godeps/Godeps.json | 4 +- .../coreos/rkt/api/v1alpha/README.md | 10 + .../coreos/rkt/api/v1alpha/api.pb.go | 199 ++++++++++-------- .../coreos/rkt/api/v1alpha/api.proto | 22 +- 4 files changed, 139 insertions(+), 96 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index e50b942c51a..77a8ea8903a 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -391,8 +391,8 @@ }, { "ImportPath": "github.com/coreos/rkt/api/v1alpha", - "Comment": "v1.2.1-24-ge568957", - "Rev": "e56895779706097a5fdfc7099003d105cc325638" + "Comment": "v1.4.0", + "Rev": "f5b69782d120a7ae5ada8f2ebad97a014a98ebd5" }, { "ImportPath": "github.com/cpuguy83/go-md2man/md2man", diff --git a/Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/README.md b/Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/README.md index 738ae2e7617..f8c292c1f30 100644 --- a/Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/README.md +++ b/Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/README.md @@ -9,3 +9,13 @@ For more information, see: - #1359 - #1468 - [API Service Subcommand](../../Documentation/subcommands/api-service.md) + +## Protobuf + +The rkt gRPC API uses Protocol Buffers for its services. +In order to rebuild the generated code make sure you have protobuf 3.0.0 installed (https://github.com/google/protobuf) +and execute from the top-level directory: + +``` +$ make protobuf +``` diff --git a/Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/api.pb.go b/Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/api.pb.go index 06e8d7bfaaa..d801049bec0 100644 --- a/Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/api.pb.go +++ b/Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/api.pb.go @@ -338,6 +338,18 @@ type Pod struct { Manifest []byte `protobuf:"bytes,6,opt,name=manifest,proto3" json:"manifest,omitempty"` // Annotations on this pod. Annotations []*KeyValue `protobuf:"bytes,7,rep,name=annotations" json:"annotations,omitempty"` + // Cgroup of the pod, empty if the pod is not running. + Cgroup string `protobuf:"bytes,8,opt,name=cgroup" json:"cgroup,omitempty"` + // Timestamp of when the pod is created, nanoseconds since epoch. + // Zero if the pod is not created. + CreatedAt int64 `protobuf:"varint,9,opt,name=created_at" json:"created_at,omitempty"` + // Timestamp of when the pod is started, nanoseconds since epoch. + // Zero if the pod is not started. + StartedAt int64 `protobuf:"varint,10,opt,name=started_at" json:"started_at,omitempty"` + // Timestamp of when the pod is moved to exited-garbage/garbage, + // in nanoseconds since epoch. + // Zero if the pod is not moved to exited-garbage/garbage yet. + GcMarkedAt int64 `protobuf:"varint,11,opt,name=gc_marked_at" json:"gc_marked_at,omitempty"` } func (m *Pod) Reset() { *m = Pod{} } @@ -393,6 +405,8 @@ type PodFilter struct { NetworkNames []string `protobuf:"bytes,5,rep,name=network_names" json:"network_names,omitempty"` // If not empty, the pods that have all of the annotations will be returned. Annotations []*KeyValue `protobuf:"bytes,6,rep,name=annotations" json:"annotations,omitempty"` + // If not empty, the pods whose cgroup are listed will be returned. + Cgroups []string `protobuf:"bytes,7,rep,name=cgroups" json:"cgroups,omitempty"` } func (m *PodFilter) Reset() { *m = PodFilter{} } @@ -1124,95 +1138,98 @@ var _PublicAPI_serviceDesc = grpc.ServiceDesc{ } var fileDescriptor0 = []byte{ - // 1430 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x57, 0xdb, 0x6e, 0xdb, 0x46, - 0x13, 0x8e, 0x0e, 0xd4, 0x61, 0xa4, 0xc8, 0xd2, 0xda, 0x89, 0x65, 0xe5, 0xe4, 0xf0, 0xff, 0x1b, - 0xa4, 0xbe, 0x70, 0x5b, 0x27, 0xcd, 0x4d, 0x81, 0x22, 0x8a, 0x4d, 0x1b, 0x6a, 0x6c, 0x49, 0x50, - 0x94, 0xa0, 0xb9, 0x22, 0x68, 0x69, 0xe5, 0x10, 0xa1, 0x48, 0x96, 0xa4, 0x9c, 0xb8, 0x97, 0x7d, - 0x81, 0x3e, 0x42, 0xfb, 0x16, 0x05, 0x7a, 0xd3, 0x77, 0x29, 0xd0, 0xf7, 0xe8, 0xec, 0x72, 0x49, - 0x2e, 0x29, 0xea, 0xa2, 0x77, 0xe6, 0xcc, 0xec, 0x37, 0xdf, 0xcc, 0xce, 0x7c, 0x2b, 0x43, 0xdd, - 0x70, 0xcd, 0x43, 0xd7, 0x73, 0x02, 0x87, 0x54, 0xaf, 0xbf, 0x31, 0x2c, 0xf7, 0x83, 0xa1, 0xbe, - 0x84, 0xc6, 0x60, 0x69, 0x5c, 0xd1, 0x53, 0xc7, 0x5b, 0x1a, 0x01, 0xd9, 0x87, 0x72, 0x70, 0xe3, - 0xd2, 0x6e, 0x61, 0xbf, 0xf0, 0xb4, 0x75, 0x44, 0x0e, 0x45, 0xd8, 0x21, 0x8f, 0x99, 0xa2, 0x87, - 0x6c, 0x41, 0xf5, 0x9a, 0x7a, 0xbe, 0xe9, 0xd8, 0xdd, 0x22, 0x06, 0xd5, 0xd5, 0xbf, 0x0a, 0xa0, - 0x70, 0x37, 0xf9, 0x12, 0x1a, 0x97, 0x86, 0x4f, 0xf5, 0x05, 0xc7, 0xe2, 0x18, 0x8d, 0xa3, 0x9d, - 0x34, 0x86, 0xc8, 0x03, 0x50, 0x34, 0xe7, 0x21, 0x00, 0x69, 0x42, 0xd9, 0x36, 0x96, 0xb4, 0x5b, - 0xe2, 0x5f, 0x12, 0x7e, 0x99, 0x1b, 0xba, 0xd0, 0x36, 0x97, 0xae, 0xe3, 0x05, 0x7a, 0x60, 0x2e, - 0xa9, 0x1f, 0x18, 0x4b, 0xb7, 0xab, 0xa0, 0xa7, 0x44, 0xda, 0x50, 0x5b, 0x1a, 0xb6, 0xb9, 0x40, - 0x63, 0xb7, 0x82, 0x96, 0x26, 0x83, 0xf2, 0xcd, 0x9f, 0x69, 0xb7, 0xca, 0xfd, 0x4f, 0xa0, 0x61, - 0xd8, 0xb6, 0x13, 0x18, 0x01, 0xa2, 0xf9, 0xdd, 0xda, 0x7e, 0x09, 0xf9, 0x74, 0x62, 0x3e, 0xaf, - 0xe9, 0xcd, 0x3b, 0xc3, 0x5a, 0x51, 0xf5, 0x19, 0x54, 0x87, 0x34, 0xf8, 0xe4, 0x78, 0x1f, 0x63, - 0x2e, 0x85, 0x88, 0x99, 0xe9, 0x5e, 0x3f, 0x4f, 0x78, 0xe2, 0xd7, 0x8b, 0x90, 0xa7, 0xfa, 0x6b, - 0x01, 0x4a, 0x7d, 0xd7, 0xcd, 0x9c, 0x78, 0x00, 0x8a, 0xc9, 0xca, 0xe4, 0x47, 0x1a, 0x47, 0xad, - 0x74, 0xf1, 0xd8, 0x5e, 0x05, 0x0b, 0x08, 0xc2, 0x5a, 0x5b, 0x12, 0x17, 0x44, 0x7a, 0xc3, 0x1c, - 0xa4, 0x03, 0x75, 0xfa, 0xd9, 0x0c, 0xf4, 0x99, 0x33, 0xa7, 0xbc, 0x01, 0x9d, 0x6c, 0x19, 0xca, - 0xa6, 0x32, 0xfe, 0x44, 0x46, 0x63, 0x67, 0x2e, 0x7a, 0x1b, 0xf2, 0x69, 0x40, 0xc9, 0x15, 0x8d, - 0xee, 0x6c, 0xce, 0x8e, 0xa7, 0xc2, 0xec, 0x3d, 0x28, 0x1b, 0xae, 0xeb, 0x63, 0x62, 0x96, 0xa3, - 0x29, 0xd3, 0x23, 0x2a, 0xd4, 0xec, 0xb0, 0x4b, 0x11, 0x87, 0x76, 0xec, 0x8f, 0xda, 0xb7, 0x7e, - 0x23, 0x19, 0xf2, 0xd5, 0x4d, 0xe4, 0x9f, 0x40, 0x2d, 0xfa, 0x9b, 0x91, 0xc6, 0xbf, 0x45, 0x05, - 0xb7, 0x41, 0xb9, 0x66, 0x56, 0x31, 0x6d, 0xbf, 0x17, 0xa0, 0x8e, 0x74, 0x4f, 0x4d, 0x2b, 0xa0, - 0x1e, 0x8b, 0x34, 0xe7, 0x3e, 0x46, 0x96, 0x30, 0xf2, 0x31, 0x54, 0x78, 0x79, 0x3e, 0x86, 0x96, - 0xf2, 0xeb, 0xeb, 0xb0, 0x1d, 0x70, 0x75, 0x76, 0x61, 0x3e, 0x76, 0x81, 0x9d, 0x42, 0x13, 0xbf, - 0x31, 0x9d, 0x01, 0x95, 0xb9, 0xe9, 0x0e, 0xdc, 0x16, 0x95, 0x8a, 0x48, 0x85, 0x9b, 0x33, 0xa5, - 0x54, 0x36, 0x95, 0xf2, 0x77, 0x21, 0xda, 0xa9, 0x1c, 0x92, 0xd8, 0x21, 0xd7, 0xa3, 0x0b, 0xf3, - 0xb3, 0xa0, 0x59, 0x27, 0x78, 0x5f, 0x7c, 0x6b, 0x64, 0x52, 0x18, 0xf5, 0x91, 0xde, 0x20, 0x83, - 0x98, 0x13, 0x16, 0x67, 0x19, 0x97, 0xd4, 0xda, 0x7c, 0xff, 0xe4, 0x2e, 0xb4, 0xc2, 0x45, 0xa1, - 0x73, 0xdd, 0x58, 0x60, 0x66, 0x7e, 0x05, 0x25, 0xb2, 0x0b, 0x5b, 0xb1, 0xfd, 0x92, 0xe2, 0x72, - 0xfe, 0xc7, 0xfd, 0x60, 0x0c, 0x17, 0x2b, 0xcb, 0x12, 0x0c, 0xeb, 0x8c, 0x8f, 0xfa, 0x1b, 0x16, - 0x79, 0x66, 0x39, 0x97, 0x86, 0x75, 0x6a, 0x19, 0x57, 0x3e, 0x2b, 0x72, 0x6e, 0x7a, 0xe2, 0xce, - 0xf6, 0xa0, 0xe3, 0xdf, 0xf8, 0x01, 0x5d, 0xe2, 0x18, 0xdb, 0x0b, 0xf3, 0x4a, 0x67, 0xae, 0x62, - 0xb4, 0xcd, 0x96, 0x33, 0x33, 0x2c, 0xd9, 0x13, 0x2e, 0x3e, 0xd2, 0x5c, 0xf9, 0xd4, 0x93, 0x1d, - 0xa1, 0x00, 0xb0, 0xba, 0x6c, 0x9f, 0xce, 0x56, 0x1e, 0x4a, 0x0b, 0x4b, 0xc6, 0xd7, 0x9f, 0xed, - 0xda, 0x9d, 0xc0, 0x5b, 0xf9, 0x81, 0x8e, 0xad, 0xf2, 0xf5, 0x85, 0xe7, 0x2c, 0xf5, 0x0f, 0x41, - 0xe0, 0xfa, 0xbc, 0xec, 0x9a, 0xea, 0x41, 0x79, 0x60, 0x2f, 0x1c, 0xb2, 0x0d, 0x0d, 0xef, 0x63, - 0xa0, 0x47, 0xa2, 0x12, 0x32, 0xdc, 0x81, 0x26, 0x0e, 0xc2, 0x4c, 0x4f, 0x49, 0x19, 0x0b, 0x45, - 0x89, 0x8c, 0x8d, 0x21, 0xaf, 0x03, 0x68, 0x5e, 0xf1, 0x42, 0x45, 0xf2, 0x72, 0x46, 0xd6, 0xa4, - 0x2e, 0x60, 0x4e, 0x45, 0xbb, 0xa6, 0xf6, 0x66, 0x1d, 0xe5, 0x5e, 0xae, 0xa3, 0x19, 0x05, 0x64, - 0xf4, 0x45, 0x42, 0xfc, 0x62, 0x4a, 0xc7, 0x13, 0x95, 0xc8, 0x23, 0x28, 0xcf, 0x8d, 0xc0, 0xd8, - 0xbc, 0xf6, 0x01, 0x34, 0x38, 0xaa, 0x98, 0xb6, 0xc7, 0xa0, 0xb0, 0xcc, 0xe1, 0xbc, 0xe5, 0xa7, - 0x16, 0x03, 0x19, 0x8e, 0x1f, 0xee, 0x97, 0x3c, 0x79, 0xc8, 0xcb, 0x37, 0xed, 0x19, 0xd5, 0x25, - 0x0a, 0x68, 0x5b, 0xd9, 0x81, 0x69, 0x85, 0x36, 0xae, 0xbd, 0x6a, 0x1b, 0x5a, 0x67, 0x34, 0x60, - 0x0d, 0x9e, 0xd0, 0x9f, 0x56, 0xb8, 0xef, 0xea, 0x21, 0x6c, 0xc5, 0x16, 0xdf, 0xc5, 0x81, 0xa2, - 0xe4, 0x1e, 0x2a, 0x26, 0x7e, 0x8b, 0x97, 0xe0, 0x76, 0x22, 0x86, 0x68, 0x54, 0x4f, 0x61, 0xeb, - 0xdc, 0xf4, 0x03, 0xdc, 0x4d, 0x5f, 0x40, 0x90, 0xff, 0x41, 0x75, 0xc1, 0xab, 0x08, 0xd9, 0x37, - 0x24, 0xf6, 0xc9, 0xce, 0xb7, 0xa0, 0x32, 0xa7, 0x81, 0x61, 0x5a, 0xbc, 0x79, 0x35, 0xcc, 0xdb, - 0x4e, 0x70, 0x44, 0x62, 0xd4, 0x31, 0xd7, 0x99, 0x47, 0x28, 0x4d, 0x19, 0x45, 0x7d, 0x04, 0x9d, - 0x81, 0xed, 0xbb, 0x74, 0xc6, 0x8e, 0x44, 0x99, 0x25, 0xcd, 0x54, 0xbf, 0x02, 0x22, 0x07, 0x08, - 0xc8, 0x3d, 0x54, 0x52, 0x67, 0x2e, 0x4a, 0x49, 0x23, 0xfe, 0x00, 0x1d, 0xc6, 0x80, 0xef, 0x7c, - 0x5c, 0xcb, 0x17, 0xd9, 0x5a, 0xb2, 0x0f, 0x61, 0x7e, 0x35, 0xcf, 0x81, 0xc8, 0x58, 0x22, 0xf9, - 0x43, 0xa8, 0x70, 0x91, 0x8a, 0xb0, 0x32, 0xef, 0x8a, 0xfa, 0x18, 0xb6, 0x05, 0x65, 0xfe, 0x9d, - 0x57, 0xd5, 0xb7, 0xb0, 0x93, 0x0e, 0x11, 0xd0, 0xf1, 0x8b, 0x55, 0xc8, 0x7b, 0xb1, 0xd4, 0xef, - 0x60, 0x9b, 0xf1, 0xa1, 0x36, 0x1f, 0x9f, 0xb8, 0xba, 0xff, 0x43, 0x25, 0xac, 0x6e, 0xed, 0x95, - 0x97, 0x66, 0x51, 0x7d, 0x01, 0x3b, 0xe9, 0xc3, 0x49, 0x39, 0x94, 0x5b, 0xd6, 0xca, 0xe1, 0x81, - 0xea, 0x0d, 0x1f, 0xae, 0x73, 0xe7, 0x2a, 0xce, 0x87, 0x6d, 0xc2, 0xee, 0xeb, 0xf1, 0xbb, 0x86, - 0x02, 0x19, 0x09, 0xb9, 0xd8, 0x21, 0x9c, 0x63, 0xcb, 0xb4, 0xf9, 0x1c, 0x17, 0x9e, 0x2a, 0xec, - 0xc0, 0xc2, 0xb1, 0x2c, 0xe7, 0x13, 0x9f, 0xe1, 0x5a, 0x66, 0xae, 0x95, 0x9c, 0xb9, 0xe6, 0x62, - 0xa9, 0xee, 0xf3, 0x29, 0x0e, 0x53, 0x0b, 0xb6, 0x31, 0x32, 0x57, 0xf0, 0x03, 0x0a, 0xf5, 0xe4, - 0xd7, 0x50, 0x17, 0xbb, 0x7a, 0xd1, 0x3f, 0xd3, 0xf4, 0xe9, 0xfb, 0xb1, 0xa6, 0xbf, 0x1d, 0x9e, - 0x68, 0xa7, 0x83, 0xa1, 0x76, 0xd2, 0xbe, 0x85, 0x5a, 0xb2, 0x25, 0x79, 0xfa, 0xe3, 0xf1, 0x71, - 0xbb, 0x80, 0x2f, 0x4b, 0x47, 0x32, 0x9e, 0x8c, 0x8e, 0x5f, 0x6b, 0x93, 0x76, 0x11, 0x89, 0xb4, - 0x24, 0xf3, 0xe8, 0x78, 0xd0, 0x2e, 0x1d, 0x8c, 0xa1, 0x16, 0xff, 0x28, 0xd8, 0x85, 0x6d, 0x04, - 0xd0, 0xdf, 0x4c, 0xfb, 0xd3, 0x74, 0x12, 0xc4, 0x4b, 0x1c, 0x93, 0xb7, 0xc3, 0xe1, 0x60, 0x78, - 0x86, 0x69, 0x76, 0xa0, 0x9d, 0x98, 0xb5, 0x1f, 0x07, 0x53, 0x0c, 0x2e, 0x1e, 0xfc, 0x53, 0x80, - 0x5a, 0xfc, 0x12, 0x22, 0xe4, 0x78, 0x74, 0x92, 0x03, 0x89, 0x67, 0x13, 0x87, 0x76, 0xf1, 0x6a, - 0xf2, 0x7e, 0x84, 0x88, 0xa9, 0xf0, 0xf1, 0x44, 0x1b, 0xf7, 0x27, 0x2c, 0x55, 0x11, 0xc5, 0x99, - 0x64, 0x1d, 0x08, 0x53, 0x62, 0xcc, 0x12, 0x7b, 0xc4, 0xac, 0x8c, 0xd3, 0xb6, 0x97, 0x98, 0xfb, - 0xaf, 0x46, 0x13, 0xa4, 0x16, 0x1d, 0x6b, 0x2b, 0x99, 0xe4, 0x21, 0xf1, 0x4a, 0x3a, 0xc7, 0x89, - 0x76, 0xae, 0x4d, 0x19, 0x58, 0x35, 0x9d, 0xe3, 0xac, 0x3f, 0x79, 0x85, 0x2d, 0x6c, 0xd7, 0x0e, - 0xfe, 0x28, 0x42, 0x3d, 0x11, 0x3b, 0xbc, 0x21, 0xed, 0x9d, 0x36, 0x9c, 0xae, 0xdf, 0xd0, 0x3d, - 0xd8, 0x95, 0x3c, 0x0c, 0x29, 0xe6, 0x5f, 0xc0, 0x5f, 0x3b, 0x0f, 0xf3, 0x9d, 0x11, 0x6b, 0xac, - 0xbd, 0x07, 0x77, 0x33, 0x31, 0x48, 0x85, 0xfb, 0x4a, 0x28, 0x17, 0x77, 0x32, 0x3e, 0x51, 0x4e, - 0x19, 0x77, 0x67, 0x3f, 0xe3, 0x12, 0xdc, 0xf5, 0xe3, 0xd1, 0xf9, 0xb9, 0x76, 0xcc, 0xa2, 0x94, - 0x0c, 0xb8, 0xb8, 0xce, 0x49, 0xd8, 0x90, 0x34, 0x38, 0xf3, 0x09, 0xf0, 0x2a, 0x6b, 0xb0, 0xe4, - 0x0a, 0xa7, 0x6a, 0x70, 0x31, 0x0e, 0x29, 0xd7, 0xc8, 0x7d, 0xe8, 0xae, 0xb9, 0x27, 0xda, 0xc5, - 0xe8, 0x1d, 0x7a, 0xeb, 0x47, 0xbf, 0x94, 0xf1, 0xc7, 0xd5, 0xea, 0xd2, 0x32, 0x67, 0xfd, 0xf1, - 0x80, 0x7c, 0x0f, 0x55, 0x21, 0xe8, 0x64, 0x37, 0x79, 0xed, 0x52, 0xa2, 0xdf, 0xeb, 0xae, 0x3b, - 0xc2, 0xad, 0x51, 0x6f, 0x91, 0x3e, 0xd4, 0x22, 0x61, 0x26, 0x49, 0x5c, 0x46, 0xf3, 0x7b, 0x7b, - 0x39, 0x9e, 0x18, 0xe2, 0x0c, 0x20, 0x91, 0x62, 0xd2, 0x93, 0x1e, 0x90, 0x8c, 0x80, 0xf7, 0xee, - 0xe5, 0xfa, 0x64, 0xa0, 0x44, 0x56, 0x25, 0xa0, 0x35, 0xdd, 0x96, 0x80, 0xd6, 0x75, 0x18, 0x81, - 0x2e, 0xa0, 0x29, 0xcb, 0x28, 0xb9, 0x9f, 0xcd, 0x2b, 0x0b, 0x70, 0xef, 0xc1, 0x06, 0x6f, 0x0c, - 0x37, 0x82, 0xa6, 0xac, 0x90, 0x12, 0x5c, 0x8e, 0xea, 0x4a, 0x70, 0x79, 0xb2, 0xaa, 0xde, 0xfa, - 0xba, 0x40, 0x5e, 0xf2, 0x4b, 0x63, 0xfa, 0x95, 0xbe, 0x34, 0x49, 0x4c, 0xd3, 0x97, 0x26, 0x4b, - 0x1d, 0x43, 0xb8, 0xac, 0xf0, 0xff, 0x10, 0x9f, 0xfd, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xca, 0x1c, - 0xe0, 0x93, 0x2e, 0x0e, 0x00, 0x00, + // 1481 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x57, 0xcd, 0x72, 0xdb, 0x46, + 0x12, 0x36, 0x7f, 0xc0, 0x9f, 0x26, 0x4d, 0x91, 0x23, 0xd9, 0xa2, 0xe8, 0x3f, 0x19, 0xbb, 0xeb, + 0xf2, 0xea, 0xa0, 0xdd, 0xc8, 0x8e, 0x2f, 0xa9, 0x4a, 0x99, 0x96, 0x20, 0x15, 0x63, 0x89, 0x64, + 0xd1, 0xb4, 0x2b, 0x3e, 0xa1, 0x20, 0x72, 0x28, 0xa3, 0x04, 0x02, 0x08, 0x00, 0xca, 0x56, 0x8e, + 0x39, 0xe5, 0x96, 0x47, 0xc8, 0x33, 0xe4, 0x94, 0x63, 0xde, 0x25, 0x55, 0x79, 0x8f, 0xf4, 0x0c, + 0x06, 0xc0, 0x00, 0x04, 0x0f, 0xb9, 0x89, 0xdd, 0x3d, 0x5f, 0x7f, 0xdd, 0xd3, 0xfd, 0x0d, 0x04, + 0x75, 0xc3, 0x35, 0x0f, 0x5d, 0xcf, 0x09, 0x1c, 0x52, 0xbd, 0xf9, 0xca, 0xb0, 0xdc, 0x4f, 0x86, + 0xfa, 0x1a, 0x1a, 0x83, 0xa5, 0x71, 0x45, 0x4f, 0x1d, 0x6f, 0x69, 0x04, 0x64, 0x1f, 0xca, 0xc1, + 0xad, 0x4b, 0xbb, 0x85, 0xfd, 0xc2, 0xf3, 0xd6, 0x11, 0x39, 0x14, 0x61, 0x87, 0x3c, 0x66, 0x8a, + 0x1e, 0xb2, 0x05, 0xd5, 0x1b, 0xea, 0xf9, 0xa6, 0x63, 0x77, 0x8b, 0x18, 0x54, 0x57, 0xff, 0x28, + 0x80, 0xc2, 0xdd, 0xe4, 0xbf, 0xd0, 0xb8, 0x34, 0x7c, 0xaa, 0x2f, 0x38, 0x16, 0xc7, 0x68, 0x1c, + 0xed, 0xa4, 0x31, 0x44, 0x1e, 0x80, 0xa2, 0x39, 0x0f, 0x01, 0x48, 0x13, 0xca, 0xb6, 0xb1, 0xa4, + 0xdd, 0x12, 0xff, 0x25, 0xe1, 0x97, 0xb9, 0xa1, 0x0b, 0x6d, 0x73, 0xe9, 0x3a, 0x5e, 0xa0, 0x07, + 0xe6, 0x92, 0xfa, 0x81, 0xb1, 0x74, 0xbb, 0x0a, 0x7a, 0x4a, 0xa4, 0x0d, 0xb5, 0xa5, 0x61, 0x9b, + 0x0b, 0x34, 0x76, 0x2b, 0x68, 0x69, 0x32, 0x28, 0xdf, 0xfc, 0x91, 0x76, 0xab, 0xdc, 0xff, 0x0c, + 0x1a, 0x86, 0x6d, 0x3b, 0x81, 0x11, 0x20, 0x9a, 0xdf, 0xad, 0xed, 0x97, 0x90, 0x4f, 0x27, 0xe6, + 0xf3, 0x96, 0xde, 0x7e, 0x30, 0xac, 0x15, 0x55, 0x5f, 0x40, 0x75, 0x48, 0x83, 0xcf, 0x8e, 0x77, + 0x1d, 0x73, 0x29, 0x44, 0xcc, 0x4c, 0xf7, 0xe6, 0x65, 0xc2, 0x13, 0x7f, 0xbd, 0x0a, 0x79, 0xaa, + 0xbf, 0x14, 0xa0, 0xd4, 0x77, 0xdd, 0xcc, 0x89, 0x47, 0xa0, 0x98, 0xac, 0x4c, 0x7e, 0xa4, 0x71, + 0xd4, 0x4a, 0x17, 0x8f, 0xed, 0x55, 0xb0, 0x80, 0x20, 0xac, 0xb5, 0x25, 0x71, 0x41, 0xa4, 0x77, + 0xcc, 0x41, 0x3a, 0x50, 0xa7, 0x5f, 0xcc, 0x40, 0x9f, 0x39, 0x73, 0xca, 0x1b, 0xd0, 0xc9, 0x96, + 0xa1, 0x6c, 0x2a, 0xe3, 0xe7, 0x22, 0x94, 0xc6, 0xce, 0x5c, 0xf4, 0x36, 0xe4, 0xd3, 0x80, 0x92, + 0x2b, 0x1a, 0xdd, 0xd9, 0x9c, 0x1d, 0x4f, 0x85, 0xd9, 0x7b, 0x50, 0x36, 0x5c, 0xd7, 0xc7, 0xc4, + 0x2c, 0x47, 0x53, 0xa6, 0x47, 0x54, 0xa8, 0xd9, 0x61, 0x97, 0x22, 0x0e, 0xed, 0xd8, 0x1f, 0xb5, + 0x6f, 0xfd, 0x46, 0x32, 0xe4, 0xab, 0x1b, 0xc8, 0x93, 0x16, 0x54, 0x66, 0x57, 0x9e, 0xb3, 0x72, + 0xf1, 0x9a, 0x18, 0x71, 0xac, 0x62, 0xe6, 0x51, 0xe4, 0x34, 0xd7, 0x71, 0x94, 0xea, 0xfc, 0x3e, + 0xd1, 0x86, 0xfc, 0x3d, 0x61, 0x03, 0x6e, 0xdb, 0x81, 0xe6, 0xd5, 0x4c, 0x5f, 0x1a, 0xde, 0x75, + 0x68, 0x6d, 0x30, 0xab, 0xfa, 0x0c, 0x6a, 0x31, 0x32, 0xb6, 0x00, 0xff, 0x16, 0xfd, 0xb8, 0x0b, + 0xca, 0x0d, 0xb3, 0x8a, 0xd9, 0xfd, 0xad, 0x00, 0x75, 0x2c, 0xfe, 0xd4, 0xb4, 0x02, 0xea, 0xb1, + 0x48, 0x73, 0xee, 0x63, 0x64, 0x09, 0x23, 0x9f, 0x42, 0x85, 0x37, 0xcb, 0xc7, 0xd0, 0x52, 0x7e, + 0xb7, 0x3a, 0x6c, 0xa3, 0x5c, 0x9d, 0x5d, 0xbf, 0x8f, 0x3d, 0x65, 0xa7, 0xd0, 0xc4, 0xef, 0x5f, + 0x67, 0x40, 0x65, 0x6e, 0xba, 0x07, 0x77, 0x45, 0xdf, 0x44, 0xa4, 0xc2, 0xcd, 0x99, 0xc6, 0x54, + 0x36, 0x35, 0x06, 0xf7, 0x21, 0x6c, 0x4c, 0xd8, 0xbc, 0xba, 0xfa, 0x67, 0x21, 0x5a, 0xd9, 0x1c, + 0xd6, 0x78, 0x01, 0xae, 0x47, 0x17, 0xe6, 0x17, 0xc1, 0x9b, 0x37, 0x92, 0x2f, 0xa5, 0xcc, 0x12, + 0xa3, 0xae, 0xe9, 0x2d, 0x52, 0x8a, 0x49, 0x62, 0xb5, 0x96, 0x71, 0x49, 0xad, 0xcd, 0xe3, 0x45, + 0xee, 0x43, 0x2b, 0xdc, 0x43, 0xd6, 0xe8, 0x05, 0x66, 0xe6, 0x37, 0x5c, 0x22, 0xbb, 0xb0, 0x15, + 0xdb, 0x2f, 0x29, 0xee, 0xfe, 0x3f, 0x5c, 0x3f, 0xc6, 0x70, 0xb1, 0xb2, 0x2c, 0xc1, 0xb0, 0xce, + 0x8b, 0xfc, 0x15, 0x8b, 0x3c, 0xb3, 0x9c, 0x4b, 0xc3, 0x3a, 0xb5, 0x8c, 0x2b, 0x9f, 0x15, 0x39, + 0x37, 0x3d, 0x71, 0x89, 0x7b, 0xd0, 0xf1, 0x6f, 0xfd, 0x80, 0x2e, 0x71, 0x4b, 0xec, 0x85, 0x79, + 0xa5, 0x33, 0x57, 0x31, 0x12, 0x0b, 0xcb, 0x99, 0x19, 0x96, 0xec, 0x09, 0x75, 0x05, 0x69, 0xae, + 0x7c, 0xea, 0xc9, 0x8e, 0x50, 0x5f, 0x58, 0x5d, 0xb6, 0x4f, 0x67, 0x2b, 0x0f, 0x95, 0x8b, 0x25, + 0xe3, 0xea, 0xc2, 0x56, 0xf9, 0x5e, 0xe0, 0xad, 0xfc, 0x40, 0xc7, 0x56, 0xf9, 0xfa, 0xc2, 0x73, + 0x96, 0xfa, 0xa7, 0x20, 0x70, 0x7d, 0x5e, 0x76, 0x4d, 0xf5, 0xa0, 0x3c, 0xb0, 0x17, 0x0e, 0xd9, + 0x86, 0x86, 0x77, 0x1d, 0xe8, 0x91, 0x66, 0x85, 0x0c, 0x71, 0x2a, 0x71, 0x32, 0x66, 0x7a, 0x4a, + 0x29, 0x59, 0x28, 0x2a, 0x70, 0x6c, 0x0c, 0x79, 0x1d, 0xe0, 0x00, 0xf3, 0x42, 0x45, 0xf2, 0x72, + 0x46, 0x35, 0xa5, 0x2e, 0x60, 0x4e, 0x45, 0xbb, 0xa1, 0xf6, 0x66, 0x99, 0xe6, 0x5e, 0x2e, 0xd3, + 0x19, 0x81, 0x65, 0xf4, 0x45, 0x42, 0xfc, 0xc5, 0x84, 0x94, 0x27, 0x2a, 0x91, 0x27, 0x50, 0x9e, + 0x1b, 0x81, 0xb1, 0x59, 0x55, 0x02, 0x68, 0x70, 0x54, 0x31, 0x6d, 0x4f, 0x41, 0x61, 0x99, 0xc3, + 0x79, 0xcb, 0x4f, 0x2d, 0x06, 0x32, 0x1c, 0x3f, 0x5c, 0x38, 0x79, 0xf2, 0xd8, 0x0a, 0x9b, 0xf6, + 0x8c, 0xea, 0x12, 0x05, 0xb4, 0xad, 0xec, 0xc0, 0xb4, 0x42, 0x1b, 0x97, 0x76, 0xb5, 0x0d, 0xad, + 0x33, 0x1a, 0xb0, 0x06, 0x4f, 0xe8, 0x0f, 0x2b, 0x94, 0x13, 0xf5, 0x10, 0xb6, 0x62, 0x8b, 0xef, + 0xe2, 0x40, 0x51, 0xf2, 0x00, 0x05, 0x19, 0x7f, 0x8b, 0x87, 0xe6, 0x6e, 0xa2, 0xb5, 0x68, 0x54, + 0x4f, 0x61, 0xeb, 0xdc, 0xf4, 0x03, 0x5c, 0x56, 0x5f, 0x40, 0x90, 0x7f, 0x41, 0x75, 0xc1, 0xab, + 0x08, 0xd9, 0x37, 0x24, 0xf6, 0x89, 0x08, 0xa0, 0x10, 0xcd, 0x69, 0x60, 0x98, 0x16, 0x6f, 0x5e, + 0x0d, 0xf3, 0xb6, 0x13, 0x1c, 0x91, 0x18, 0x65, 0xd2, 0x75, 0xe6, 0x11, 0x4a, 0x53, 0x46, 0x51, + 0x9f, 0x40, 0x67, 0x60, 0xfb, 0x2e, 0x9d, 0xb1, 0x23, 0x51, 0x66, 0x49, 0x92, 0xd5, 0xff, 0x01, + 0x91, 0x03, 0x04, 0xe4, 0x1e, 0x0a, 0xb5, 0x33, 0x17, 0xa5, 0xa4, 0x11, 0xbf, 0x83, 0x0e, 0x63, + 0xc0, 0x77, 0x3e, 0xae, 0xe5, 0x3f, 0xd9, 0x5a, 0xb2, 0xef, 0x6c, 0x7e, 0x35, 0x2f, 0x81, 0xc8, + 0x58, 0x22, 0xf9, 0x63, 0xa8, 0x70, 0xd5, 0x8a, 0xb0, 0x32, 0xcf, 0x96, 0xfa, 0x14, 0xb6, 0x05, + 0x65, 0xfe, 0x3b, 0xaf, 0xaa, 0xaf, 0x61, 0x27, 0x1d, 0x22, 0xa0, 0xe3, 0x07, 0xb1, 0x90, 0xf7, + 0x20, 0xaa, 0xdf, 0xc0, 0x36, 0xe3, 0x43, 0x6d, 0x3e, 0x3e, 0x71, 0x75, 0xff, 0x86, 0x4a, 0x58, + 0xdd, 0xda, 0x47, 0x84, 0x34, 0x8b, 0xea, 0x2b, 0xd8, 0x49, 0x1f, 0x4e, 0xca, 0xa1, 0xdc, 0xb2, + 0x56, 0x0e, 0x0f, 0x54, 0x6f, 0xf9, 0x70, 0x9d, 0x3b, 0x57, 0x71, 0x3e, 0x6c, 0x13, 0x76, 0x5f, + 0x8f, 0x9f, 0x4d, 0x14, 0xc8, 0x48, 0xd9, 0xc5, 0x0e, 0xe1, 0x1c, 0x5b, 0xa6, 0xcd, 0xe7, 0xb8, + 0xf0, 0x5c, 0x61, 0x07, 0x16, 0x8e, 0x65, 0x39, 0x9f, 0xf9, 0x0c, 0xd7, 0x32, 0x73, 0xad, 0xe4, + 0xcc, 0x35, 0x17, 0x4b, 0x75, 0x9f, 0x4f, 0x71, 0x98, 0x5a, 0xb0, 0x8d, 0x91, 0xb9, 0x82, 0x1f, + 0x50, 0xa8, 0x27, 0x1f, 0x5b, 0x5d, 0xec, 0xea, 0x45, 0xff, 0x4c, 0xd3, 0xa7, 0x1f, 0xc7, 0x9a, + 0xfe, 0x7e, 0x78, 0xa2, 0x9d, 0x0e, 0x86, 0xda, 0x49, 0xfb, 0x0e, 0x6a, 0xc9, 0x96, 0xe4, 0xe9, + 0x8f, 0xc7, 0xc7, 0xed, 0x02, 0x3e, 0x35, 0x1d, 0xc9, 0x78, 0x32, 0x3a, 0x7e, 0xab, 0x4d, 0xda, + 0x45, 0x24, 0xd2, 0x92, 0xcc, 0xa3, 0xe3, 0x41, 0xbb, 0x74, 0x30, 0x86, 0x5a, 0xfc, 0xcd, 0xb1, + 0x0b, 0xdb, 0x08, 0xa0, 0xbf, 0x9b, 0xf6, 0xa7, 0xe9, 0x24, 0x88, 0x97, 0x38, 0x26, 0xef, 0x87, + 0xc3, 0xc1, 0xf0, 0x0c, 0xd3, 0xec, 0x40, 0x3b, 0x31, 0x6b, 0xdf, 0x0f, 0xa6, 0x18, 0x5c, 0x3c, + 0xf8, 0xab, 0x00, 0xb5, 0xf8, 0x69, 0x44, 0xc8, 0xf1, 0xe8, 0x24, 0x07, 0x12, 0xcf, 0x26, 0x0e, + 0xed, 0xe2, 0xcd, 0xe4, 0xe3, 0x08, 0x11, 0x53, 0xe1, 0xe3, 0x89, 0x36, 0xee, 0x4f, 0x58, 0xaa, + 0x22, 0x8a, 0x33, 0xc9, 0x3a, 0x10, 0xa6, 0xc4, 0x98, 0x25, 0xf6, 0x88, 0x59, 0x19, 0xa7, 0x6d, + 0x2f, 0x31, 0xf7, 0xdf, 0x8c, 0x26, 0x48, 0x2d, 0x3a, 0xd6, 0x56, 0x32, 0xc9, 0x43, 0xe2, 0x95, + 0x74, 0x8e, 0x13, 0xed, 0x5c, 0x9b, 0x32, 0xb0, 0x6a, 0x3a, 0xc7, 0x59, 0x7f, 0xf2, 0x06, 0x5b, + 0xd8, 0xae, 0x1d, 0xfc, 0x5e, 0x84, 0x7a, 0x22, 0x76, 0x78, 0x43, 0xda, 0x07, 0x6d, 0x38, 0x5d, + 0xbf, 0xa1, 0x07, 0xb0, 0x2b, 0x79, 0x18, 0x52, 0xcc, 0xbf, 0x80, 0x1f, 0x53, 0x8f, 0xf3, 0x9d, + 0x11, 0x6b, 0xac, 0xbd, 0x07, 0xf7, 0x33, 0x31, 0x48, 0x85, 0xfb, 0x4a, 0x28, 0x17, 0xf7, 0x32, + 0x3e, 0x51, 0x4e, 0x19, 0x77, 0x67, 0x3f, 0xe3, 0x12, 0xdc, 0xf5, 0xe3, 0xd1, 0xf9, 0xb9, 0x76, + 0xcc, 0xa2, 0x94, 0x0c, 0xb8, 0xb8, 0xce, 0x49, 0xd8, 0x90, 0x34, 0x38, 0xf3, 0x09, 0xf0, 0x2a, + 0x6b, 0xb0, 0xe4, 0x0a, 0xa7, 0x6a, 0x70, 0x31, 0x0e, 0x29, 0xd7, 0xc8, 0x43, 0xe8, 0xae, 0xb9, + 0x27, 0xda, 0xc5, 0xe8, 0x03, 0x7a, 0xeb, 0x47, 0x3f, 0x95, 0xf1, 0x6b, 0x6b, 0x75, 0x69, 0x99, + 0xb3, 0xfe, 0x78, 0x40, 0xbe, 0x85, 0xaa, 0x10, 0x74, 0xb2, 0x9b, 0xbc, 0x76, 0x29, 0xd1, 0xef, + 0x75, 0xd7, 0x1d, 0xe1, 0xd6, 0xa8, 0x77, 0x48, 0x1f, 0x6a, 0x91, 0x30, 0x93, 0x24, 0x2e, 0xa3, + 0xf9, 0xbd, 0xbd, 0x1c, 0x4f, 0x0c, 0x71, 0x06, 0x90, 0x48, 0x31, 0xe9, 0x49, 0x0f, 0x48, 0x46, + 0xc0, 0x7b, 0x0f, 0x72, 0x7d, 0x32, 0x50, 0x22, 0xab, 0x12, 0xd0, 0x9a, 0x6e, 0x4b, 0x40, 0xeb, + 0x3a, 0x8c, 0x40, 0x17, 0xd0, 0x94, 0x65, 0x94, 0x3c, 0xcc, 0xe6, 0x95, 0x05, 0xb8, 0xf7, 0x68, + 0x83, 0x37, 0x86, 0x1b, 0x41, 0x53, 0x56, 0x48, 0x09, 0x2e, 0x47, 0x75, 0x25, 0xb8, 0x3c, 0x59, + 0x55, 0xef, 0xfc, 0xbf, 0x40, 0x5e, 0xf3, 0x4b, 0x63, 0xfa, 0x95, 0xbe, 0x34, 0x49, 0x4c, 0xd3, + 0x97, 0x26, 0x4b, 0x1d, 0x43, 0xb8, 0xac, 0xf0, 0x7f, 0x40, 0x5f, 0xfc, 0x1d, 0x00, 0x00, 0xff, + 0xff, 0x4d, 0xcd, 0xc6, 0xd5, 0x8d, 0x0e, 0x00, 0x00, } diff --git a/Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/api.proto b/Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/api.proto index efa97c47b23..51aa8e6865e 100644 --- a/Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/api.proto +++ b/Godeps/_workspace/src/github.com/coreos/rkt/api/v1alpha/api.proto @@ -12,9 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// To compile, run 'protoc -I api/v1alpha api/v1alpha/api.proto --go_out=plugins=grpc:api/v1alpha' in rkt root directory. -// The protoc version must be 3.0.0. - // *************************************************** // // ************ WARNING - HERE BE DRAGONS ************ // // // @@ -172,6 +169,22 @@ message Pod { // Annotations on this pod. repeated KeyValue annotations = 7; + + // Cgroup of the pod, empty if the pod is not running. + string cgroup = 8; + + // Timestamp of when the pod is created, nanoseconds since epoch. + // Zero if the pod is not created. + int64 created_at = 9; + + // Timestamp of when the pod is started, nanoseconds since epoch. + // Zero if the pod is not started. + int64 started_at = 10; + + // Timestamp of when the pod is moved to exited-garbage/garbage, + // in nanoseconds since epoch. + // Zero if the pod is not moved to exited-garbage/garbage yet. + int64 gc_marked_at = 11; } message KeyValue { @@ -201,6 +214,9 @@ message PodFilter { // If not empty, the pods that have all of the annotations will be returned. repeated KeyValue annotations = 6; + + // If not empty, the pods whose cgroup are listed will be returned. + repeated string cgroups = 7; } // ImageFilter defines the condition that the returned images need to satisfy in ListImages().