From eca022cc416a5ef5d1167d54ec3215d5b5c8fd0b Mon Sep 17 00:00:00 2001 From: Tamer Tas Date: Mon, 16 May 2016 23:35:52 +0300 Subject: [PATCH 1/3] Update appc/spec version to 0.8.1 --- Godeps/Godeps.json | 12 ++++++------ vendor/github.com/appc/spec/schema/pod.go | 11 ++++++----- vendor/github.com/appc/spec/schema/version.go | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 7c16e912b3c05..dc2cc2e5c07f0 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -52,18 +52,18 @@ }, { "ImportPath": "github.com/appc/spec/schema", - "Comment": "v0.7.4-43-gd22f52b", - "Rev": "d22f52bfeba06614d37c7aa1ad6fd76d8fdb2ba8" + "Comment": "v0.8.1", + "Rev": "b889d03467ae08bb6c13241762a64305b69bcf82" }, { "ImportPath": "github.com/appc/spec/schema/common", - "Comment": "v0.7.4-43-gd22f52b", - "Rev": "d22f52bfeba06614d37c7aa1ad6fd76d8fdb2ba8" + "Comment": "v0.8.1", + "Rev": "b889d03467ae08bb6c13241762a64305b69bcf82" }, { "ImportPath": "github.com/appc/spec/schema/types", - "Comment": "v0.7.4-43-gd22f52b", - "Rev": "d22f52bfeba06614d37c7aa1ad6fd76d8fdb2ba8" + "Comment": "v0.8.1", + "Rev": "b889d03467ae08bb6c13241762a64305b69bcf82" }, { "ImportPath": "github.com/armon/go-metrics", diff --git a/vendor/github.com/appc/spec/schema/pod.go b/vendor/github.com/appc/spec/schema/pod.go index b8699315f0209..d4792ff3b4077 100644 --- a/vendor/github.com/appc/spec/schema/pod.go +++ b/vendor/github.com/appc/spec/schema/pod.go @@ -152,11 +152,12 @@ func (r Mount) assertValid() error { // RuntimeApp describes an application referenced in a PodManifest type RuntimeApp struct { - Name types.ACName `json:"name"` - Image RuntimeImage `json:"image"` - App *types.App `json:"app,omitempty"` - Mounts []Mount `json:"mounts,omitempty"` - Annotations types.Annotations `json:"annotations,omitempty"` + Name types.ACName `json:"name"` + Image RuntimeImage `json:"image"` + App *types.App `json:"app,omitempty"` + ReadOnlyRootFS bool `json:"readOnlyRootFS,omitempty"` + Mounts []Mount `json:"mounts,omitempty"` + Annotations types.Annotations `json:"annotations,omitempty"` } // RuntimeImage describes an image referenced in a RuntimeApp diff --git a/vendor/github.com/appc/spec/schema/version.go b/vendor/github.com/appc/spec/schema/version.go index 1aa136753adec..eaa5f8bfdcfd3 100644 --- a/vendor/github.com/appc/spec/schema/version.go +++ b/vendor/github.com/appc/spec/schema/version.go @@ -22,7 +22,7 @@ const ( // version represents the canonical version of the appc spec and tooling. // For now, the schema and tooling is coupled with the spec itself, so // this must be kept in sync with the VERSION file in the root of the repo. - version string = "0.7.4+git" + version string = "0.8.1" ) var ( From f8766490489e8443bfb0e9bbd2e6c8f1046309ba Mon Sep 17 00:00:00 2001 From: Tamer Tas Date: Mon, 16 May 2016 23:26:13 +0300 Subject: [PATCH 2/3] Update rkt API version to 1.6.0 --- Godeps/Godeps.json | 4 +- .../coreos/rkt/api/v1alpha/api.pb.go | 192 +++++++++--------- .../coreos/rkt/api/v1alpha/api.proto | 4 + 3 files changed, 104 insertions(+), 96 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index dc2cc2e5c07f0..051f560d8ac67 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -545,8 +545,8 @@ }, { "ImportPath": "github.com/coreos/rkt/api/v1alpha", - "Comment": "v1.4.0", - "Rev": "f5b69782d120a7ae5ada8f2ebad97a014a98ebd5" + "Comment": "v1.6.0", + "Rev": "14437382a98e5ebeb6cafb57cff445370e3f7d56" }, { "ImportPath": "github.com/cpuguy83/go-md2man/md2man", diff --git a/vendor/github.com/coreos/rkt/api/v1alpha/api.pb.go b/vendor/github.com/coreos/rkt/api/v1alpha/api.pb.go index d801049bec058..5c4bbf0883c09 100644 --- a/vendor/github.com/coreos/rkt/api/v1alpha/api.pb.go +++ b/vendor/github.com/coreos/rkt/api/v1alpha/api.pb.go @@ -407,6 +407,9 @@ type PodFilter struct { 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"` + // If not empty, the pods whose these cgroup belong to will be returned. + // i.e. the pod's cgroup is a prefix of the specified cgroup + PodSubCgroups []string `protobuf:"bytes,8,rep,name=pod_sub_cgroups" json:"pod_sub_cgroups,omitempty"` } func (m *PodFilter) Reset() { *m = PodFilter{} } @@ -1138,98 +1141,99 @@ var _PublicAPI_serviceDesc = grpc.ServiceDesc{ } var fileDescriptor0 = []byte{ - // 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, + // 1492 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x57, 0xcf, 0x6e, 0xdb, 0xc6, + 0x13, 0x8e, 0xfe, 0x4b, 0x23, 0x45, 0x96, 0xd6, 0x4e, 0x2c, 0x2b, 0xff, 0x1c, 0xfe, 0x7e, 0x0d, + 0x52, 0x1f, 0xdc, 0xd6, 0x49, 0x73, 0x29, 0x50, 0x44, 0xb1, 0x69, 0x43, 0x8d, 0x2d, 0x09, 0x8a, + 0x62, 0x34, 0x27, 0x82, 0x92, 0x56, 0x0e, 0x61, 0x8a, 0x64, 0x49, 0xca, 0x89, 0x7b, 0xec, 0xa9, + 0xb7, 0x3e, 0x42, 0x1f, 0xa3, 0xc7, 0xde, 0xfb, 0x18, 0x05, 0xfa, 0x1e, 0x9d, 0x5d, 0x2e, 0xc9, + 0x25, 0x45, 0x1d, 0x7a, 0xb3, 0x66, 0x66, 0xbf, 0xf9, 0x66, 0x76, 0xe6, 0x5b, 0x1a, 0x6a, 0xba, + 0x63, 0x1c, 0x3a, 0xae, 0xed, 0xdb, 0xa4, 0x72, 0xf3, 0x8d, 0x6e, 0x3a, 0x1f, 0x75, 0xe5, 0x35, + 0xd4, 0xfb, 0x4b, 0xfd, 0x8a, 0x9e, 0xda, 0xee, 0x52, 0xf7, 0xc9, 0x3e, 0x14, 0xfd, 0x5b, 0x87, + 0x76, 0x72, 0xfb, 0xb9, 0xe7, 0xcd, 0x23, 0x72, 0x28, 0xc2, 0x0e, 0x79, 0xcc, 0x04, 0x3d, 0x64, + 0x0b, 0x2a, 0x37, 0xd4, 0xf5, 0x0c, 0xdb, 0xea, 0xe4, 0x31, 0xa8, 0xa6, 0xfc, 0x99, 0x83, 0x12, + 0x77, 0x93, 0x2f, 0xa1, 0x3e, 0xd5, 0x3d, 0xaa, 0x2d, 0x38, 0x16, 0xc7, 0xa8, 0x1f, 0xed, 0x24, + 0x31, 0x44, 0x1e, 0x80, 0xbc, 0x31, 0x0f, 0x00, 0x48, 0x03, 0x8a, 0x96, 0xbe, 0xa4, 0x9d, 0x02, + 0xff, 0x25, 0xe1, 0x17, 0xb9, 0xa1, 0x03, 0x2d, 0x63, 0xe9, 0xd8, 0xae, 0xaf, 0xf9, 0xc6, 0x92, + 0x7a, 0xbe, 0xbe, 0x74, 0x3a, 0x25, 0xf4, 0x14, 0x48, 0x0b, 0xaa, 0x4b, 0xdd, 0x32, 0x16, 0x68, + 0xec, 0x94, 0xd1, 0xd2, 0x60, 0x50, 0x9e, 0xf1, 0x33, 0xed, 0x54, 0xb8, 0xff, 0x19, 0xd4, 0x75, + 0xcb, 0xb2, 0x7d, 0xdd, 0x47, 0x34, 0xaf, 0x53, 0xdd, 0x2f, 0x20, 0x9f, 0x76, 0xc4, 0xe7, 0x2d, + 0xbd, 0xbd, 0xd4, 0xcd, 0x15, 0x55, 0x5e, 0x40, 0x65, 0x40, 0xfd, 0x4f, 0xb6, 0x7b, 0x1d, 0x71, + 0xc9, 0x85, 0xcc, 0x0c, 0xe7, 0xe6, 0x65, 0xcc, 0x13, 0x7f, 0xbd, 0x0a, 0x78, 0x2a, 0xbf, 0xe5, + 0xa0, 0xd0, 0x73, 0x9c, 0xd4, 0x89, 0x47, 0x50, 0x32, 0x58, 0x99, 0xfc, 0x48, 0xfd, 0xa8, 0x99, + 0x2c, 0x1e, 0xdb, 0x5b, 0xc2, 0x02, 0xfc, 0xa0, 0xd6, 0xa6, 0xc4, 0x05, 0x91, 0xde, 0x31, 0x07, + 0x69, 0x43, 0x8d, 0x7e, 0x36, 0x7c, 0x6d, 0x66, 0xcf, 0x29, 0x6f, 0x40, 0x3b, 0x5d, 0x46, 0x69, + 0x53, 0x19, 0xbf, 0xe6, 0xa1, 0x30, 0xb2, 0xe7, 0xa2, 0xb7, 0x01, 0x9f, 0x3a, 0x14, 0x1c, 0xd1, + 0xe8, 0xf6, 0xe6, 0xec, 0x78, 0x2a, 0xc8, 0xde, 0x85, 0xa2, 0xee, 0x38, 0x1e, 0x26, 0x66, 0x39, + 0x1a, 0x32, 0x3d, 0xa2, 0x40, 0xd5, 0x0a, 0xba, 0x14, 0x72, 0x68, 0x45, 0xfe, 0xb0, 0x7d, 0xeb, + 0x37, 0x92, 0x22, 0x5f, 0xd9, 0x40, 0x9e, 0x34, 0xa1, 0x3c, 0xbb, 0x72, 0xed, 0x95, 0x83, 0xd7, + 0xc4, 0x88, 0x63, 0x15, 0x33, 0x97, 0x22, 0xa7, 0xb9, 0x86, 0xa3, 0x54, 0xe3, 0xf7, 0x89, 0x36, + 0xe4, 0xef, 0x0a, 0x1b, 0x70, 0xdb, 0x0e, 0x34, 0xae, 0x66, 0xda, 0x52, 0x77, 0xaf, 0x03, 0x6b, + 0x9d, 0x59, 0x95, 0x67, 0x50, 0x8d, 0x90, 0xb1, 0x05, 0xf8, 0xb7, 0xe8, 0xc7, 0x5d, 0x28, 0xdd, + 0x30, 0xab, 0x98, 0xdd, 0xbf, 0x72, 0x50, 0xc3, 0xe2, 0x4f, 0x0d, 0xd3, 0xa7, 0x2e, 0x8b, 0x34, + 0xe6, 0x1e, 0x46, 0x16, 0x30, 0xf2, 0x29, 0x94, 0x79, 0xb3, 0x3c, 0x0c, 0x2d, 0x64, 0x77, 0xab, + 0xcd, 0x36, 0xca, 0xd1, 0xd8, 0xf5, 0x7b, 0xd8, 0x53, 0x76, 0x0a, 0x4d, 0xfc, 0xfe, 0x35, 0x06, + 0x54, 0xe4, 0xa6, 0x7b, 0x70, 0x57, 0xf4, 0x4d, 0x44, 0x96, 0xb8, 0x39, 0xd5, 0x98, 0xf2, 0xa6, + 0xc6, 0xe0, 0x3e, 0x04, 0x8d, 0x09, 0x9a, 0x57, 0x23, 0xbb, 0xb0, 0xe5, 0xd8, 0x73, 0xcd, 0x5b, + 0x4d, 0xb5, 0xd0, 0xc1, 0x26, 0xbb, 0xa6, 0xfc, 0x9d, 0x0b, 0x77, 0x39, 0xa3, 0x1c, 0xbc, 0x19, + 0xc7, 0xa5, 0x0b, 0xe3, 0xb3, 0x28, 0x88, 0x77, 0x98, 0x6f, 0xab, 0x4c, 0x1f, 0xa3, 0xae, 0xe9, + 0x2d, 0x72, 0x8d, 0xd8, 0x63, 0x1b, 0x4c, 0x7d, 0x4a, 0xcd, 0xcd, 0x73, 0x47, 0xee, 0x43, 0x33, + 0x58, 0x50, 0x76, 0x03, 0x0b, 0xcc, 0xcc, 0xaf, 0xbe, 0xc0, 0x88, 0x46, 0xf6, 0x29, 0x45, 0x51, + 0xf8, 0x8f, 0x7b, 0xc9, 0x18, 0x2e, 0x56, 0xa6, 0x29, 0x18, 0xd6, 0x78, 0x91, 0xbf, 0x63, 0x91, + 0x67, 0xa6, 0x3d, 0xd5, 0xcd, 0x53, 0x53, 0xbf, 0xf2, 0x58, 0x91, 0x73, 0xc3, 0x15, 0xb7, 0xbb, + 0x07, 0x6d, 0xef, 0xd6, 0xf3, 0xe9, 0x12, 0xd7, 0xc7, 0x5a, 0x18, 0x57, 0x1a, 0x73, 0xe5, 0x43, + 0x15, 0x31, 0xed, 0x99, 0x6e, 0xca, 0x9e, 0x40, 0x70, 0x90, 0xe6, 0xca, 0xa3, 0xae, 0xec, 0x08, + 0x84, 0x87, 0xd5, 0x65, 0x79, 0x74, 0xb6, 0x72, 0x51, 0xd2, 0x58, 0x32, 0x2e, 0x3b, 0x6c, 0xc7, + 0xef, 0xf9, 0xee, 0xca, 0xf3, 0x35, 0x6c, 0x95, 0xa7, 0x2d, 0x5c, 0x7b, 0xa9, 0x7d, 0xf4, 0x7d, + 0xc7, 0xe3, 0x65, 0x57, 0x15, 0x17, 0x8a, 0x7d, 0x6b, 0x61, 0x93, 0x6d, 0xa8, 0xbb, 0xd7, 0xbe, + 0x16, 0x8a, 0x59, 0xc0, 0x10, 0xc7, 0x15, 0x47, 0x66, 0xa6, 0x25, 0x24, 0x94, 0x85, 0xa2, 0x34, + 0x47, 0xc6, 0x80, 0xd7, 0x01, 0x4e, 0x36, 0x2f, 0x54, 0x24, 0x2f, 0xa6, 0xe4, 0x54, 0xea, 0x02, + 0xe6, 0x2c, 0xa9, 0x37, 0xd4, 0xda, 0xac, 0xdf, 0xdc, 0xcb, 0xf5, 0x3b, 0xa5, 0xbc, 0x8c, 0xbe, + 0x48, 0x88, 0xbf, 0x98, 0xc2, 0xf2, 0x44, 0x05, 0xf2, 0x04, 0x8a, 0x73, 0xdd, 0xd7, 0x37, 0xcb, + 0x8d, 0x0f, 0x75, 0x8e, 0x2a, 0xa6, 0xed, 0x29, 0x94, 0x58, 0xe6, 0x60, 0xde, 0xb2, 0x53, 0x8b, + 0x81, 0x0c, 0xc6, 0x0f, 0x37, 0x51, 0x9e, 0x3c, 0xb6, 0xdb, 0x86, 0x35, 0xa3, 0x9a, 0x44, 0x01, + 0x6d, 0x2b, 0xcb, 0x37, 0xcc, 0xc0, 0xc6, 0x35, 0x5f, 0x69, 0x41, 0xf3, 0x8c, 0xfa, 0xac, 0xc1, + 0x63, 0xfa, 0xd3, 0x0a, 0x75, 0x46, 0x39, 0x84, 0xad, 0xc8, 0xe2, 0x39, 0x38, 0x50, 0x94, 0x3c, + 0x40, 0xa5, 0xc6, 0xdf, 0xe2, 0x05, 0xba, 0x1b, 0x8b, 0x30, 0x1a, 0x95, 0x53, 0xd8, 0x3a, 0x37, + 0x3c, 0x1f, 0xb7, 0xd8, 0x13, 0x10, 0xe4, 0x7f, 0x50, 0x59, 0xf0, 0x2a, 0x02, 0xf6, 0x75, 0x89, + 0x7d, 0xac, 0x0e, 0xa8, 0x50, 0x73, 0xea, 0xeb, 0x86, 0xc9, 0x9b, 0x57, 0xc5, 0xbc, 0xad, 0x18, + 0x47, 0x24, 0x46, 0xfd, 0xc4, 0xdd, 0x0c, 0x51, 0x1a, 0x32, 0x8a, 0xf2, 0x04, 0xda, 0x7d, 0xcb, + 0x73, 0xe8, 0x8c, 0x1d, 0x09, 0x33, 0x4b, 0x5a, 0xad, 0x7c, 0x05, 0x44, 0x0e, 0x10, 0x90, 0x7b, + 0xa8, 0xe0, 0xf6, 0x5c, 0x94, 0x92, 0x44, 0xfc, 0x01, 0xda, 0x8c, 0x01, 0xdf, 0xf9, 0xa8, 0x96, + 0x2f, 0xd2, 0xb5, 0xa4, 0x1f, 0xe0, 0xec, 0x6a, 0x5e, 0x02, 0x91, 0xb1, 0x44, 0xf2, 0xc7, 0x50, + 0xe6, 0x72, 0x16, 0x62, 0xa5, 0xde, 0x33, 0xe5, 0x29, 0x6c, 0x0b, 0xca, 0xfc, 0x77, 0x56, 0x55, + 0xdf, 0xc2, 0x4e, 0x32, 0x44, 0x40, 0x47, 0x2f, 0x65, 0x2e, 0xeb, 0xa5, 0x54, 0xbe, 0x83, 0x6d, + 0xc6, 0x87, 0x5a, 0x7c, 0x7c, 0xa2, 0xea, 0xfe, 0x0f, 0xe5, 0xa0, 0xba, 0xb5, 0xaf, 0x0b, 0x69, + 0x16, 0x95, 0x57, 0xb0, 0x93, 0x3c, 0x1c, 0x97, 0x43, 0xb9, 0x65, 0xad, 0x1c, 0x1e, 0xa8, 0xdc, + 0xf2, 0xe1, 0x3a, 0xb7, 0xaf, 0xa2, 0x7c, 0xd8, 0x26, 0x26, 0xb6, 0xd1, 0x7b, 0x8a, 0x02, 0x19, + 0x4a, 0xbe, 0xd8, 0x21, 0x9c, 0x63, 0xd3, 0xb0, 0xf8, 0x1c, 0xe7, 0x9e, 0x97, 0xd8, 0x81, 0x85, + 0x6d, 0x9a, 0xf6, 0x27, 0x3e, 0xc3, 0xd5, 0xd4, 0x5c, 0x97, 0x32, 0xe6, 0x9a, 0x8b, 0xa5, 0xb2, + 0xcf, 0xa7, 0x38, 0x48, 0x2d, 0xd8, 0x46, 0xc8, 0x5c, 0xc1, 0x0f, 0x28, 0xd4, 0xe2, 0xaf, 0xb0, + 0x0e, 0x76, 0xf5, 0xa2, 0x77, 0xa6, 0x6a, 0x93, 0x0f, 0x23, 0x55, 0x7b, 0x3f, 0x38, 0x51, 0x4f, + 0xfb, 0x03, 0xf5, 0xa4, 0x75, 0x07, 0xb5, 0x64, 0x4b, 0xf2, 0xf4, 0x46, 0xa3, 0xe3, 0x56, 0x0e, + 0xdf, 0xa0, 0xb6, 0x64, 0x3c, 0x19, 0x1e, 0xbf, 0x55, 0xc7, 0xad, 0x3c, 0x12, 0x69, 0x4a, 0xe6, + 0xe1, 0x71, 0xbf, 0x55, 0x38, 0x18, 0x41, 0x35, 0xfa, 0x18, 0xd9, 0x85, 0x6d, 0x04, 0xd0, 0xde, + 0x4d, 0x7a, 0x93, 0x64, 0x12, 0xc4, 0x8b, 0x1d, 0xe3, 0xf7, 0x83, 0x41, 0x7f, 0x70, 0x86, 0x69, + 0x76, 0xa0, 0x15, 0x9b, 0xd5, 0x1f, 0xfb, 0x13, 0x0c, 0xce, 0x1f, 0xfc, 0x93, 0x83, 0x6a, 0xf4, + 0x66, 0x22, 0xe4, 0x68, 0x78, 0x92, 0x01, 0x89, 0x67, 0x63, 0x87, 0x7a, 0xf1, 0x66, 0xfc, 0x61, + 0x88, 0x88, 0x89, 0xf0, 0xd1, 0x58, 0x1d, 0xf5, 0xc6, 0x2c, 0x55, 0x1e, 0xc5, 0x99, 0xa4, 0x1d, + 0x08, 0x53, 0x60, 0xcc, 0x62, 0x7b, 0xc8, 0xac, 0x88, 0xd3, 0xb6, 0x17, 0x9b, 0x7b, 0x6f, 0x86, + 0x63, 0xa4, 0x16, 0x1e, 0x6b, 0x95, 0x52, 0xc9, 0x03, 0xe2, 0xe5, 0x64, 0x8e, 0x13, 0xf5, 0x5c, + 0x9d, 0x30, 0xb0, 0x4a, 0x32, 0xc7, 0x59, 0x6f, 0xfc, 0x06, 0x5b, 0xd8, 0xaa, 0x1e, 0xfc, 0x91, + 0x87, 0x5a, 0x2c, 0x76, 0x78, 0x43, 0xea, 0xa5, 0x3a, 0x98, 0xac, 0xdf, 0xd0, 0x03, 0xd8, 0x95, + 0x3c, 0x0c, 0x29, 0xe2, 0x9f, 0xc3, 0xaf, 0xac, 0xc7, 0xd9, 0xce, 0x90, 0x35, 0xd6, 0xde, 0x85, + 0xfb, 0xa9, 0x18, 0xa4, 0xc2, 0x7d, 0x05, 0x94, 0x8b, 0x7b, 0x29, 0x9f, 0x28, 0xa7, 0x88, 0xbb, + 0xb3, 0x9f, 0x72, 0x09, 0xee, 0xda, 0xf1, 0xf0, 0xfc, 0x5c, 0x3d, 0x66, 0x51, 0xa5, 0x14, 0xb8, + 0xb8, 0xce, 0x71, 0xd0, 0x90, 0x24, 0x38, 0xf3, 0x09, 0xf0, 0x0a, 0x6b, 0xb0, 0xe4, 0x0a, 0xa6, + 0xaa, 0x7f, 0x31, 0x0a, 0x28, 0x57, 0xc9, 0x43, 0xe8, 0xac, 0xb9, 0xc7, 0xea, 0xc5, 0xf0, 0x12, + 0xbd, 0xb5, 0xa3, 0x5f, 0x8a, 0xf8, 0x19, 0xb6, 0x9a, 0x9a, 0xc6, 0xac, 0x37, 0xea, 0x93, 0xef, + 0xa1, 0x22, 0x04, 0x9d, 0xec, 0xc6, 0xaf, 0x5d, 0x42, 0xf4, 0xbb, 0x9d, 0x75, 0x47, 0xb0, 0x35, + 0xca, 0x1d, 0xd2, 0x83, 0x6a, 0x28, 0xcc, 0x24, 0x8e, 0x4b, 0x69, 0x7e, 0x77, 0x2f, 0xc3, 0x13, + 0x41, 0x9c, 0x01, 0xc4, 0x52, 0x4c, 0xba, 0xd2, 0x03, 0x92, 0x12, 0xf0, 0xee, 0x83, 0x4c, 0x9f, + 0x0c, 0x14, 0xcb, 0xaa, 0x04, 0xb4, 0xa6, 0xdb, 0x12, 0xd0, 0xba, 0x0e, 0x23, 0xd0, 0x05, 0x34, + 0x64, 0x19, 0x25, 0x0f, 0xd3, 0x79, 0x65, 0x01, 0xee, 0x3e, 0xda, 0xe0, 0x8d, 0xe0, 0x86, 0xd0, + 0x90, 0x15, 0x52, 0x82, 0xcb, 0x50, 0x5d, 0x09, 0x2e, 0x4b, 0x56, 0x95, 0x3b, 0x5f, 0xe7, 0xc8, + 0x6b, 0x7e, 0x69, 0x4c, 0xbf, 0x92, 0x97, 0x26, 0x89, 0x69, 0xf2, 0xd2, 0x64, 0xa9, 0x63, 0x08, + 0xd3, 0x32, 0xff, 0xcf, 0xf4, 0xc5, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4a, 0x23, 0xef, 0x15, + 0xa6, 0x0e, 0x00, 0x00, } diff --git a/vendor/github.com/coreos/rkt/api/v1alpha/api.proto b/vendor/github.com/coreos/rkt/api/v1alpha/api.proto index 51aa8e6865e0e..80b870a3f3824 100644 --- a/vendor/github.com/coreos/rkt/api/v1alpha/api.proto +++ b/vendor/github.com/coreos/rkt/api/v1alpha/api.proto @@ -217,6 +217,10 @@ message PodFilter { // If not empty, the pods whose cgroup are listed will be returned. repeated string cgroups = 7; + + // If not empty, the pods whose these cgroup belong to will be returned. + // i.e. the pod's cgroup is a prefix of the specified cgroup + repeated string pod_sub_cgroups = 8; } // ImageFilter defines the condition that the returned images need to satisfy in ListImages(). From 7d40332ca8b83af682ca00ee6b49f9a96ae4cdfc Mon Sep 17 00:00:00 2001 From: Tamer Tas Date: Tue, 17 May 2016 00:03:25 +0300 Subject: [PATCH 3/3] Update rkt container runtime min versions --- pkg/kubelet/rkt/rkt.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/rkt/rkt.go b/pkg/kubelet/rkt/rkt.go index a075631cb5028..6d0efc5d7b0a5 100644 --- a/pkg/kubelet/rkt/rkt.go +++ b/pkg/kubelet/rkt/rkt.go @@ -62,9 +62,9 @@ const ( RktType = "rkt" DefaultRktAPIServiceEndpoint = "localhost:15441" - minimumAppcVersion = "0.7.4" - minimumRktBinVersion = "1.2.1" - recommendedRktBinVersion = "1.2.1" + minimumAppcVersion = "0.8.1" + minimumRktBinVersion = "1.6.0" + recommendedRktBinVersion = "1.6.0" minimumRktApiVersion = "1.0.0-alpha" minimumSystemdVersion = "219"