From 7bdd36bbba4999c030ba71a2b26cbbd51afa4557 Mon Sep 17 00:00:00 2001 From: Taylor Thomas Date: Thu, 9 Feb 2017 10:43:26 -0800 Subject: [PATCH 1/7] fix(*): Regenerates protobuf files for protobuf 3.2 Protobuf 3.2 was recently released and generates a slightly different file from the protobuf definitions. These were all changes to the autogenerated byte array. --- pkg/proto/hapi/chart/chart.pb.go | 33 +++--- pkg/proto/hapi/chart/config.pb.go | 12 +- pkg/proto/hapi/chart/metadata.pb.go | 39 +++---- pkg/proto/hapi/chart/template.pb.go | 8 +- pkg/proto/hapi/release/hook.pb.go | 46 ++++---- pkg/proto/hapi/release/info.pb.go | 32 +++--- pkg/proto/hapi/release/release.pb.go | 34 +++--- pkg/proto/hapi/release/status.pb.go | 39 +++---- pkg/proto/hapi/release/test_run.pb.go | 36 +++--- pkg/proto/hapi/release/test_suite.pb.go | 28 ++--- pkg/proto/hapi/services/tiller.pb.go | 145 ++++++++++++------------ pkg/proto/hapi/version/version.pb.go | 15 +-- 12 files changed, 236 insertions(+), 231 deletions(-) diff --git a/pkg/proto/hapi/chart/chart.pb.go b/pkg/proto/hapi/chart/chart.pb.go index db1d5ef97..c3afc3f44 100644 --- a/pkg/proto/hapi/chart/chart.pb.go +++ b/pkg/proto/hapi/chart/chart.pb.go @@ -100,20 +100,21 @@ func init() { func init() { proto.RegisterFile("hapi/chart/chart.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 239 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x12, 0xcb, 0x48, 0x2c, 0xc8, - 0xd4, 0x4f, 0xce, 0x48, 0x2c, 0x2a, 0x81, 0x90, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0x5c, - 0x20, 0x71, 0x3d, 0xb0, 0x88, 0x94, 0x38, 0xb2, 0x9a, 0xfc, 0xbc, 0xb4, 0xcc, 0x74, 0x88, 0x22, - 0x29, 0x49, 0x24, 0x89, 0xdc, 0xd4, 0x92, 0xc4, 0x94, 0xc4, 0x92, 0x44, 0x2c, 0x52, 0x25, 0xa9, - 0xb9, 0x05, 0x39, 0x89, 0x25, 0xa9, 0x30, 0xa9, 0xf4, 0xfc, 0xfc, 0xf4, 0x9c, 0x54, 0x7d, 0x30, - 0x2f, 0xa9, 0x34, 0x4d, 0x3f, 0x31, 0xaf, 0x12, 0x22, 0xa5, 0xf4, 0x87, 0x91, 0x8b, 0xd5, 0x19, - 0xa4, 0x47, 0xc8, 0x80, 0x8b, 0x03, 0x66, 0xa2, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xb7, 0x91, 0x88, - 0x1e, 0xc2, 0x49, 0x7a, 0xbe, 0x50, 0xb9, 0x20, 0xb8, 0x2a, 0x21, 0x23, 0x2e, 0x4e, 0x98, 0x45, - 0xc5, 0x12, 0x4c, 0x0a, 0xcc, 0xe8, 0x5a, 0x42, 0xa0, 0x92, 0x41, 0x08, 0x65, 0x42, 0xa6, 0x5c, - 0x3c, 0x29, 0xa9, 0x05, 0xa9, 0x79, 0x29, 0xa9, 0x79, 0xc9, 0x99, 0x40, 0x6d, 0xcc, 0x60, 0x6d, - 0x82, 0xc8, 0xda, 0xc0, 0xce, 0x09, 0x42, 0x51, 0x26, 0xa4, 0xc5, 0xc5, 0x56, 0x96, 0x98, 0x53, - 0x0a, 0xd4, 0xc0, 0x02, 0x76, 0x9a, 0x10, 0x8a, 0x06, 0x70, 0x08, 0x05, 0x41, 0x55, 0x00, 0xd5, - 0xb2, 0xa6, 0x65, 0xe6, 0x00, 0x95, 0xb2, 0x42, 0x9d, 0x04, 0xf1, 0xbd, 0x1e, 0xcc, 0xf7, 0x7a, - 0x8e, 0x79, 0x95, 0x41, 0x10, 0x25, 0x4e, 0xec, 0x51, 0xac, 0x60, 0x33, 0x92, 0xd8, 0xc0, 0xb2, - 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe9, 0x70, 0x34, 0x75, 0x9e, 0x01, 0x00, 0x00, + // 242 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x90, 0xb1, 0x4e, 0xc3, 0x30, + 0x10, 0x86, 0x15, 0x4a, 0x0a, 0x1c, 0x2c, 0x58, 0x08, 0x4c, 0xa7, 0x8a, 0x09, 0x75, 0x70, 0x50, + 0x11, 0x0f, 0x00, 0xcc, 0x2c, 0x16, 0x13, 0xdb, 0xb5, 0xb9, 0xa4, 0x91, 0x52, 0x3b, 0xaa, 0x5d, + 0xa4, 0xbe, 0x3b, 0x03, 0xea, 0xd9, 0xa6, 0x09, 0xea, 0x12, 0x29, 0xf7, 0x7d, 0xff, 0xe5, 0xbf, + 0xc0, 0xed, 0x0a, 0xbb, 0xa6, 0x58, 0xae, 0x70, 0xe3, 0xc3, 0x53, 0x75, 0x1b, 0xeb, 0xad, 0x80, + 0xfd, 0x5c, 0xf1, 0x64, 0x72, 0xd7, 0x77, 0xac, 0xa9, 0x9a, 0x3a, 0x48, 0x93, 0xfb, 0x1e, 0x58, + 0x93, 0xc7, 0x12, 0x3d, 0x1e, 0x41, 0x9e, 0xd6, 0x5d, 0x8b, 0x9e, 0x12, 0xaa, 0xad, 0xad, 0x5b, + 0x2a, 0xf8, 0x6d, 0xb1, 0xad, 0x0a, 0x34, 0xbb, 0x80, 0x1e, 0x7e, 0x32, 0xc8, 0xdf, 0xf7, 0x19, + 0xf1, 0x04, 0xe7, 0x69, 0xa3, 0xcc, 0xa6, 0xd9, 0xe3, 0xe5, 0xfc, 0x46, 0x1d, 0x2a, 0xa9, 0x8f, + 0xc8, 0xf4, 0x9f, 0x25, 0xe6, 0x70, 0x91, 0x3e, 0xe4, 0xe4, 0xc9, 0x74, 0xf4, 0x3f, 0xf2, 0x19, + 0xa1, 0x3e, 0x68, 0xe2, 0x05, 0xae, 0x4a, 0xea, 0xc8, 0x94, 0x64, 0x96, 0x0d, 0x39, 0x39, 0xe2, + 0xd8, 0x75, 0x3f, 0xc6, 0x75, 0xf4, 0x40, 0x13, 0x33, 0x18, 0x7f, 0x63, 0xbb, 0x25, 0x27, 0x4f, + 0xb9, 0x9a, 0x18, 0x04, 0xf8, 0x0f, 0xe9, 0x68, 0x88, 0x19, 0xe4, 0x55, 0xd3, 0x92, 0x93, 0x79, + 0xac, 0x14, 0xae, 0x57, 0xe9, 0x7a, 0xf5, 0x6a, 0x76, 0x3a, 0x28, 0x6f, 0x67, 0x5f, 0x39, 0xef, + 0x58, 0x8c, 0x99, 0x3e, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xe9, 0x70, 0x34, 0x75, 0x9e, 0x01, + 0x00, 0x00, } diff --git a/pkg/proto/hapi/chart/config.pb.go b/pkg/proto/hapi/chart/config.pb.go index f1471405d..a7b61885a 100644 --- a/pkg/proto/hapi/chart/config.pb.go +++ b/pkg/proto/hapi/chart/config.pb.go @@ -49,7 +49,7 @@ func init() { func init() { proto.RegisterFile("hapi/chart/config.proto", fileDescriptor1) } var fileDescriptor1 = []byte{ - // 179 bytes of a gzipped FileDescriptorProto + // 182 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x12, 0xcf, 0x48, 0x2c, 0xc8, 0xd4, 0x4f, 0xce, 0x48, 0x2c, 0x2a, 0xd1, 0x4f, 0xce, 0xcf, 0x4b, 0xcb, 0x4c, 0xd7, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x02, 0x49, 0xe8, 0x81, 0x25, 0x94, 0x16, 0x30, 0x72, 0xb1, 0x39, @@ -57,9 +57,9 @@ var fileDescriptor1 = []byte{ 0x40, 0x4c, 0x21, 0x33, 0x2e, 0xb6, 0xb2, 0xc4, 0x9c, 0xd2, 0xd4, 0x62, 0x09, 0x26, 0x05, 0x66, 0x0d, 0x6e, 0x23, 0x39, 0x3d, 0x84, 0x4e, 0x3d, 0x88, 0x2e, 0xbd, 0x30, 0xb0, 0x02, 0xd7, 0xbc, 0x92, 0xa2, 0xca, 0x20, 0xa8, 0x6a, 0x29, 0x1f, 0x2e, 0x6e, 0x24, 0x61, 0x90, 0xc1, 0xd9, 0xa9, - 0x95, 0x30, 0x83, 0x81, 0x4c, 0x21, 0x75, 0x2e, 0x56, 0xb0, 0x52, 0xa0, 0xb9, 0x8c, 0x40, 0x73, - 0x05, 0x91, 0xcd, 0x05, 0xeb, 0x0c, 0x82, 0xc8, 0x5b, 0x31, 0x59, 0x30, 0x2a, 0xc9, 0x72, 0xb1, - 0x82, 0xc5, 0x84, 0x44, 0x60, 0xba, 0x20, 0x26, 0x41, 0x38, 0x4e, 0xec, 0x51, 0xac, 0x60, 0x8d, - 0x49, 0x6c, 0x60, 0xdf, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xe1, 0x12, 0x60, 0xda, 0xf8, - 0x00, 0x00, 0x00, + 0x95, 0x30, 0x83, 0xb3, 0x53, 0x2b, 0x85, 0xd4, 0xb9, 0x58, 0xc1, 0x4a, 0x25, 0x98, 0x14, 0x18, + 0x35, 0xb8, 0x8d, 0x04, 0x91, 0xcd, 0x05, 0xeb, 0x0c, 0x82, 0xc8, 0x5b, 0x31, 0x59, 0x30, 0x2a, + 0xc9, 0x72, 0xb1, 0x82, 0xc5, 0x84, 0x44, 0x60, 0xba, 0x20, 0x26, 0x41, 0x38, 0x4e, 0xec, 0x51, + 0xac, 0x60, 0x8d, 0x49, 0x6c, 0x60, 0xdf, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xe1, 0x12, + 0x60, 0xda, 0xf8, 0x00, 0x00, 0x00, } diff --git a/pkg/proto/hapi/chart/metadata.pb.go b/pkg/proto/hapi/chart/metadata.pb.go index 220902ba7..41e0999f4 100644 --- a/pkg/proto/hapi/chart/metadata.pb.go +++ b/pkg/proto/hapi/chart/metadata.pb.go @@ -94,23 +94,24 @@ func init() { func init() { proto.RegisterFile("hapi/chart/metadata.proto", fileDescriptor2) } var fileDescriptor2 = []byte{ - // 287 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x51, 0x4b, 0x4b, 0xc4, 0x30, - 0x10, 0x76, 0x1f, 0x6d, 0xb7, 0xd3, 0xcb, 0x32, 0xc8, 0x12, 0x3d, 0x48, 0xe9, 0xc9, 0x53, 0x17, - 0x14, 0xc4, 0xb3, 0x20, 0x1e, 0x74, 0xbb, 0xb2, 0xf8, 0x00, 0x6f, 0xb1, 0x0d, 0x36, 0x68, 0x9b, - 0x92, 0x44, 0xc5, 0xff, 0xe8, 0x8f, 0x32, 0x9d, 0x76, 0x77, 0x7b, 0xf0, 0x50, 0xf8, 0x1e, 0xfd, - 0x26, 0xf3, 0x25, 0x70, 0x54, 0xf2, 0x46, 0x2e, 0xf3, 0x92, 0x6b, 0xbb, 0xac, 0x84, 0xe5, 0x05, - 0xb7, 0x3c, 0x6d, 0xb4, 0xb2, 0x0a, 0xa1, 0xb5, 0x52, 0xb2, 0x92, 0x0b, 0x80, 0x15, 0x97, 0xb5, - 0x75, 0x9f, 0xd0, 0x88, 0x30, 0xad, 0x79, 0x25, 0xd8, 0x28, 0x1e, 0x9d, 0x86, 0x1b, 0xc2, 0x78, - 0x08, 0x9e, 0xa8, 0xb8, 0xfc, 0x60, 0x63, 0x12, 0x3b, 0x92, 0xfc, 0x8e, 0x61, 0xb6, 0xea, 0xc7, - 0xfe, 0x1b, 0x73, 0x5a, 0xa9, 0x9c, 0xd6, 0xa5, 0x08, 0x23, 0x83, 0xc0, 0xa8, 0x4f, 0x9d, 0x0b, - 0xc3, 0x26, 0xf1, 0xc4, 0xc9, 0x5b, 0xda, 0x3a, 0x5f, 0x42, 0x1b, 0xa9, 0x6a, 0x36, 0xa5, 0xc0, - 0x96, 0x62, 0x0c, 0x51, 0x21, 0x4c, 0xae, 0x65, 0x63, 0x5b, 0xd7, 0x23, 0x77, 0x28, 0xe1, 0x31, - 0xcc, 0xde, 0xc5, 0xcf, 0xb7, 0xd2, 0x85, 0x61, 0x3e, 0x8d, 0xdd, 0x71, 0xbc, 0x84, 0xa8, 0xda, - 0xd5, 0x33, 0x2c, 0x70, 0x76, 0x74, 0xb6, 0x48, 0xf7, 0x17, 0x90, 0xee, 0xdb, 0x6f, 0x86, 0xbf, - 0xe2, 0x02, 0x7c, 0x51, 0xbf, 0x39, 0xcc, 0x66, 0x74, 0x64, 0xcf, 0xda, 0x5e, 0x32, 0x77, 0x8b, - 0x84, 0x5d, 0xaf, 0x16, 0xe3, 0x09, 0x80, 0x1b, 0xf8, 0xd4, 0x17, 0x00, 0x72, 0x06, 0x4a, 0x12, - 0x83, 0x7f, 0xdd, 0xa5, 0x23, 0x08, 0x1e, 0xb3, 0xdb, 0x6c, 0xfd, 0x9c, 0xcd, 0x0f, 0x30, 0x04, - 0xef, 0x66, 0xfd, 0x70, 0x7f, 0x37, 0x1f, 0x5d, 0x05, 0x2f, 0x1e, 0xad, 0xf3, 0xea, 0xd3, 0x13, - 0x9d, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x65, 0x86, 0x8b, 0xda, 0xbf, 0x01, 0x00, 0x00, + // 290 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x91, 0x4d, 0x4b, 0xf4, 0x30, + 0x14, 0x85, 0xdf, 0x4e, 0xbf, 0x6f, 0x37, 0xc3, 0xe5, 0x65, 0x88, 0x2e, 0xa4, 0x74, 0xd5, 0x55, + 0x07, 0x14, 0xc4, 0xb5, 0x20, 0x2e, 0x74, 0x3a, 0x52, 0xfc, 0x00, 0x77, 0xb1, 0x0d, 0x36, 0x68, + 0x93, 0x92, 0x44, 0xc5, 0xff, 0xe8, 0x8f, 0x92, 0xa6, 0x9d, 0x99, 0x2e, 0xdc, 0xdd, 0x73, 0x9e, + 0x9e, 0xdb, 0x9c, 0x04, 0x8e, 0x5a, 0xda, 0xf3, 0x75, 0xdd, 0x52, 0x65, 0xd6, 0x1d, 0x33, 0xb4, + 0xa1, 0x86, 0x16, 0xbd, 0x92, 0x46, 0x22, 0x0c, 0xa8, 0xb0, 0x28, 0x3b, 0x07, 0xd8, 0x50, 0x2e, + 0x0c, 0xe5, 0x82, 0x29, 0x44, 0xf0, 0x04, 0xed, 0x18, 0x71, 0x52, 0x27, 0x8f, 0x2b, 0x3b, 0xe3, + 0x7f, 0xf0, 0x59, 0x47, 0xf9, 0x3b, 0x59, 0x58, 0x73, 0x14, 0xd9, 0xcf, 0x02, 0xa2, 0xcd, 0xb4, + 0xf6, 0xcf, 0x18, 0x82, 0xd7, 0xca, 0x8e, 0x4d, 0x29, 0x3b, 0x23, 0x81, 0x50, 0xcb, 0x0f, 0x55, + 0x33, 0x4d, 0xdc, 0xd4, 0xcd, 0xe3, 0x6a, 0x27, 0x07, 0xf2, 0xc9, 0x94, 0xe6, 0x52, 0x10, 0xcf, + 0x06, 0x76, 0x12, 0x53, 0x48, 0x1a, 0xa6, 0x6b, 0xc5, 0x7b, 0x33, 0x50, 0xdf, 0xd2, 0xb9, 0x85, + 0xc7, 0x10, 0xbd, 0xb1, 0xef, 0x2f, 0xa9, 0x1a, 0x4d, 0x02, 0xbb, 0x76, 0xaf, 0xf1, 0x02, 0x92, + 0x6e, 0x5f, 0x4f, 0x93, 0x30, 0x75, 0xf3, 0xe4, 0x74, 0x55, 0x1c, 0x2e, 0xa0, 0x38, 0xb4, 0xaf, + 0xe6, 0x9f, 0xe2, 0x0a, 0x02, 0x26, 0x5e, 0xb9, 0x60, 0x24, 0xb2, 0xbf, 0x9c, 0xd4, 0xd0, 0x8b, + 0xd7, 0x52, 0x90, 0x78, 0xec, 0x35, 0xcc, 0x78, 0x02, 0x40, 0x7b, 0xfe, 0x38, 0x15, 0x00, 0x4b, + 0x66, 0x4e, 0x96, 0x42, 0x70, 0x35, 0xa6, 0x13, 0x08, 0x1f, 0xca, 0x9b, 0x72, 0xfb, 0x54, 0x2e, + 0xff, 0x61, 0x0c, 0xfe, 0xf5, 0xf6, 0xfe, 0xee, 0x76, 0xe9, 0x5c, 0x86, 0xcf, 0xbe, 0x3d, 0xce, + 0x4b, 0x60, 0x9f, 0xe8, 0xec, 0x37, 0x00, 0x00, 0xff, 0xff, 0x65, 0x86, 0x8b, 0xda, 0xbf, 0x01, + 0x00, 0x00, } diff --git a/pkg/proto/hapi/chart/template.pb.go b/pkg/proto/hapi/chart/template.pb.go index aecab641f..2bed587b5 100644 --- a/pkg/proto/hapi/chart/template.pb.go +++ b/pkg/proto/hapi/chart/template.pb.go @@ -36,12 +36,12 @@ func init() { func init() { proto.RegisterFile("hapi/chart/template.proto", fileDescriptor3) } var fileDescriptor3 = []byte{ - // 106 bytes of a gzipped FileDescriptorProto + // 107 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x92, 0xcc, 0x48, 0x2c, 0xc8, 0xd4, 0x4f, 0xce, 0x48, 0x2c, 0x2a, 0xd1, 0x2f, 0x49, 0xcd, 0x2d, 0xc8, 0x49, 0x2c, 0x49, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x02, 0x49, 0xe9, 0x81, 0xa5, 0x94, 0x8c, 0xb8, 0x38, 0x42, 0xa0, 0xb2, 0x42, 0x42, 0x5c, 0x2c, 0x79, 0x89, 0xb9, 0xa9, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, - 0x9c, 0x41, 0x60, 0x36, 0x48, 0x2c, 0x25, 0xb1, 0x24, 0x51, 0x82, 0x09, 0x28, 0xc6, 0x13, 0x04, - 0x66, 0x3b, 0xb1, 0x47, 0xb1, 0x82, 0x35, 0x27, 0xb1, 0x81, 0xcd, 0x33, 0x06, 0x04, 0x00, 0x00, - 0xff, 0xff, 0x53, 0xee, 0x0e, 0x67, 0x6c, 0x00, 0x00, 0x00, + 0x9c, 0x41, 0x60, 0x36, 0x48, 0x2c, 0x25, 0xb1, 0x24, 0x51, 0x82, 0x49, 0x81, 0x51, 0x83, 0x27, + 0x08, 0xcc, 0x76, 0x62, 0x8f, 0x62, 0x05, 0x6b, 0x4e, 0x62, 0x03, 0x9b, 0x67, 0x0c, 0x08, 0x00, + 0x00, 0xff, 0xff, 0x53, 0xee, 0x0e, 0x67, 0x6c, 0x00, 0x00, 0x00, } diff --git a/pkg/proto/hapi/release/hook.pb.go b/pkg/proto/hapi/release/hook.pb.go index 9006f5aec..810df99ff 100644 --- a/pkg/proto/hapi/release/hook.pb.go +++ b/pkg/proto/hapi/release/hook.pb.go @@ -119,27 +119,27 @@ func init() { func init() { proto.RegisterFile("hapi/release/hook.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 340 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x4c, 0x90, 0xcd, 0x6e, 0xb2, 0x40, - 0x14, 0x86, 0x3f, 0x04, 0x41, 0x8f, 0x7e, 0x96, 0x4e, 0x9a, 0x74, 0xe2, 0xa6, 0xc6, 0x95, 0xab, - 0xa1, 0xb1, 0xe9, 0x05, 0xa0, 0x4e, 0xda, 0x46, 0x82, 0x66, 0xc0, 0x34, 0xe9, 0xc6, 0x60, 0x3a, - 0x2a, 0x51, 0x7e, 0x22, 0xd8, 0x2b, 0xe8, 0x55, 0xf5, 0xea, 0xca, 0x0c, 0x3f, 0xe9, 0xee, 0xf0, - 0x9c, 0xe7, 0xbc, 0xf0, 0x02, 0xf7, 0xc7, 0x20, 0x0d, 0xad, 0x0b, 0x3f, 0xf3, 0x20, 0xe3, 0xd6, - 0x31, 0x49, 0x4e, 0x24, 0xbd, 0x24, 0x79, 0x82, 0xfa, 0x62, 0x41, 0xaa, 0xc5, 0xf0, 0xe1, 0x90, - 0x24, 0x87, 0x33, 0xb7, 0xe4, 0x6e, 0x77, 0xdd, 0x5b, 0x79, 0x18, 0xf1, 0x2c, 0x0f, 0xa2, 0xb4, - 0xd4, 0xc7, 0xdf, 0x2a, 0x68, 0xaf, 0xc5, 0x35, 0x42, 0xa0, 0xc5, 0x41, 0xc4, 0xb1, 0x32, 0x52, - 0x26, 0x5d, 0x26, 0x67, 0xc1, 0x4e, 0x61, 0xfc, 0x89, 0x5b, 0x25, 0x13, 0xb3, 0x60, 0x69, 0x90, - 0x1f, 0xb1, 0x5a, 0x32, 0x31, 0xa3, 0x21, 0x74, 0xa2, 0x20, 0x0e, 0xf7, 0x45, 0x32, 0xd6, 0x24, - 0x6f, 0x9e, 0xd1, 0x23, 0xe8, 0xfc, 0x8b, 0xc7, 0x79, 0x86, 0xdb, 0x23, 0x75, 0x32, 0x98, 0x62, - 0xf2, 0xf7, 0x03, 0x89, 0x78, 0x37, 0xa1, 0x42, 0x60, 0x95, 0x87, 0x9e, 0xa1, 0x73, 0x0e, 0xb2, - 0x7c, 0x7b, 0xb9, 0xc6, 0x58, 0x2f, 0xd2, 0x7a, 0xd3, 0x21, 0x29, 0x6b, 0x90, 0xba, 0x06, 0xf1, - 0xeb, 0x1a, 0xcc, 0x10, 0x2e, 0xbb, 0xc6, 0xe3, 0x1f, 0x05, 0xda, 0x32, 0x08, 0xf5, 0xc0, 0xd8, - 0xb8, 0x4b, 0x77, 0xf5, 0xee, 0x9a, 0xff, 0xd0, 0x0d, 0xf4, 0xd6, 0x8c, 0x6e, 0xdf, 0x5c, 0xcf, - 0xb7, 0x1d, 0xc7, 0x54, 0x90, 0x09, 0xfd, 0xf5, 0xca, 0xf3, 0x1b, 0xd2, 0x42, 0x03, 0x00, 0xa1, - 0x2c, 0xa8, 0x43, 0x7d, 0x6a, 0xaa, 0xf2, 0x44, 0x18, 0x15, 0xd0, 0xea, 0x8c, 0xcd, 0xfa, 0x85, - 0xd9, 0x0b, 0x6a, 0xb6, 0x9b, 0x8c, 0x9a, 0xe8, 0x92, 0x14, 0x0a, 0x5b, 0x39, 0xce, 0xcc, 0x9e, - 0x2f, 0x4d, 0x03, 0xdd, 0xc2, 0x7f, 0xe9, 0x34, 0xa8, 0x83, 0x30, 0xdc, 0xb1, 0x22, 0xd3, 0xf6, - 0xe8, 0xd6, 0xa7, 0xc5, 0xca, 0xdb, 0xcc, 0xe7, 0xd4, 0xf3, 0xcc, 0xee, 0xac, 0xfb, 0x61, 0x54, - 0x7f, 0x64, 0xa7, 0xcb, 0x92, 0x4f, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xdf, 0xef, 0x1c, 0xfd, - 0xe2, 0x01, 0x00, 0x00, + // 343 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x4c, 0x90, 0xdf, 0x6e, 0xa2, 0x40, + 0x14, 0xc6, 0x17, 0x41, 0xd0, 0xa3, 0xeb, 0xb2, 0x93, 0x4d, 0x76, 0xe2, 0x4d, 0x8d, 0x57, 0x5e, + 0x0d, 0x8d, 0x4d, 0x1f, 0x00, 0x75, 0xd2, 0x36, 0x12, 0x34, 0x03, 0xa6, 0x49, 0x6f, 0x08, 0xa6, + 0xa3, 0x12, 0x85, 0x21, 0x82, 0x7d, 0x82, 0x3e, 0x55, 0x9f, 0xae, 0x99, 0xe1, 0x4f, 0x7a, 0x77, + 0xf8, 0x9d, 0x1f, 0xdf, 0xcc, 0x37, 0xf0, 0xff, 0x14, 0xe7, 0x89, 0x73, 0xe5, 0x17, 0x1e, 0x17, + 0xdc, 0x39, 0x09, 0x71, 0x26, 0xf9, 0x55, 0x94, 0x02, 0x0d, 0xe5, 0x82, 0xd4, 0x8b, 0xf1, 0xdd, + 0x51, 0x88, 0xe3, 0x85, 0x3b, 0x6a, 0xb7, 0xbf, 0x1d, 0x9c, 0x32, 0x49, 0x79, 0x51, 0xc6, 0x69, + 0x5e, 0xe9, 0xd3, 0x4f, 0x1d, 0x8c, 0x67, 0x21, 0xce, 0x08, 0x81, 0x91, 0xc5, 0x29, 0xc7, 0xda, + 0x44, 0x9b, 0xf5, 0x99, 0x9a, 0x25, 0x3b, 0x27, 0xd9, 0x3b, 0xee, 0x54, 0x4c, 0xce, 0x92, 0xe5, + 0x71, 0x79, 0xc2, 0x7a, 0xc5, 0xe4, 0x8c, 0xc6, 0xd0, 0x4b, 0xe3, 0x2c, 0x39, 0xf0, 0xa2, 0xc4, + 0x86, 0xe2, 0xed, 0x37, 0xba, 0x07, 0x93, 0x7f, 0xf0, 0xac, 0x2c, 0x70, 0x77, 0xa2, 0xcf, 0x46, + 0x73, 0x4c, 0x7e, 0x5e, 0x90, 0xc8, 0xb3, 0x09, 0x95, 0x02, 0xab, 0x3d, 0xf4, 0x08, 0xbd, 0x4b, + 0x5c, 0x94, 0xd1, 0xf5, 0x96, 0x61, 0x73, 0xa2, 0xcd, 0x06, 0xf3, 0x31, 0xa9, 0x6a, 0x90, 0xa6, + 0x06, 0x09, 0x9b, 0x1a, 0xcc, 0x92, 0x2e, 0xbb, 0x65, 0xd3, 0x2f, 0x0d, 0xba, 0x2a, 0x08, 0x0d, + 0xc0, 0xda, 0xf9, 0x6b, 0x7f, 0xf3, 0xea, 0xdb, 0xbf, 0xd0, 0x1f, 0x18, 0x6c, 0x19, 0x8d, 0x5e, + 0xfc, 0x20, 0x74, 0x3d, 0xcf, 0xd6, 0x90, 0x0d, 0xc3, 0xed, 0x26, 0x08, 0x5b, 0xd2, 0x41, 0x23, + 0x00, 0xa9, 0xac, 0xa8, 0x47, 0x43, 0x6a, 0xeb, 0xea, 0x17, 0x69, 0xd4, 0xc0, 0x68, 0x32, 0x76, + 0xdb, 0x27, 0xe6, 0xae, 0xa8, 0xdd, 0x6d, 0x33, 0x1a, 0x62, 0x2a, 0xc2, 0x68, 0xc4, 0x36, 0x9e, + 0xb7, 0x70, 0x97, 0x6b, 0xdb, 0x42, 0x7f, 0xe1, 0xb7, 0x72, 0x5a, 0xd4, 0x43, 0x18, 0xfe, 0x31, + 0xea, 0x51, 0x37, 0xa0, 0x51, 0x48, 0x83, 0x30, 0x0a, 0x76, 0xcb, 0x25, 0x0d, 0x02, 0xbb, 0xbf, + 0xe8, 0xbf, 0x59, 0xf5, 0x8b, 0xec, 0x4d, 0x55, 0xf2, 0xe1, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xdf, + 0xef, 0x1c, 0xfd, 0xe2, 0x01, 0x00, 0x00, } diff --git a/pkg/proto/hapi/release/info.pb.go b/pkg/proto/hapi/release/info.pb.go index 3f62073b6..a73dcab2f 100644 --- a/pkg/proto/hapi/release/info.pb.go +++ b/pkg/proto/hapi/release/info.pb.go @@ -65,20 +65,20 @@ func init() { func init() { proto.RegisterFile("hapi/release/info.proto", fileDescriptor1) } var fileDescriptor1 = []byte{ - // 231 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x12, 0xcf, 0x48, 0x2c, 0xc8, - 0xd4, 0x2f, 0x4a, 0xcd, 0x49, 0x4d, 0x2c, 0x4e, 0xd5, 0xcf, 0xcc, 0x4b, 0xcb, 0xd7, 0x2b, 0x28, - 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x01, 0x49, 0xe8, 0x41, 0x25, 0xa4, 0xe4, 0xd3, 0xf3, 0xf3, 0xd3, - 0x73, 0x52, 0xf5, 0xc1, 0x72, 0x49, 0xa5, 0x69, 0xfa, 0x25, 0x99, 0xb9, 0xa9, 0xc5, 0x25, 0x89, - 0xb9, 0x05, 0x10, 0xe5, 0x52, 0x92, 0x28, 0xe6, 0x00, 0x65, 0x4a, 0x4a, 0x8b, 0x21, 0x52, 0x4a, - 0x13, 0x98, 0xb8, 0x58, 0x3c, 0x81, 0x06, 0x0b, 0xe9, 0x70, 0xb1, 0x41, 0x24, 0x24, 0x18, 0x15, - 0x18, 0x35, 0xb8, 0x8d, 0x44, 0xf4, 0x90, 0xed, 0xd0, 0x0b, 0x06, 0xcb, 0x05, 0x41, 0xd5, 0x08, - 0x39, 0x72, 0xf1, 0xa5, 0x65, 0x16, 0x15, 0x97, 0xc4, 0xa7, 0xa4, 0x16, 0xe4, 0xe4, 0x57, 0xa6, - 0xa6, 0x48, 0x30, 0x81, 0x75, 0x49, 0xe9, 0x41, 0xdc, 0xa2, 0x07, 0x73, 0x8b, 0x5e, 0x08, 0xcc, - 0x2d, 0x41, 0xbc, 0x60, 0x1d, 0x2e, 0x50, 0x0d, 0x42, 0xf6, 0x5c, 0xbc, 0x39, 0x89, 0xc8, 0x26, - 0x30, 0x13, 0x34, 0x81, 0x07, 0xa4, 0x01, 0x6e, 0x80, 0x09, 0x17, 0x7b, 0x0a, 0xd0, 0x75, 0x25, - 0x40, 0xad, 0x2c, 0x04, 0xb5, 0xc2, 0x94, 0x0a, 0x29, 0x70, 0x71, 0xbb, 0xa4, 0x16, 0x27, 0x17, - 0x65, 0x16, 0x94, 0x64, 0xe6, 0xe7, 0x49, 0xb0, 0x02, 0x75, 0x72, 0x06, 0x21, 0x0b, 0x39, 0x71, - 0x46, 0xb1, 0x43, 0x7d, 0x9d, 0xc4, 0x06, 0x36, 0xc9, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x1a, - 0x52, 0x8f, 0x9c, 0x89, 0x01, 0x00, 0x00, + // 235 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x8f, 0x31, 0x4f, 0xc3, 0x30, + 0x10, 0x85, 0x95, 0x52, 0x5a, 0xd5, 0x6d, 0x19, 0x2c, 0x24, 0x42, 0x16, 0x22, 0xa6, 0x0e, 0xc8, + 0x91, 0x80, 0x1d, 0x81, 0xba, 0xb0, 0x06, 0x26, 0x16, 0xe4, 0xe2, 0x73, 0xb1, 0xe4, 0xe6, 0x2c, + 0xfb, 0x3a, 0xf0, 0x2f, 0xf8, 0xc9, 0xa8, 0xb6, 0x83, 0xd2, 0xa9, 0xab, 0xbf, 0xf7, 0x3e, 0xbf, + 0x63, 0x57, 0xdf, 0xd2, 0x99, 0xc6, 0x83, 0x05, 0x19, 0xa0, 0x31, 0x9d, 0x46, 0xe1, 0x3c, 0x12, + 0xf2, 0xc5, 0x01, 0x88, 0x0c, 0xaa, 0x9b, 0x2d, 0xe2, 0xd6, 0x42, 0x13, 0xd9, 0x66, 0xaf, 0x1b, + 0x32, 0x3b, 0x08, 0x24, 0x77, 0x2e, 0xc5, 0xab, 0xeb, 0x23, 0x4f, 0x20, 0x49, 0xfb, 0x90, 0xd0, + 0xed, 0xef, 0x88, 0x8d, 0x5f, 0x3b, 0x8d, 0xfc, 0x8e, 0x4d, 0x12, 0x28, 0x8b, 0xba, 0x58, 0xcd, + 0xef, 0x2f, 0xc5, 0xf0, 0x0f, 0xf1, 0x16, 0x59, 0x9b, 0x33, 0xfc, 0x99, 0x5d, 0x68, 0xe3, 0x03, + 0x7d, 0x2a, 0x70, 0x16, 0x7f, 0x40, 0x95, 0xa3, 0xd8, 0xaa, 0x44, 0xda, 0x22, 0xfa, 0x2d, 0xe2, + 0xbd, 0xdf, 0xd2, 0x2e, 0x63, 0x63, 0x9d, 0x0b, 0xfc, 0x89, 0x2d, 0xad, 0x1c, 0x1a, 0xce, 0x4e, + 0x1a, 0x16, 0x87, 0xc2, 0xbf, 0xe0, 0x91, 0x4d, 0x15, 0x58, 0x20, 0x50, 0xe5, 0xf8, 0x64, 0xb5, + 0x8f, 0xf2, 0x9a, 0xcd, 0xd7, 0x10, 0xbe, 0xbc, 0x71, 0x64, 0xb0, 0x2b, 0xcf, 0xeb, 0x62, 0x35, + 0x6b, 0x87, 0x4f, 0x2f, 0xb3, 0x8f, 0x69, 0xbe, 0x7a, 0x33, 0x89, 0xa6, 0x87, 0xbf, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x1a, 0x52, 0x8f, 0x9c, 0x89, 0x01, 0x00, 0x00, } diff --git a/pkg/proto/hapi/release/release.pb.go b/pkg/proto/hapi/release/release.pb.go index 561930f1f..72255e3e2 100644 --- a/pkg/proto/hapi/release/release.pb.go +++ b/pkg/proto/hapi/release/release.pb.go @@ -77,21 +77,21 @@ func init() { func init() { proto.RegisterFile("hapi/release/release.proto", fileDescriptor2) } var fileDescriptor2 = []byte{ - // 254 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x64, 0x90, 0x3f, 0x4f, 0xc3, 0x30, - 0x10, 0xc5, 0xd5, 0x36, 0x7f, 0x9a, 0x83, 0x85, 0x1b, 0xe0, 0x14, 0x31, 0x54, 0x0c, 0x50, 0x31, - 0xa4, 0x12, 0x7c, 0x03, 0x58, 0x60, 0xf5, 0xc8, 0x66, 0x22, 0x87, 0x58, 0x50, 0x3b, 0x8a, 0x23, - 0x3e, 0x0b, 0x1f, 0x17, 0xdb, 0xe7, 0x42, 0x0a, 0x8b, 0x13, 0xbf, 0xdf, 0xd3, 0xbb, 0xe7, 0x83, - 0xba, 0x97, 0x83, 0xde, 0x8d, 0xea, 0x43, 0x49, 0xa7, 0x0e, 0xdf, 0x66, 0x18, 0xed, 0x64, 0xf1, - 0x34, 0xb0, 0x26, 0x69, 0xf5, 0xc5, 0x91, 0xb3, 0xb7, 0xf6, 0x9d, 0x6d, 0x7f, 0x80, 0x36, 0x9d, - 0x3d, 0x02, 0x6d, 0x2f, 0xc7, 0x69, 0xd7, 0x5a, 0xd3, 0xe9, 0xb7, 0x04, 0xce, 0xe7, 0x20, 0x9c, - 0xac, 0x5f, 0x7d, 0x2d, 0xa1, 0x14, 0x9c, 0x83, 0x08, 0x99, 0x91, 0x7b, 0x45, 0x8b, 0xcd, 0x62, - 0x5b, 0x89, 0xf8, 0x8f, 0xd7, 0x90, 0x85, 0x78, 0x5a, 0x7a, 0xed, 0xe4, 0x0e, 0x9b, 0x79, 0xbf, - 0xe6, 0xd9, 0x13, 0x11, 0x39, 0xde, 0x40, 0x1e, 0x63, 0x69, 0x15, 0x8d, 0x67, 0x6c, 0xe4, 0x49, - 0x8f, 0xe1, 0x14, 0xcc, 0xf1, 0x16, 0x0a, 0x2e, 0x46, 0xd9, 0x3c, 0x32, 0x39, 0x23, 0x11, 0xc9, - 0x81, 0x35, 0xac, 0xf7, 0xd2, 0xe8, 0x4e, 0xb9, 0x89, 0xf2, 0x58, 0xea, 0xe7, 0x8e, 0x5b, 0xc8, - 0xc3, 0x42, 0x1c, 0x15, 0x9b, 0xd5, 0xff, 0x66, 0x4f, 0x1e, 0x09, 0x36, 0x20, 0x41, 0xf9, 0xa9, - 0x46, 0xa7, 0xad, 0xa1, 0xd2, 0x87, 0xe4, 0xe2, 0x70, 0xc5, 0x4b, 0xa8, 0xc2, 0x23, 0xdd, 0x20, - 0x5b, 0x45, 0xeb, 0x38, 0xe0, 0x57, 0x78, 0xa8, 0x5e, 0xca, 0x14, 0xf7, 0x5a, 0xc4, 0x65, 0xdd, - 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0xc8, 0x8f, 0xec, 0x97, 0xbb, 0x01, 0x00, 0x00, + // 256 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x64, 0x90, 0xbf, 0x4e, 0xc3, 0x40, + 0x0c, 0xc6, 0x95, 0x36, 0x7f, 0x1a, 0xc3, 0x82, 0x07, 0xb0, 0x22, 0x86, 0x88, 0x01, 0x22, 0x86, + 0x54, 0x82, 0x37, 0x80, 0x05, 0xd6, 0x1b, 0xd9, 0x8e, 0xe8, 0x42, 0x4e, 0xa5, 0xe7, 0x28, 0x17, + 0xf1, 0x2c, 0x3c, 0x2e, 0xba, 0x3f, 0x85, 0x94, 0x2e, 0x4e, 0xec, 0xdf, 0xa7, 0xcf, 0xdf, 0x19, + 0xaa, 0x41, 0x8e, 0x7a, 0x3b, 0xa9, 0x4f, 0x25, 0xad, 0x3a, 0x7c, 0xdb, 0x71, 0xe2, 0x99, 0xf1, + 0xdc, 0xb1, 0x36, 0xce, 0xaa, 0xab, 0x23, 0xe5, 0xc0, 0xbc, 0x0b, 0xb2, 0x7f, 0x40, 0x9b, 0x9e, + 0x8f, 0x40, 0x37, 0xc8, 0x69, 0xde, 0x76, 0x6c, 0x7a, 0xfd, 0x11, 0xc1, 0xe5, 0x12, 0xb8, 0x1a, + 0xe6, 0x37, 0xdf, 0x2b, 0x28, 0x44, 0xf0, 0x41, 0x84, 0xd4, 0xc8, 0xbd, 0xa2, 0xa4, 0x4e, 0x9a, + 0x52, 0xf8, 0x7f, 0xbc, 0x85, 0xd4, 0xd9, 0xd3, 0xaa, 0x4e, 0x9a, 0xb3, 0x07, 0x6c, 0x97, 0xf9, + 0xda, 0x57, 0xd3, 0xb3, 0xf0, 0x1c, 0xef, 0x20, 0xf3, 0xb6, 0xb4, 0xf6, 0xc2, 0x8b, 0x20, 0x0c, + 0x9b, 0x9e, 0x5d, 0x15, 0x81, 0xe3, 0x3d, 0xe4, 0x21, 0x18, 0xa5, 0x4b, 0xcb, 0xa8, 0xf4, 0x44, + 0x44, 0x05, 0x56, 0xb0, 0xd9, 0x4b, 0xa3, 0x7b, 0x65, 0x67, 0xca, 0x7c, 0xa8, 0xdf, 0x1e, 0x1b, + 0xc8, 0xdc, 0x41, 0x2c, 0xe5, 0xf5, 0xfa, 0x34, 0xd9, 0x0b, 0xf3, 0x4e, 0x04, 0x01, 0x12, 0x14, + 0x5f, 0x6a, 0xb2, 0x9a, 0x0d, 0x15, 0x75, 0xd2, 0x64, 0xe2, 0xd0, 0xe2, 0x35, 0x94, 0xee, 0x91, + 0x76, 0x94, 0x9d, 0xa2, 0x8d, 0x5f, 0xf0, 0x37, 0x78, 0x2a, 0xdf, 0x8a, 0x68, 0xf7, 0x9e, 0xfb, + 0x63, 0x3d, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0xc8, 0x8f, 0xec, 0x97, 0xbb, 0x01, 0x00, 0x00, } diff --git a/pkg/proto/hapi/release/status.pb.go b/pkg/proto/hapi/release/status.pb.go index 1d2908ab2..29144b7ca 100644 --- a/pkg/proto/hapi/release/status.pb.go +++ b/pkg/proto/hapi/release/status.pb.go @@ -84,23 +84,24 @@ func init() { func init() { proto.RegisterFile("hapi/release/status.proto", fileDescriptor3) } var fileDescriptor3 = []byte{ - // 288 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x54, 0x90, 0x5f, 0x6b, 0xf2, 0x30, - 0x14, 0xc6, 0xdf, 0x6a, 0x5b, 0xdf, 0x1e, 0x45, 0x4a, 0x36, 0x58, 0x2b, 0x1b, 0x0c, 0xaf, 0x76, - 0xb3, 0x16, 0xdc, 0x27, 0xd8, 0xd6, 0x38, 0x64, 0xa5, 0x4a, 0xab, 0xec, 0xcf, 0x8d, 0x54, 0x97, - 0x39, 0xa1, 0x34, 0xd2, 0x24, 0x17, 0xfb, 0x10, 0xfb, 0xce, 0x3b, 0x6d, 0x84, 0xce, 0xbb, 0x3c, - 0x79, 0x7e, 0x27, 0xe7, 0x47, 0xc0, 0xff, 0xca, 0x0f, 0xfb, 0xb0, 0x62, 0x05, 0xcb, 0x05, 0x0b, - 0x85, 0xcc, 0xa5, 0x12, 0xc1, 0xa1, 0xe2, 0x92, 0x93, 0x41, 0x5d, 0x05, 0xc7, 0x6a, 0x74, 0x75, - 0x02, 0x4a, 0x26, 0xe4, 0x5a, 0xa8, 0xbd, 0x64, 0x1a, 0x1e, 0xf9, 0x3b, 0xce, 0x77, 0x05, 0x0b, - 0x9b, 0xb4, 0x51, 0x9f, 0x61, 0x5e, 0x7e, 0xeb, 0x6a, 0xfc, 0xd3, 0x01, 0x3b, 0x6b, 0x1e, 0x26, - 0xb7, 0x60, 0x6e, 0xf9, 0x07, 0xf3, 0x8c, 0x6b, 0xe3, 0x66, 0x38, 0xf1, 0x83, 0xbf, 0x1b, 0x02, - 0xcd, 0x04, 0x8f, 0x08, 0xa4, 0x0d, 0x46, 0x2e, 0xc1, 0xa9, 0x98, 0xe0, 0xaa, 0xda, 0x32, 0xe1, - 0x75, 0x71, 0xc6, 0x49, 0xdb, 0x0b, 0x72, 0x0e, 0x56, 0xc9, 0x51, 0xc4, 0x33, 0x9b, 0x46, 0x07, - 0x32, 0x85, 0xb3, 0x22, 0x47, 0xb9, 0xd6, 0x70, 0x5d, 0xa9, 0xd2, 0xb3, 0x90, 0xe9, 0x4f, 0x2e, - 0x4e, 0x37, 0x2e, 0x91, 0xc9, 0x6a, 0x24, 0x75, 0xeb, 0x99, 0x36, 0xaa, 0x72, 0xfc, 0x0a, 0x66, - 0x6d, 0x42, 0xfa, 0xd0, 0x5b, 0x25, 0xcf, 0xc9, 0xfc, 0x25, 0x71, 0xff, 0x91, 0x01, 0xfc, 0x8f, - 0xe8, 0x22, 0x9e, 0xbf, 0xd1, 0xc8, 0x35, 0xea, 0x2a, 0xa2, 0x31, 0x5d, 0x62, 0xe8, 0x90, 0x21, - 0x40, 0xb6, 0x5a, 0xd0, 0x34, 0xa3, 0x11, 0xe6, 0x2e, 0x01, 0xb0, 0xa7, 0xf7, 0xb3, 0x18, 0xcf, - 0xa6, 0x1e, 0x43, 0x70, 0x96, 0x3c, 0xb9, 0xd6, 0x83, 0xf3, 0xde, 0x3b, 0x0a, 0x6c, 0xec, 0xe6, - 0x87, 0xee, 0x7e, 0x03, 0x00, 0x00, 0xff, 0xff, 0xd4, 0x11, 0x21, 0x30, 0x86, 0x01, 0x00, 0x00, + // 291 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x54, 0x90, 0xdf, 0x6a, 0xc2, 0x30, + 0x14, 0xc6, 0x57, 0xad, 0x3a, 0x8f, 0x22, 0x21, 0x1b, 0xac, 0xca, 0x06, 0xc5, 0xab, 0xde, 0xac, + 0x05, 0xf7, 0x04, 0xdb, 0x12, 0x87, 0xac, 0x54, 0x69, 0x2b, 0xfb, 0x73, 0x53, 0xaa, 0x9e, 0x39, + 0xa1, 0x34, 0xd2, 0x24, 0x17, 0x7b, 0x88, 0xbd, 0xf3, 0x68, 0x2b, 0x74, 0x5e, 0x7e, 0xf9, 0xfd, + 0x4e, 0xce, 0xc7, 0x81, 0xf1, 0x77, 0x7a, 0x3c, 0x78, 0x05, 0x66, 0x98, 0x4a, 0xf4, 0xa4, 0x4a, + 0x95, 0x96, 0xee, 0xb1, 0x10, 0x4a, 0xd0, 0x61, 0x89, 0xdc, 0x13, 0x9a, 0xdc, 0x9d, 0x89, 0x0a, + 0xa5, 0x4a, 0xa4, 0x3e, 0x28, 0xac, 0xe5, 0xc9, 0x78, 0x2f, 0xc4, 0x3e, 0x43, 0xaf, 0x4a, 0x1b, + 0xfd, 0xe5, 0xa5, 0xf9, 0x4f, 0x8d, 0xa6, 0xbf, 0x2d, 0xe8, 0x46, 0xd5, 0xc7, 0xf4, 0x1e, 0xcc, + 0xad, 0xd8, 0xa1, 0x65, 0xd8, 0x86, 0x33, 0x9a, 0x8d, 0xdd, 0xff, 0x1b, 0xdc, 0xda, 0x71, 0x9f, + 0xc5, 0x0e, 0xc3, 0x4a, 0xa3, 0xb7, 0xd0, 0x2f, 0x50, 0x0a, 0x5d, 0x6c, 0x51, 0x5a, 0x6d, 0xdb, + 0x70, 0xfa, 0x61, 0xf3, 0x40, 0xaf, 0xa1, 0x93, 0x0b, 0x85, 0xd2, 0x32, 0x2b, 0x52, 0x07, 0x3a, + 0x87, 0xab, 0x2c, 0x95, 0x2a, 0x69, 0x1a, 0x26, 0x85, 0xce, 0xad, 0x8e, 0x6d, 0x38, 0x83, 0xd9, + 0xcd, 0xf9, 0xc6, 0x18, 0xa5, 0x8a, 0x4a, 0x25, 0x24, 0xe5, 0x4c, 0x13, 0x75, 0x3e, 0x7d, 0x07, + 0xb3, 0x6c, 0x42, 0x07, 0xd0, 0x5b, 0x07, 0xaf, 0xc1, 0xf2, 0x2d, 0x20, 0x17, 0x74, 0x08, 0x97, + 0x8c, 0xaf, 0xfc, 0xe5, 0x07, 0x67, 0xc4, 0x28, 0x11, 0xe3, 0x3e, 0x8f, 0x39, 0x23, 0x2d, 0x3a, + 0x02, 0x88, 0xd6, 0x2b, 0x1e, 0x46, 0x9c, 0x71, 0x46, 0xda, 0x14, 0xa0, 0x3b, 0x7f, 0x5c, 0xf8, + 0x9c, 0x11, 0xb3, 0x1e, 0xf3, 0x79, 0xbc, 0x08, 0x5e, 0x48, 0xe7, 0xa9, 0xff, 0xd9, 0x3b, 0x15, + 0xd8, 0x74, 0xab, 0x0b, 0x3d, 0xfc, 0x05, 0x00, 0x00, 0xff, 0xff, 0xd4, 0x11, 0x21, 0x30, 0x86, + 0x01, 0x00, 0x00, } diff --git a/pkg/proto/hapi/release/test_run.pb.go b/pkg/proto/hapi/release/test_run.pb.go index bee8af066..51b3e72f9 100644 --- a/pkg/proto/hapi/release/test_run.pb.go +++ b/pkg/proto/hapi/release/test_run.pb.go @@ -73,22 +73,22 @@ func init() { func init() { proto.RegisterFile("hapi/release/test_run.proto", fileDescriptor4) } var fileDescriptor4 = []byte{ - // 262 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x8f, 0x41, 0x4b, 0xc3, 0x40, - 0x10, 0x85, 0x4d, 0xac, 0x09, 0x99, 0x14, 0x09, 0x7b, 0x0a, 0x55, 0x50, 0x7a, 0xf2, 0xb4, 0x0b, - 0xd5, 0x8b, 0x07, 0x0f, 0xb1, 0x54, 0x10, 0x25, 0xc2, 0xa6, 0x41, 0xf0, 0x52, 0xb6, 0xba, 0xad, - 0x81, 0x24, 0x1b, 0x92, 0xc9, 0x1f, 0xf1, 0x17, 0xbb, 0x9b, 0x6c, 0xc5, 0x5b, 0x6f, 0x33, 0xf3, - 0xbe, 0xf7, 0x78, 0x03, 0x17, 0xdf, 0xa2, 0x29, 0x58, 0x2b, 0x4b, 0x29, 0x3a, 0xc9, 0x50, 0x76, - 0xb8, 0x69, 0xfb, 0x9a, 0x36, 0xad, 0x42, 0x45, 0xa6, 0x46, 0xa4, 0x56, 0x9c, 0x5d, 0xed, 0x95, - 0xda, 0x97, 0x92, 0x0d, 0xda, 0xb6, 0xdf, 0x31, 0x2c, 0x2a, 0xcd, 0x8b, 0xaa, 0x19, 0xf1, 0xf9, - 0x8f, 0x0b, 0xfe, 0x5a, 0x5f, 0x78, 0x5f, 0x13, 0x02, 0x93, 0x5a, 0x54, 0x32, 0x76, 0xae, 0x9d, - 0x9b, 0x80, 0x0f, 0x33, 0xb9, 0x03, 0x4f, 0xe3, 0xd8, 0x77, 0xb1, 0xab, 0xaf, 0xe7, 0x8b, 0x4b, - 0xfa, 0x3f, 0x9f, 0x5a, 0x2b, 0xcd, 0x06, 0x86, 0x5b, 0xd6, 0x24, 0x15, 0xf5, 0x4e, 0xc5, 0xa7, - 0x63, 0x92, 0x99, 0xc9, 0x3d, 0x80, 0x56, 0x5b, 0x94, 0x5f, 0x1b, 0x81, 0xf1, 0x44, 0x2b, 0xe1, - 0x62, 0x46, 0xc7, 0x7e, 0xf4, 0xd0, 0x8f, 0xae, 0x0f, 0xfd, 0x78, 0x60, 0xe9, 0x04, 0xc9, 0x03, - 0x4c, 0x3f, 0x55, 0xd5, 0x94, 0xd2, 0x9a, 0xcf, 0x8e, 0x9a, 0xc3, 0x3f, 0x3e, 0xc1, 0x39, 0x03, - 0x6f, 0xec, 0x47, 0x42, 0xf0, 0xf3, 0xf4, 0x25, 0x7d, 0x7b, 0x4f, 0xa3, 0x13, 0xb3, 0x64, 0xf9, - 0x72, 0xb9, 0xca, 0xb2, 0xc8, 0x31, 0xcb, 0x53, 0xf2, 0xfc, 0x9a, 0xf3, 0x55, 0xe4, 0x3e, 0x06, - 0x1f, 0xbe, 0x7d, 0x70, 0xeb, 0x0d, 0xe1, 0xb7, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x8d, 0xb9, - 0xce, 0x57, 0x74, 0x01, 0x00, 0x00, + // 265 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x8f, 0x41, 0x4b, 0xfb, 0x40, + 0x14, 0xc4, 0xff, 0xc9, 0xbf, 0x26, 0x64, 0x53, 0x24, 0xec, 0x29, 0x54, 0xc1, 0xd0, 0x53, 0x4e, + 0xbb, 0x50, 0xbd, 0x78, 0xf0, 0x10, 0x4b, 0x05, 0x51, 0x22, 0x6c, 0x1a, 0x04, 0x2f, 0x65, 0xab, + 0xaf, 0x35, 0x90, 0x64, 0x43, 0xf6, 0xe5, 0x8b, 0xf8, 0x89, 0x65, 0x93, 0xad, 0x78, 0xf3, 0xf6, + 0x86, 0xf9, 0xcd, 0x30, 0x8f, 0x5c, 0x7c, 0xca, 0xae, 0xe2, 0x3d, 0xd4, 0x20, 0x35, 0x70, 0x04, + 0x8d, 0xbb, 0x7e, 0x68, 0x59, 0xd7, 0x2b, 0x54, 0x74, 0x6e, 0x4c, 0x66, 0xcd, 0xc5, 0xd5, 0x51, + 0xa9, 0x63, 0x0d, 0x7c, 0xf4, 0xf6, 0xc3, 0x81, 0x63, 0xd5, 0x80, 0x46, 0xd9, 0x74, 0x13, 0xbe, + 0xfc, 0x72, 0x89, 0xbf, 0x05, 0x8d, 0x62, 0x68, 0x29, 0x25, 0xb3, 0x56, 0x36, 0x10, 0x3b, 0x89, + 0x93, 0x06, 0x62, 0xbc, 0xe9, 0x0d, 0xf1, 0x34, 0x4a, 0x1c, 0x74, 0xec, 0x26, 0x4e, 0x7a, 0xbe, + 0xba, 0x64, 0xbf, 0xfb, 0x99, 0x8d, 0xb2, 0x62, 0x64, 0x84, 0x65, 0x4d, 0x53, 0xd5, 0x1e, 0x54, + 0xfc, 0x7f, 0x6a, 0x32, 0x37, 0xbd, 0x25, 0x44, 0xa3, 0xec, 0x11, 0x3e, 0x76, 0x12, 0xe3, 0x59, + 0xe2, 0xa4, 0xe1, 0x6a, 0xc1, 0xa6, 0x7d, 0xec, 0xb4, 0x8f, 0x6d, 0x4f, 0xfb, 0x44, 0x60, 0xe9, + 0x0c, 0xe9, 0x1d, 0x99, 0xbf, 0xab, 0xa6, 0xab, 0xc1, 0x86, 0xcf, 0xfe, 0x0c, 0x87, 0x3f, 0x7c, + 0x86, 0x4b, 0x4e, 0xbc, 0x69, 0x1f, 0x0d, 0x89, 0x5f, 0xe6, 0x4f, 0xf9, 0xcb, 0x6b, 0x1e, 0xfd, + 0x33, 0xa2, 0x28, 0xd7, 0xeb, 0x4d, 0x51, 0x44, 0x8e, 0x11, 0x0f, 0xd9, 0xe3, 0x73, 0x29, 0x36, + 0x91, 0x7b, 0x1f, 0xbc, 0xf9, 0xf6, 0xc1, 0xbd, 0x37, 0x96, 0x5f, 0x7f, 0x07, 0x00, 0x00, 0xff, + 0xff, 0x8d, 0xb9, 0xce, 0x57, 0x74, 0x01, 0x00, 0x00, } diff --git a/pkg/proto/hapi/release/test_suite.pb.go b/pkg/proto/hapi/release/test_suite.pb.go index d1a07984b..27fe45ac5 100644 --- a/pkg/proto/hapi/release/test_suite.pb.go +++ b/pkg/proto/hapi/release/test_suite.pb.go @@ -57,18 +57,18 @@ func init() { func init() { proto.RegisterFile("hapi/release/test_suite.proto", fileDescriptor5) } var fileDescriptor5 = []byte{ - // 205 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x92, 0xcd, 0x48, 0x2c, 0xc8, - 0xd4, 0x2f, 0x4a, 0xcd, 0x49, 0x4d, 0x2c, 0x4e, 0xd5, 0x2f, 0x49, 0x2d, 0x2e, 0x89, 0x2f, 0x2e, - 0xcd, 0x2c, 0x49, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x01, 0x49, 0xeb, 0x41, 0xa5, - 0xa5, 0xe4, 0xd3, 0xf3, 0xf3, 0xd3, 0x73, 0x52, 0xf5, 0xc1, 0x72, 0x49, 0xa5, 0x69, 0xfa, 0x25, - 0x99, 0xb9, 0x40, 0x1d, 0x89, 0xb9, 0x05, 0x10, 0xe5, 0x52, 0xd2, 0x98, 0xa6, 0x15, 0x95, 0xe6, - 0x41, 0x24, 0x95, 0xb6, 0x31, 0x72, 0x71, 0x86, 0x00, 0x85, 0x82, 0x41, 0xe6, 0x0b, 0x59, 0x72, - 0x71, 0x01, 0x75, 0x16, 0x95, 0xa4, 0xa6, 0xc4, 0x27, 0x96, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x70, - 0x1b, 0x49, 0xe9, 0x41, 0x2c, 0xd0, 0x83, 0x59, 0xa0, 0x17, 0x02, 0xb3, 0x20, 0x88, 0x13, 0xaa, - 0xda, 0xb1, 0x44, 0xc8, 0x96, 0x8b, 0x27, 0x39, 0x3f, 0xb7, 0x20, 0x27, 0x15, 0xaa, 0x99, 0x89, - 0xa0, 0x66, 0x6e, 0xb8, 0x7a, 0xa0, 0x76, 0x7d, 0x2e, 0xf6, 0xa2, 0xd4, 0xe2, 0xd2, 0x9c, 0x92, - 0x62, 0x09, 0x66, 0x05, 0x66, 0xa0, 0x4e, 0x51, 0x3d, 0x64, 0x5f, 0xea, 0x81, 0xdc, 0x18, 0x54, - 0x9a, 0x17, 0x04, 0x53, 0xe5, 0xc4, 0x19, 0xc5, 0x0e, 0x95, 0x4b, 0x62, 0x03, 0x1b, 0x6e, 0x0c, - 0x08, 0x00, 0x00, 0xff, 0xff, 0x8c, 0x59, 0x65, 0x4f, 0x37, 0x01, 0x00, 0x00, + // 207 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x8f, 0xc1, 0x4a, 0x86, 0x40, + 0x14, 0x85, 0x31, 0x21, 0x71, 0x74, 0x35, 0x10, 0x88, 0x11, 0x49, 0x2b, 0x57, 0x33, 0x60, 0xab, + 0x16, 0x2d, 0xec, 0x11, 0xcc, 0x55, 0x1b, 0x19, 0xeb, 0x66, 0xc2, 0xe8, 0x0c, 0x73, 0xef, 0xbc, + 0x5a, 0xcf, 0x17, 0xea, 0x18, 0x41, 0x8b, 0x7f, 0xfd, 0x7d, 0xe7, 0x9c, 0x7b, 0xd9, 0xdd, 0x97, + 0xb2, 0xb3, 0x74, 0xa0, 0x41, 0x21, 0x48, 0x02, 0xa4, 0x01, 0xfd, 0x4c, 0x20, 0xac, 0x33, 0x64, + 0x78, 0xbe, 0x61, 0x11, 0x70, 0x79, 0x3f, 0x19, 0x33, 0x69, 0x90, 0x3b, 0x1b, 0xfd, 0xa7, 0xa4, + 0x79, 0x01, 0x24, 0xb5, 0xd8, 0x43, 0x2f, 0x6f, 0xff, 0xb7, 0x39, 0xbf, 0x1e, 0xf0, 0xe1, 0x3b, + 0x62, 0x69, 0x0f, 0x48, 0xaf, 0x5b, 0x3f, 0x7f, 0x62, 0x0c, 0x49, 0x39, 0x82, 0x8f, 0x41, 0x51, + 0x11, 0x55, 0x51, 0x9d, 0x35, 0xa5, 0x38, 0x06, 0xc4, 0x39, 0x20, 0xfa, 0x73, 0xa0, 0x4b, 0x83, + 0xdd, 0x12, 0x7f, 0x66, 0xf9, 0xbb, 0x59, 0xac, 0x86, 0x10, 0xbe, 0xba, 0x18, 0xce, 0x7e, 0xfd, + 0x96, 0xb8, 0x64, 0x89, 0x03, 0xf4, 0x9a, 0xb0, 0x88, 0xab, 0xb8, 0xce, 0x9a, 0x1b, 0xf1, 0xf7, + 0x4b, 0xb1, 0xdd, 0xd8, 0xf9, 0xb5, 0x3b, 0xad, 0x97, 0xf4, 0x2d, 0x09, 0x6c, 0xbc, 0xde, 0xcb, + 0x1f, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x8c, 0x59, 0x65, 0x4f, 0x37, 0x01, 0x00, 0x00, } diff --git a/pkg/proto/hapi/services/tiller.pb.go b/pkg/proto/hapi/services/tiller.pb.go index 02d93777e..bd802d29c 100644 --- a/pkg/proto/hapi/services/tiller.pb.go +++ b/pkg/proto/hapi/services/tiller.pb.go @@ -992,76 +992,77 @@ var _ReleaseService_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("hapi/services/tiller.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 1136 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x57, 0x5b, 0x6f, 0xe3, 0x44, - 0x14, 0x5e, 0x27, 0x69, 0x2e, 0xa7, 0x17, 0xda, 0xe9, 0x25, 0xa9, 0x05, 0x68, 0x31, 0x82, 0x76, - 0x17, 0x36, 0x85, 0xf0, 0x84, 0x84, 0x90, 0xda, 0x6e, 0xd4, 0x16, 0x4a, 0x56, 0x72, 0xb6, 0x8b, - 0xc4, 0x03, 0x91, 0x9b, 0x4c, 0x5a, 0xb3, 0x8e, 0x1d, 0x3c, 0x4e, 0xd9, 0xbe, 0xf2, 0xc6, 0xdf, - 0xe0, 0x0d, 0x7e, 0x0c, 0x7f, 0x80, 0x3f, 0xc3, 0x5c, 0x5d, 0x8f, 0x63, 0xa7, 0x26, 0x2f, 0xf1, - 0xcc, 0x9c, 0x33, 0xe7, 0xf2, 0x9d, 0x33, 0xdf, 0x4c, 0xc0, 0xbc, 0x75, 0xa6, 0xee, 0x11, 0xc1, - 0xe1, 0x9d, 0x3b, 0xc4, 0xe4, 0x28, 0x72, 0x3d, 0x0f, 0x87, 0xed, 0x69, 0x18, 0x44, 0x01, 0xda, - 0x61, 0xb2, 0xb6, 0x92, 0xb5, 0x85, 0xcc, 0xdc, 0xe3, 0x3b, 0x86, 0xb7, 0x4e, 0x18, 0x89, 0x5f, - 0xa1, 0x6d, 0x36, 0x93, 0xeb, 0x81, 0x3f, 0x76, 0x6f, 0xa4, 0x40, 0xb8, 0x08, 0xb1, 0x87, 0x1d, - 0x82, 0xd5, 0x57, 0xdb, 0xa4, 0x64, 0xae, 0x3f, 0x0e, 0xa4, 0x60, 0x5f, 0x13, 0x90, 0xc8, 0x89, - 0x66, 0x44, 0xb3, 0x77, 0x87, 0x43, 0xe2, 0x06, 0xbe, 0xfa, 0x0a, 0x99, 0xf5, 0x67, 0x09, 0xb6, - 0x2f, 0x5d, 0x12, 0xd9, 0x62, 0x23, 0xb1, 0xf1, 0xaf, 0x33, 0x4c, 0x22, 0xb4, 0x03, 0x2b, 0x9e, - 0x3b, 0x71, 0xa3, 0x96, 0xf1, 0xd4, 0x38, 0x2c, 0xdb, 0x62, 0x82, 0xf6, 0xa0, 0x1a, 0x8c, 0xc7, - 0x04, 0x47, 0xad, 0x12, 0x5d, 0x6e, 0xd8, 0x72, 0x86, 0xbe, 0x85, 0x1a, 0x09, 0xc2, 0x68, 0x70, - 0x7d, 0xdf, 0x2a, 0x53, 0xc1, 0x46, 0xe7, 0x93, 0x76, 0x16, 0x14, 0x6d, 0xe6, 0xa9, 0x4f, 0x15, - 0xdb, 0xec, 0xe7, 0xe4, 0xde, 0xae, 0x12, 0xfe, 0x65, 0x76, 0xc7, 0xae, 0x17, 0xe1, 0xb0, 0x55, - 0x11, 0x76, 0xc5, 0x0c, 0x9d, 0x01, 0x70, 0xbb, 0x41, 0x38, 0xa2, 0xb2, 0x15, 0x6e, 0xfa, 0xb0, - 0x80, 0xe9, 0x57, 0x4c, 0xdf, 0x6e, 0x10, 0x35, 0x44, 0xdf, 0xc0, 0x9a, 0x80, 0x64, 0x30, 0x0c, - 0x46, 0x98, 0xb4, 0xaa, 0x4f, 0xcb, 0xd4, 0xd4, 0xbe, 0x30, 0xa5, 0x10, 0xee, 0x0b, 0xd0, 0x4e, - 0xa9, 0x86, 0xbd, 0x2a, 0xd4, 0xd9, 0x98, 0x58, 0x3f, 0x43, 0x5d, 0x99, 0xb7, 0x3a, 0x50, 0x15, - 0xc1, 0xa3, 0x55, 0xa8, 0x5d, 0xf5, 0xbe, 0xef, 0xbd, 0xfa, 0xb1, 0xb7, 0xf9, 0x04, 0xd5, 0xa1, - 0xd2, 0x3b, 0xfe, 0xa1, 0xbb, 0x69, 0xa0, 0x2d, 0x58, 0xbf, 0x3c, 0xee, 0xbf, 0x1e, 0xd8, 0xdd, - 0xcb, 0xee, 0x71, 0xbf, 0xfb, 0x72, 0xb3, 0x64, 0x7d, 0x08, 0x8d, 0x38, 0x2a, 0x54, 0x83, 0xf2, - 0x71, 0xff, 0x54, 0x6c, 0x79, 0xd9, 0xa5, 0x23, 0xc3, 0xfa, 0xc3, 0x80, 0x1d, 0xbd, 0x08, 0x64, - 0x1a, 0xf8, 0x04, 0xb3, 0x2a, 0x0c, 0x83, 0x99, 0x1f, 0x57, 0x81, 0x4f, 0x10, 0x82, 0x8a, 0x8f, - 0xdf, 0xa9, 0x1a, 0xf0, 0x31, 0xd3, 0x8c, 0x82, 0xc8, 0xf1, 0x38, 0xfe, 0x54, 0x93, 0x4f, 0xd0, - 0x97, 0x50, 0x97, 0xc9, 0x11, 0x8a, 0x6c, 0xf9, 0x70, 0xb5, 0xb3, 0xab, 0xa7, 0x2c, 0x3d, 0xda, - 0xb1, 0x9a, 0x75, 0x06, 0xcd, 0x33, 0xac, 0x22, 0x11, 0x88, 0xa8, 0x9e, 0x60, 0x7e, 0x9d, 0x09, - 0xe6, 0xc1, 0x30, 0xbf, 0x74, 0x8c, 0x5a, 0x50, 0x93, 0x0d, 0xc5, 0xc3, 0x59, 0xb1, 0xd5, 0xd4, - 0x8a, 0xa0, 0x35, 0x6f, 0x48, 0xe6, 0x95, 0x65, 0xe9, 0x53, 0xa8, 0xb0, 0x76, 0xe6, 0x66, 0x56, - 0x3b, 0x48, 0x8f, 0xf3, 0x82, 0x4a, 0x6c, 0x2e, 0x47, 0xef, 0x43, 0x83, 0xe9, 0x93, 0xa9, 0x33, - 0xc4, 0x3c, 0xdb, 0x86, 0xfd, 0xb0, 0x60, 0x9d, 0x27, 0xbd, 0x9e, 0x06, 0x7e, 0x84, 0xfd, 0x68, - 0xb9, 0xf8, 0x2f, 0x61, 0x3f, 0xc3, 0x92, 0x4c, 0xe0, 0x08, 0x6a, 0x32, 0x34, 0x6e, 0x2d, 0x17, - 0x57, 0xa5, 0x65, 0xfd, 0x5d, 0x82, 0x9d, 0xab, 0xe9, 0xc8, 0x89, 0xb0, 0x12, 0x2d, 0x08, 0xea, - 0x80, 0x96, 0x9d, 0xd1, 0x82, 0xc4, 0x62, 0x4b, 0xd8, 0x16, 0xdc, 0x71, 0xca, 0x7e, 0x6d, 0x21, - 0x47, 0xcf, 0xa1, 0x7a, 0xe7, 0x78, 0xd4, 0x0e, 0x07, 0x22, 0x46, 0x4d, 0x6a, 0x72, 0x4e, 0xb1, - 0xa5, 0x06, 0x6a, 0x42, 0x6d, 0x14, 0xde, 0x0f, 0xc2, 0x99, 0xcf, 0x0f, 0x59, 0xdd, 0xae, 0xd2, - 0xa9, 0x3d, 0xf3, 0xd1, 0xc7, 0xb0, 0x3e, 0x72, 0x89, 0x73, 0xed, 0xe1, 0xc1, 0x6d, 0x10, 0xbc, - 0x25, 0xfc, 0x9c, 0xd5, 0xed, 0x35, 0xb9, 0x78, 0xce, 0xd6, 0x90, 0xc9, 0x3a, 0x69, 0x18, 0x62, - 0x9a, 0x00, 0x3d, 0x3c, 0x4c, 0x1e, 0xcf, 0x19, 0x86, 0x91, 0x3b, 0xc1, 0xc1, 0x2c, 0x6a, 0xd5, - 0x78, 0xf7, 0xa9, 0x29, 0xfa, 0x08, 0xd6, 0x42, 0x4c, 0x09, 0x62, 0x20, 0xa3, 0xac, 0xf3, 0x9d, - 0xab, 0x7c, 0xed, 0x8d, 0x08, 0x8b, 0xe6, 0xff, 0x9b, 0x43, 0x79, 0xa6, 0xc1, 0x45, 0x7c, 0x4c, - 0x8b, 0xb8, 0x9b, 0xc2, 0x6a, 0x59, 0xd8, 0xff, 0x31, 0x60, 0xcf, 0x0e, 0x3c, 0xef, 0xda, 0x19, - 0xbe, 0x2d, 0x00, 0x7c, 0x02, 0xa3, 0xd2, 0x62, 0x8c, 0xca, 0x19, 0x18, 0x25, 0x7a, 0xa9, 0xa2, - 0xf5, 0x92, 0x86, 0xde, 0x4a, 0x3e, 0x7a, 0x55, 0x1d, 0x3d, 0x05, 0x4d, 0x2d, 0x01, 0xcd, 0x77, - 0xd0, 0x9c, 0xcb, 0x67, 0x59, 0x70, 0xfe, 0x2a, 0xc1, 0xee, 0x85, 0x4f, 0x89, 0xce, 0xf3, 0x52, - 0xd8, 0xc4, 0x0d, 0x68, 0x14, 0x6e, 0xc0, 0xd2, 0xff, 0x69, 0xc0, 0xb2, 0x06, 0xae, 0xaa, 0x44, - 0x25, 0x51, 0x89, 0x42, 0x4d, 0xa9, 0x51, 0x41, 0x35, 0x45, 0x05, 0xe8, 0x03, 0x80, 0x10, 0xcf, - 0x08, 0x1e, 0x70, 0xe3, 0x02, 0xc4, 0x06, 0x5f, 0xe9, 0xc9, 0x93, 0xaf, 0x70, 0xaf, 0x67, 0xe3, - 0x9e, 0x6c, 0xc9, 0x0b, 0xd8, 0x4b, 0x43, 0xb5, 0x2c, 0xec, 0xbf, 0x1b, 0xd0, 0xbc, 0xf2, 0xdd, - 0x4c, 0xe0, 0xb3, 0x9a, 0x72, 0x0e, 0x8a, 0x52, 0x06, 0x14, 0x94, 0xff, 0xa7, 0xb3, 0xf0, 0x06, - 0x4b, 0x68, 0xc5, 0x24, 0x99, 0x63, 0x45, 0xcb, 0xd1, 0x1a, 0x40, 0x6b, 0x3e, 0x86, 0x25, 0x33, - 0x62, 0x51, 0xc7, 0xd4, 0xdd, 0x10, 0x34, 0x6d, 0x6d, 0xc3, 0x16, 0xa5, 0xcf, 0x37, 0xe2, 0x00, - 0xc8, 0xf4, 0xac, 0x2e, 0xa0, 0xe4, 0xe2, 0x83, 0x3f, 0xb9, 0xa4, 0xfb, 0x53, 0x2f, 0x15, 0xa5, - 0xaf, 0xb4, 0xac, 0xaf, 0xb9, 0xed, 0x73, 0x7a, 0x63, 0x06, 0xb4, 0x83, 0x16, 0x40, 0xb7, 0x09, - 0xe5, 0x89, 0xf3, 0x4e, 0x32, 0x3b, 0x1b, 0xd2, 0xeb, 0x0d, 0x25, 0xb7, 0xca, 0x08, 0x92, 0xf7, - 0xa4, 0x51, 0xec, 0x9e, 0x3c, 0x01, 0xf4, 0x1a, 0xc7, 0x57, 0xf6, 0x23, 0x57, 0x8c, 0x2a, 0x42, - 0x49, 0x2f, 0xc2, 0x01, 0x6c, 0x6b, 0x36, 0x64, 0x34, 0x2c, 0x6a, 0x72, 0x23, 0x6d, 0xb0, 0x61, - 0xe7, 0xdf, 0x3a, 0x6c, 0xa8, 0x9b, 0x54, 0xbc, 0x7b, 0x90, 0x0b, 0x6b, 0xc9, 0x27, 0x03, 0x7a, - 0x96, 0xff, 0x2c, 0x4a, 0xbd, 0xed, 0xcc, 0xe7, 0x45, 0x54, 0x45, 0x2c, 0xd6, 0x93, 0x2f, 0x0c, - 0x44, 0x60, 0x33, 0x7d, 0x93, 0xa3, 0x17, 0xd9, 0x36, 0x72, 0x9e, 0x0e, 0x66, 0xbb, 0xa8, 0xba, - 0x72, 0x8b, 0xee, 0x78, 0x8d, 0xf5, 0xeb, 0x17, 0x3d, 0x6a, 0x46, 0xbf, 0xf1, 0xcd, 0xa3, 0xc2, - 0xfa, 0xb1, 0xdf, 0x5f, 0x60, 0x5d, 0xbb, 0x7b, 0x50, 0x0e, 0x5a, 0x59, 0x97, 0xb9, 0xf9, 0x59, - 0x21, 0xdd, 0xd8, 0xd7, 0x04, 0x36, 0x74, 0x52, 0x41, 0x39, 0x06, 0x32, 0x59, 0xda, 0xfc, 0xbc, - 0x98, 0x72, 0xec, 0x8e, 0xd6, 0x31, 0x7d, 0xe6, 0xf3, 0xea, 0x98, 0xc3, 0x4f, 0x79, 0x75, 0xcc, - 0xa3, 0x12, 0xea, 0xd4, 0x01, 0x78, 0x38, 0xf2, 0xe8, 0x20, 0xb7, 0x20, 0x3a, 0x53, 0x98, 0x87, - 0x8f, 0x2b, 0xc6, 0x2e, 0xa6, 0xf0, 0x5e, 0xea, 0x4e, 0x44, 0x39, 0xd0, 0x64, 0x3f, 0x05, 0xcc, - 0x17, 0x05, 0xb5, 0x53, 0x49, 0x49, 0x16, 0x59, 0x90, 0x94, 0x4e, 0x51, 0x0b, 0x92, 0x4a, 0x11, - 0x12, 0x75, 0xe1, 0xd2, 0x13, 0x3f, 0xf3, 0xa5, 0x6b, 0xc6, 0x12, 0x28, 0x67, 0xf7, 0x3c, 0x0b, - 0x99, 0xcf, 0x0a, 0x68, 0x3e, 0x9c, 0xef, 0x13, 0xf8, 0xa9, 0xae, 0x54, 0xaf, 0xab, 0xfc, 0x6f, - 0xe1, 0x57, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x70, 0xcd, 0xbe, 0x36, 0xe7, 0x0e, 0x00, 0x00, + // 1141 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x57, 0xdd, 0x6e, 0xe3, 0x44, + 0x14, 0xae, 0xf3, 0x9f, 0xd3, 0x1f, 0xd2, 0xe9, 0x9f, 0x6b, 0x01, 0x2a, 0x46, 0xd0, 0xec, 0xc2, + 0xa6, 0x10, 0xae, 0x90, 0x10, 0x52, 0xdb, 0x8d, 0xda, 0x42, 0xe9, 0x4a, 0xce, 0x76, 0x91, 0xb8, + 0x20, 0x72, 0x93, 0x49, 0x6b, 0xd6, 0xf1, 0x04, 0xcf, 0xa4, 0x6c, 0x6f, 0xb9, 0xe3, 0x35, 0xb8, + 0x83, 0x87, 0xe1, 0x05, 0x78, 0x19, 0x34, 0x7f, 0xae, 0x27, 0xb5, 0x5b, 0x93, 0x9b, 0x78, 0x66, + 0xce, 0x99, 0xef, 0x9c, 0xf3, 0x9d, 0x33, 0x67, 0x26, 0xe0, 0xdc, 0xf8, 0xd3, 0xe0, 0x80, 0xe2, + 0xf8, 0x36, 0x18, 0x62, 0x7a, 0xc0, 0x82, 0x30, 0xc4, 0x71, 0x67, 0x1a, 0x13, 0x46, 0xd0, 0x26, + 0x97, 0x75, 0xb4, 0xac, 0x23, 0x65, 0xce, 0xb6, 0xd8, 0x31, 0xbc, 0xf1, 0x63, 0x26, 0x7f, 0xa5, + 0xb6, 0xb3, 0x93, 0x5e, 0x27, 0xd1, 0x38, 0xb8, 0x56, 0x02, 0x69, 0x22, 0xc6, 0x21, 0xf6, 0x29, + 0xd6, 0x5f, 0x63, 0x93, 0x96, 0x05, 0xd1, 0x98, 0x28, 0xc1, 0xae, 0x21, 0xa0, 0xcc, 0x67, 0x33, + 0x6a, 0xe0, 0xdd, 0xe2, 0x98, 0x06, 0x24, 0xd2, 0x5f, 0x29, 0x73, 0xff, 0x2c, 0xc1, 0xc6, 0x79, + 0x40, 0x99, 0x27, 0x37, 0x52, 0x0f, 0xff, 0x3a, 0xc3, 0x94, 0xa1, 0x4d, 0xa8, 0x86, 0xc1, 0x24, + 0x60, 0xb6, 0xb5, 0x67, 0xb5, 0xcb, 0x9e, 0x9c, 0xa0, 0x6d, 0xa8, 0x91, 0xf1, 0x98, 0x62, 0x66, + 0x97, 0xf6, 0xac, 0x76, 0xd3, 0x53, 0x33, 0xf4, 0x2d, 0xd4, 0x29, 0x89, 0xd9, 0xe0, 0xea, 0xce, + 0x2e, 0xef, 0x59, 0xed, 0xb5, 0xee, 0x27, 0x9d, 0x2c, 0x2a, 0x3a, 0xdc, 0x52, 0x9f, 0xc4, 0xac, + 0xc3, 0x7f, 0x8e, 0xee, 0xbc, 0x1a, 0x15, 0x5f, 0x8e, 0x3b, 0x0e, 0x42, 0x86, 0x63, 0xbb, 0x22, + 0x71, 0xe5, 0x0c, 0x9d, 0x00, 0x08, 0x5c, 0x12, 0x8f, 0x70, 0x6c, 0x57, 0x05, 0x74, 0xbb, 0x00, + 0xf4, 0x2b, 0xae, 0xef, 0x35, 0xa9, 0x1e, 0xa2, 0x6f, 0x60, 0x45, 0x52, 0x32, 0x18, 0x92, 0x11, + 0xa6, 0x76, 0x6d, 0xaf, 0xdc, 0x5e, 0xeb, 0xee, 0x4a, 0x28, 0xcd, 0x70, 0x5f, 0x92, 0x76, 0x4c, + 0x46, 0xd8, 0x5b, 0x96, 0xea, 0x7c, 0x4c, 0xdd, 0x9f, 0xa1, 0xa1, 0xe1, 0xdd, 0x2e, 0xd4, 0xa4, + 0xf3, 0x68, 0x19, 0xea, 0x97, 0x17, 0xdf, 0x5f, 0xbc, 0xfa, 0xf1, 0xa2, 0xb5, 0x84, 0x1a, 0x50, + 0xb9, 0x38, 0xfc, 0xa1, 0xd7, 0xb2, 0xd0, 0x3a, 0xac, 0x9e, 0x1f, 0xf6, 0x5f, 0x0f, 0xbc, 0xde, + 0x79, 0xef, 0xb0, 0xdf, 0x7b, 0xd9, 0x2a, 0xb9, 0x1f, 0x42, 0x33, 0xf1, 0x0a, 0xd5, 0xa1, 0x7c, + 0xd8, 0x3f, 0x96, 0x5b, 0x5e, 0xf6, 0xfa, 0xc7, 0x2d, 0xcb, 0xfd, 0xc3, 0x82, 0x4d, 0x33, 0x09, + 0x74, 0x4a, 0x22, 0x8a, 0x79, 0x16, 0x86, 0x64, 0x16, 0x25, 0x59, 0x10, 0x13, 0x84, 0xa0, 0x12, + 0xe1, 0x77, 0x3a, 0x07, 0x62, 0xcc, 0x35, 0x19, 0x61, 0x7e, 0x28, 0xf8, 0x2f, 0x7b, 0x72, 0x82, + 0xbe, 0x84, 0x86, 0x0a, 0x8e, 0xda, 0x95, 0xbd, 0x72, 0x7b, 0xb9, 0xbb, 0x65, 0x86, 0xac, 0x2c, + 0x7a, 0x89, 0x9a, 0x7b, 0x02, 0x3b, 0x27, 0x58, 0x7b, 0x22, 0x19, 0xd1, 0x35, 0xc1, 0xed, 0xfa, + 0x13, 0x2c, 0x9c, 0xe1, 0x76, 0xfd, 0x09, 0x46, 0x36, 0xd4, 0x55, 0x41, 0x09, 0x77, 0xaa, 0x9e, + 0x9e, 0xba, 0x0c, 0xec, 0x87, 0x40, 0x2a, 0xae, 0x2c, 0xa4, 0x4f, 0xa1, 0xc2, 0xcb, 0x59, 0xc0, + 0x2c, 0x77, 0x91, 0xe9, 0xe7, 0x59, 0x34, 0x26, 0x9e, 0x90, 0xa3, 0xf7, 0xa1, 0xc9, 0xf5, 0xe9, + 0xd4, 0x1f, 0x62, 0x11, 0x6d, 0xd3, 0xbb, 0x5f, 0x70, 0x4f, 0xd3, 0x56, 0x8f, 0x49, 0xc4, 0x70, + 0xc4, 0x16, 0xf3, 0xff, 0x1c, 0x76, 0x33, 0x90, 0x54, 0x00, 0x07, 0x50, 0x57, 0xae, 0x09, 0xb4, + 0x5c, 0x5e, 0xb5, 0x96, 0xfb, 0x77, 0x09, 0x36, 0x2f, 0xa7, 0x23, 0x9f, 0x61, 0x2d, 0x7a, 0xc4, + 0xa9, 0x7d, 0xa8, 0x8a, 0xb6, 0xa0, 0xb8, 0x58, 0x97, 0xd8, 0xb2, 0x77, 0x1c, 0xf3, 0x5f, 0x4f, + 0xca, 0xd1, 0x73, 0xa8, 0xdd, 0xfa, 0xe1, 0x0c, 0x53, 0x41, 0x44, 0xc2, 0x9a, 0xd2, 0x14, 0x3d, + 0xc5, 0x53, 0x1a, 0x68, 0x07, 0xea, 0xa3, 0xf8, 0x6e, 0x10, 0xcf, 0x22, 0x71, 0xc8, 0x1a, 0x5e, + 0x6d, 0x14, 0xdf, 0x79, 0xb3, 0x08, 0x7d, 0x0c, 0xab, 0xa3, 0x80, 0xfa, 0x57, 0x21, 0x1e, 0xdc, + 0x10, 0xf2, 0x96, 0x8a, 0x73, 0xd6, 0xf0, 0x56, 0xd4, 0xe2, 0x29, 0x5f, 0x43, 0x0e, 0xaf, 0xa4, + 0x61, 0x8c, 0x7d, 0x86, 0xed, 0x9a, 0x90, 0x27, 0x73, 0xce, 0x21, 0x0b, 0x26, 0x98, 0xcc, 0x98, + 0x5d, 0x17, 0xd5, 0xa7, 0xa7, 0xe8, 0x23, 0x58, 0x89, 0x31, 0xc5, 0x6c, 0xa0, 0xbc, 0x6c, 0x88, + 0x9d, 0xcb, 0x62, 0xed, 0x8d, 0x74, 0x0b, 0x41, 0xe5, 0x37, 0x3f, 0x60, 0x76, 0x53, 0x88, 0xc4, + 0xd8, 0x3d, 0x85, 0xad, 0x39, 0xae, 0x16, 0xa5, 0xfd, 0x1f, 0x0b, 0xb6, 0x3d, 0x12, 0x86, 0x57, + 0xfe, 0xf0, 0x6d, 0x01, 0xe2, 0x53, 0x1c, 0x95, 0x1e, 0xe7, 0xa8, 0x9c, 0xc1, 0x51, 0xaa, 0x96, + 0x2a, 0x46, 0x2d, 0x19, 0xec, 0x55, 0xf3, 0xd9, 0xab, 0x99, 0xec, 0x69, 0x6a, 0xea, 0x29, 0x6a, + 0xbe, 0x83, 0x9d, 0x07, 0xf1, 0x2c, 0x4a, 0xce, 0x5f, 0x25, 0xd8, 0x3a, 0x8b, 0x28, 0xf3, 0xc3, + 0x70, 0x8e, 0x9b, 0xa4, 0x00, 0xad, 0xc2, 0x05, 0x58, 0xfa, 0x3f, 0x05, 0x58, 0x36, 0xc8, 0xd5, + 0x99, 0xa8, 0xa4, 0x32, 0x51, 0xa8, 0x28, 0x8d, 0x56, 0x50, 0x9b, 0x6b, 0x05, 0xe8, 0x03, 0x80, + 0x18, 0xcf, 0x28, 0x1e, 0x08, 0x70, 0x49, 0x62, 0x53, 0xac, 0x5c, 0xa8, 0x93, 0xaf, 0x79, 0x6f, + 0x64, 0xf3, 0x9e, 0x2e, 0xc9, 0x33, 0xd8, 0x9e, 0xa7, 0x6a, 0x51, 0xda, 0x7f, 0xb7, 0x60, 0xe7, + 0x32, 0x0a, 0x32, 0x89, 0xcf, 0x2a, 0xca, 0x07, 0x54, 0x94, 0x32, 0xa8, 0xd8, 0x84, 0xea, 0x74, + 0x16, 0x5f, 0x63, 0x45, 0xad, 0x9c, 0xa4, 0x63, 0xac, 0x18, 0x31, 0xba, 0x03, 0xb0, 0x1f, 0xfa, + 0xb0, 0x60, 0x44, 0xdc, 0xeb, 0xa4, 0x75, 0x37, 0x65, 0x9b, 0x76, 0x37, 0x60, 0xfd, 0x04, 0xb3, + 0x37, 0xf2, 0x00, 0xa8, 0xf0, 0xdc, 0x1e, 0xa0, 0xf4, 0xe2, 0xbd, 0x3d, 0xb5, 0x64, 0xda, 0xd3, + 0x2f, 0x15, 0xad, 0xaf, 0xb5, 0xdc, 0xaf, 0x05, 0xf6, 0x69, 0x40, 0x19, 0x89, 0xef, 0x1e, 0xa3, + 0xae, 0x05, 0xe5, 0x89, 0xff, 0x4e, 0x75, 0x76, 0x3e, 0x74, 0x4f, 0x84, 0x07, 0xc9, 0x56, 0xe5, + 0x41, 0xfa, 0x9e, 0xb4, 0x8a, 0xdd, 0x93, 0x47, 0x80, 0x5e, 0xe3, 0xe4, 0xca, 0x7e, 0xe2, 0x8a, + 0xd1, 0x49, 0x28, 0x99, 0x49, 0xd8, 0x87, 0x0d, 0x03, 0x43, 0x79, 0xc3, 0xbd, 0xa6, 0xd7, 0x0a, + 0x83, 0x0f, 0xbb, 0xff, 0x36, 0x60, 0x4d, 0xdf, 0xa4, 0xf2, 0xdd, 0x83, 0x02, 0x58, 0x49, 0x3f, + 0x19, 0xd0, 0xb3, 0xfc, 0x67, 0xd1, 0xdc, 0xdb, 0xce, 0x79, 0x5e, 0x44, 0x55, 0xfa, 0xe2, 0x2e, + 0x7d, 0x61, 0x21, 0x0a, 0xad, 0xf9, 0x9b, 0x1c, 0xbd, 0xc8, 0xc6, 0xc8, 0x79, 0x3a, 0x38, 0x9d, + 0xa2, 0xea, 0xda, 0x2c, 0xba, 0x15, 0x39, 0x36, 0xaf, 0x5f, 0xf4, 0x24, 0x8c, 0x79, 0xe3, 0x3b, + 0x07, 0x85, 0xf5, 0x13, 0xbb, 0xbf, 0xc0, 0xaa, 0x71, 0xf7, 0xa0, 0x1c, 0xb6, 0xb2, 0x2e, 0x73, + 0xe7, 0xb3, 0x42, 0xba, 0x89, 0xad, 0x09, 0xac, 0x99, 0x4d, 0x05, 0xe5, 0x00, 0x64, 0x76, 0x69, + 0xe7, 0xf3, 0x62, 0xca, 0x89, 0x39, 0x0a, 0xad, 0xf9, 0x33, 0x9f, 0x97, 0xc7, 0x9c, 0xfe, 0x94, + 0x97, 0xc7, 0xbc, 0x56, 0xe2, 0x2e, 0x21, 0x1f, 0xe0, 0xfe, 0xc8, 0xa3, 0xfd, 0xdc, 0x84, 0x98, + 0x9d, 0xc2, 0x69, 0x3f, 0xad, 0x98, 0x98, 0x98, 0xc2, 0x7b, 0x73, 0x77, 0x22, 0xca, 0xa1, 0x26, + 0xfb, 0x29, 0xe0, 0xbc, 0x28, 0xa8, 0x3d, 0x17, 0x94, 0xea, 0x22, 0x8f, 0x04, 0x65, 0xb6, 0xa8, + 0x47, 0x82, 0x9a, 0x6b, 0x48, 0xee, 0x12, 0x0a, 0x60, 0xcd, 0x9b, 0x45, 0xca, 0x34, 0xef, 0x12, + 0x28, 0x67, 0xf7, 0xc3, 0x2e, 0xe4, 0x3c, 0x2b, 0xa0, 0x79, 0x7f, 0xbe, 0x8f, 0xe0, 0xa7, 0x86, + 0x56, 0xbd, 0xaa, 0x89, 0xbf, 0x85, 0x5f, 0xfd, 0x17, 0x00, 0x00, 0xff, 0xff, 0x70, 0xcd, 0xbe, + 0x36, 0xe7, 0x0e, 0x00, 0x00, } diff --git a/pkg/proto/hapi/version/version.pb.go b/pkg/proto/hapi/version/version.pb.go index 4677764e4..79771408e 100644 --- a/pkg/proto/hapi/version/version.pb.go +++ b/pkg/proto/hapi/version/version.pb.go @@ -47,14 +47,15 @@ func init() { func init() { proto.RegisterFile("hapi/version/version.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 144 bytes of a gzipped FileDescriptorProto + // 151 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x92, 0xca, 0x48, 0x2c, 0xc8, 0xd4, 0x2f, 0x4b, 0x2d, 0x2a, 0xce, 0xcc, 0xcf, 0x83, 0xd1, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0x3c, 0x20, 0x39, 0x3d, 0xa8, 0x98, 0x52, 0x3a, 0x17, 0x7b, 0x18, 0x84, 0x29, 0x24, 0xce, - 0xc5, 0x5e, 0x9c, 0x9a, 0x1b, 0x0f, 0x94, 0x91, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0c, 0x62, 0x03, - 0x72, 0x81, 0x92, 0x42, 0xb2, 0x5c, 0x5c, 0xe9, 0x99, 0x25, 0xf1, 0xc9, 0xf9, 0xb9, 0xb9, 0x99, - 0x25, 0x12, 0x4c, 0x60, 0x39, 0x4e, 0xa0, 0x88, 0x33, 0x58, 0x40, 0x48, 0x85, 0x8b, 0x0f, 0x24, - 0x5d, 0x52, 0x94, 0x9a, 0x1a, 0x5f, 0x5c, 0x92, 0x58, 0x92, 0x2a, 0xc1, 0x0c, 0x56, 0xc2, 0x03, - 0x14, 0x0d, 0x01, 0x0a, 0x06, 0x83, 0xc4, 0x9c, 0x38, 0xa3, 0xd8, 0xa1, 0x76, 0x26, 0xb1, 0x81, - 0x1d, 0x62, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x20, 0xcc, 0x0e, 0x1b, 0xa6, 0x00, 0x00, 0x00, + 0xc5, 0x5e, 0x9c, 0x9a, 0x1b, 0x5f, 0x96, 0x5a, 0x24, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x19, 0xc4, + 0x56, 0x9c, 0x9a, 0x1b, 0x96, 0x5a, 0x24, 0x24, 0xcb, 0xc5, 0x95, 0x9e, 0x59, 0x12, 0x9f, 0x9c, + 0x9f, 0x9b, 0x9b, 0x59, 0x22, 0xc1, 0x04, 0x96, 0xe3, 0x4c, 0xcf, 0x2c, 0x71, 0x06, 0x0b, 0x08, + 0xa9, 0x70, 0xf1, 0x81, 0xa4, 0x4b, 0x8a, 0x52, 0x53, 0xe3, 0x8b, 0x4b, 0x12, 0x4b, 0x52, 0x25, + 0x98, 0xc1, 0x4a, 0x78, 0xd2, 0x33, 0x4b, 0x42, 0x8a, 0x52, 0x53, 0x83, 0x41, 0x62, 0x4e, 0x9c, + 0x51, 0xec, 0x50, 0x3b, 0x93, 0xd8, 0xc0, 0x0e, 0x31, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x20, + 0xcc, 0x0e, 0x1b, 0xa6, 0x00, 0x00, 0x00, } From b543190daf38224527d9338e803bd64a5b5a9446 Mon Sep 17 00:00:00 2001 From: Matt Butcher Date: Thu, 9 Feb 2017 15:50:13 -0700 Subject: [PATCH 2/7] docs(related): add Drone Helm plugin --- docs/related.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/related.md b/docs/related.md index c9001e947..7345e813f 100644 --- a/docs/related.md +++ b/docs/related.md @@ -29,6 +29,7 @@ Tools layered on top of Helm or Tiller. - [Rudder](https://github.com/AcalephStorage/rudder) - RESTful (JSON) proxy for Tiller's API - [Helmfile](https://github.com/roboll/helmfile) - Helmfile is a declarative spec for deploying helm charts - [Schelm](https://github.com/databus23/schelm) - Render a Helm manifest to a directory +- [Drone.io Helm Plugin](http://plugins.drone.io/ipedrazas/drone-helm/) - Run Helm inside of the Drone CI/CD system ## Helm Included From 17c9e220b01672615ba461a367aa750d78a9ec97 Mon Sep 17 00:00:00 2001 From: Gergo Huszty Date: Fri, 10 Feb 2017 10:33:02 +0000 Subject: [PATCH 3/7] Fixes #1898: Proposal: move downloader and resolver package to /pkg --- cmd/helm/dependency_build.go | 2 +- cmd/helm/dependency_update.go | 2 +- cmd/helm/fetch.go | 2 +- cmd/helm/install.go | 2 +- cmd/helm/verify.go | 2 +- {cmd/helm => pkg}/downloader/chart_downloader.go | 0 .../downloader/chart_downloader_test.go | 0 {cmd/helm => pkg}/downloader/doc.go | 0 {cmd/helm => pkg}/downloader/manager.go | 2 +- {cmd/helm => pkg}/downloader/manager_test.go | 0 .../downloader/testdata/helm-test-key.pub | Bin .../downloader/testdata/helm-test-key.secret | Bin .../repository/cache/kubernetes-charts-index.yaml | 0 .../helmhome/repository/cache/local-index.yaml | 0 .../repository/cache/testing-basicauth-index.yaml | 0 .../repository/cache/testing-https-index.yaml | 0 .../helmhome/repository/cache/testing-index.yaml | 0 .../testdata/helmhome/repository/local/index.yaml | 0 .../testdata/helmhome/repository/repositories.yaml | 0 .../downloader/testdata/signtest-0.1.0.tgz | Bin .../downloader/testdata/signtest-0.1.0.tgz.prov | 0 .../downloader/testdata/signtest/.helmignore | 0 .../downloader/testdata/signtest/Chart.yaml | 0 .../downloader/testdata/signtest/alpine/Chart.yaml | 0 .../downloader/testdata/signtest/alpine/README.md | 0 .../signtest/alpine/templates/alpine-pod.yaml | 0 .../downloader/testdata/signtest/alpine/values.yaml | 0 .../downloader/testdata/signtest/templates/pod.yaml | 0 .../downloader/testdata/signtest/values.yaml | 0 {cmd/helm => pkg}/resolver/resolver.go | 0 {cmd/helm => pkg}/resolver/resolver_test.go | 0 .../repository/cache/kubernetes-charts-index.yaml | 0 32 files changed, 6 insertions(+), 6 deletions(-) rename {cmd/helm => pkg}/downloader/chart_downloader.go (100%) rename {cmd/helm => pkg}/downloader/chart_downloader_test.go (100%) rename {cmd/helm => pkg}/downloader/doc.go (100%) rename {cmd/helm => pkg}/downloader/manager.go (99%) rename {cmd/helm => pkg}/downloader/manager_test.go (100%) rename {cmd/helm => pkg}/downloader/testdata/helm-test-key.pub (100%) rename {cmd/helm => pkg}/downloader/testdata/helm-test-key.secret (100%) rename {cmd/helm => pkg}/downloader/testdata/helmhome/repository/cache/kubernetes-charts-index.yaml (100%) rename {cmd/helm => pkg}/downloader/testdata/helmhome/repository/cache/local-index.yaml (100%) rename {cmd/helm => pkg}/downloader/testdata/helmhome/repository/cache/testing-basicauth-index.yaml (100%) rename {cmd/helm => pkg}/downloader/testdata/helmhome/repository/cache/testing-https-index.yaml (100%) rename {cmd/helm => pkg}/downloader/testdata/helmhome/repository/cache/testing-index.yaml (100%) rename {cmd/helm => pkg}/downloader/testdata/helmhome/repository/local/index.yaml (100%) rename {cmd/helm => pkg}/downloader/testdata/helmhome/repository/repositories.yaml (100%) rename {cmd/helm => pkg}/downloader/testdata/signtest-0.1.0.tgz (100%) rename {cmd/helm => pkg}/downloader/testdata/signtest-0.1.0.tgz.prov (100%) rename {cmd/helm => pkg}/downloader/testdata/signtest/.helmignore (100%) rename {cmd/helm => pkg}/downloader/testdata/signtest/Chart.yaml (100%) rename {cmd/helm => pkg}/downloader/testdata/signtest/alpine/Chart.yaml (100%) rename {cmd/helm => pkg}/downloader/testdata/signtest/alpine/README.md (100%) rename {cmd/helm => pkg}/downloader/testdata/signtest/alpine/templates/alpine-pod.yaml (100%) rename {cmd/helm => pkg}/downloader/testdata/signtest/alpine/values.yaml (100%) rename {cmd/helm => pkg}/downloader/testdata/signtest/templates/pod.yaml (100%) rename {cmd/helm => pkg}/downloader/testdata/signtest/values.yaml (100%) rename {cmd/helm => pkg}/resolver/resolver.go (100%) rename {cmd/helm => pkg}/resolver/resolver_test.go (100%) rename {cmd/helm => pkg}/resolver/testdata/helmhome/repository/cache/kubernetes-charts-index.yaml (100%) diff --git a/cmd/helm/dependency_build.go b/cmd/helm/dependency_build.go index 326435de2..9be3674a2 100644 --- a/cmd/helm/dependency_build.go +++ b/cmd/helm/dependency_build.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/cobra" - "k8s.io/helm/cmd/helm/downloader" "k8s.io/helm/cmd/helm/helmpath" + "k8s.io/helm/pkg/downloader" ) const dependencyBuildDesc = ` diff --git a/cmd/helm/dependency_update.go b/cmd/helm/dependency_update.go index b80b632dd..0d4f61181 100644 --- a/cmd/helm/dependency_update.go +++ b/cmd/helm/dependency_update.go @@ -20,8 +20,8 @@ import ( "path/filepath" "github.com/spf13/cobra" - "k8s.io/helm/cmd/helm/downloader" "k8s.io/helm/cmd/helm/helmpath" + "k8s.io/helm/pkg/downloader" ) const dependencyUpDesc = ` diff --git a/cmd/helm/fetch.go b/cmd/helm/fetch.go index a29b0d2ea..b4fd83142 100644 --- a/cmd/helm/fetch.go +++ b/cmd/helm/fetch.go @@ -24,9 +24,9 @@ import ( "path/filepath" "github.com/spf13/cobra" - "k8s.io/helm/cmd/helm/downloader" "k8s.io/helm/cmd/helm/helmpath" "k8s.io/helm/pkg/chartutil" + "k8s.io/helm/pkg/downloader" ) const fetchDesc = ` diff --git a/cmd/helm/install.go b/cmd/helm/install.go index 6917a6e6a..1049450ad 100644 --- a/cmd/helm/install.go +++ b/cmd/helm/install.go @@ -32,9 +32,9 @@ import ( "github.com/ghodss/yaml" "github.com/spf13/cobra" - "k8s.io/helm/cmd/helm/downloader" "k8s.io/helm/cmd/helm/helmpath" "k8s.io/helm/cmd/helm/strvals" + "k8s.io/helm/pkg/downloader" "k8s.io/helm/pkg/helm" "k8s.io/helm/pkg/kube" "k8s.io/helm/pkg/proto/hapi/release" diff --git a/cmd/helm/verify.go b/cmd/helm/verify.go index d401e129a..e82eb4e33 100644 --- a/cmd/helm/verify.go +++ b/cmd/helm/verify.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/cobra" - "k8s.io/helm/cmd/helm/downloader" + "k8s.io/helm/pkg/downloader" ) const verifyDesc = ` diff --git a/cmd/helm/downloader/chart_downloader.go b/pkg/downloader/chart_downloader.go similarity index 100% rename from cmd/helm/downloader/chart_downloader.go rename to pkg/downloader/chart_downloader.go diff --git a/cmd/helm/downloader/chart_downloader_test.go b/pkg/downloader/chart_downloader_test.go similarity index 100% rename from cmd/helm/downloader/chart_downloader_test.go rename to pkg/downloader/chart_downloader_test.go diff --git a/cmd/helm/downloader/doc.go b/pkg/downloader/doc.go similarity index 100% rename from cmd/helm/downloader/doc.go rename to pkg/downloader/doc.go diff --git a/cmd/helm/downloader/manager.go b/pkg/downloader/manager.go similarity index 99% rename from cmd/helm/downloader/manager.go rename to pkg/downloader/manager.go index a29dad99b..8475b0d88 100644 --- a/cmd/helm/downloader/manager.go +++ b/pkg/downloader/manager.go @@ -31,10 +31,10 @@ import ( "github.com/ghodss/yaml" "k8s.io/helm/cmd/helm/helmpath" - "k8s.io/helm/cmd/helm/resolver" "k8s.io/helm/pkg/chartutil" "k8s.io/helm/pkg/proto/hapi/chart" "k8s.io/helm/pkg/repo" + "k8s.io/helm/pkg/resolver" "k8s.io/helm/pkg/urlutil" ) diff --git a/cmd/helm/downloader/manager_test.go b/pkg/downloader/manager_test.go similarity index 100% rename from cmd/helm/downloader/manager_test.go rename to pkg/downloader/manager_test.go diff --git a/cmd/helm/downloader/testdata/helm-test-key.pub b/pkg/downloader/testdata/helm-test-key.pub similarity index 100% rename from cmd/helm/downloader/testdata/helm-test-key.pub rename to pkg/downloader/testdata/helm-test-key.pub diff --git a/cmd/helm/downloader/testdata/helm-test-key.secret b/pkg/downloader/testdata/helm-test-key.secret similarity index 100% rename from cmd/helm/downloader/testdata/helm-test-key.secret rename to pkg/downloader/testdata/helm-test-key.secret diff --git a/cmd/helm/downloader/testdata/helmhome/repository/cache/kubernetes-charts-index.yaml b/pkg/downloader/testdata/helmhome/repository/cache/kubernetes-charts-index.yaml similarity index 100% rename from cmd/helm/downloader/testdata/helmhome/repository/cache/kubernetes-charts-index.yaml rename to pkg/downloader/testdata/helmhome/repository/cache/kubernetes-charts-index.yaml diff --git a/cmd/helm/downloader/testdata/helmhome/repository/cache/local-index.yaml b/pkg/downloader/testdata/helmhome/repository/cache/local-index.yaml similarity index 100% rename from cmd/helm/downloader/testdata/helmhome/repository/cache/local-index.yaml rename to pkg/downloader/testdata/helmhome/repository/cache/local-index.yaml diff --git a/cmd/helm/downloader/testdata/helmhome/repository/cache/testing-basicauth-index.yaml b/pkg/downloader/testdata/helmhome/repository/cache/testing-basicauth-index.yaml similarity index 100% rename from cmd/helm/downloader/testdata/helmhome/repository/cache/testing-basicauth-index.yaml rename to pkg/downloader/testdata/helmhome/repository/cache/testing-basicauth-index.yaml diff --git a/cmd/helm/downloader/testdata/helmhome/repository/cache/testing-https-index.yaml b/pkg/downloader/testdata/helmhome/repository/cache/testing-https-index.yaml similarity index 100% rename from cmd/helm/downloader/testdata/helmhome/repository/cache/testing-https-index.yaml rename to pkg/downloader/testdata/helmhome/repository/cache/testing-https-index.yaml diff --git a/cmd/helm/downloader/testdata/helmhome/repository/cache/testing-index.yaml b/pkg/downloader/testdata/helmhome/repository/cache/testing-index.yaml similarity index 100% rename from cmd/helm/downloader/testdata/helmhome/repository/cache/testing-index.yaml rename to pkg/downloader/testdata/helmhome/repository/cache/testing-index.yaml diff --git a/cmd/helm/downloader/testdata/helmhome/repository/local/index.yaml b/pkg/downloader/testdata/helmhome/repository/local/index.yaml similarity index 100% rename from cmd/helm/downloader/testdata/helmhome/repository/local/index.yaml rename to pkg/downloader/testdata/helmhome/repository/local/index.yaml diff --git a/cmd/helm/downloader/testdata/helmhome/repository/repositories.yaml b/pkg/downloader/testdata/helmhome/repository/repositories.yaml similarity index 100% rename from cmd/helm/downloader/testdata/helmhome/repository/repositories.yaml rename to pkg/downloader/testdata/helmhome/repository/repositories.yaml diff --git a/cmd/helm/downloader/testdata/signtest-0.1.0.tgz b/pkg/downloader/testdata/signtest-0.1.0.tgz similarity index 100% rename from cmd/helm/downloader/testdata/signtest-0.1.0.tgz rename to pkg/downloader/testdata/signtest-0.1.0.tgz diff --git a/cmd/helm/downloader/testdata/signtest-0.1.0.tgz.prov b/pkg/downloader/testdata/signtest-0.1.0.tgz.prov similarity index 100% rename from cmd/helm/downloader/testdata/signtest-0.1.0.tgz.prov rename to pkg/downloader/testdata/signtest-0.1.0.tgz.prov diff --git a/cmd/helm/downloader/testdata/signtest/.helmignore b/pkg/downloader/testdata/signtest/.helmignore similarity index 100% rename from cmd/helm/downloader/testdata/signtest/.helmignore rename to pkg/downloader/testdata/signtest/.helmignore diff --git a/cmd/helm/downloader/testdata/signtest/Chart.yaml b/pkg/downloader/testdata/signtest/Chart.yaml similarity index 100% rename from cmd/helm/downloader/testdata/signtest/Chart.yaml rename to pkg/downloader/testdata/signtest/Chart.yaml diff --git a/cmd/helm/downloader/testdata/signtest/alpine/Chart.yaml b/pkg/downloader/testdata/signtest/alpine/Chart.yaml similarity index 100% rename from cmd/helm/downloader/testdata/signtest/alpine/Chart.yaml rename to pkg/downloader/testdata/signtest/alpine/Chart.yaml diff --git a/cmd/helm/downloader/testdata/signtest/alpine/README.md b/pkg/downloader/testdata/signtest/alpine/README.md similarity index 100% rename from cmd/helm/downloader/testdata/signtest/alpine/README.md rename to pkg/downloader/testdata/signtest/alpine/README.md diff --git a/cmd/helm/downloader/testdata/signtest/alpine/templates/alpine-pod.yaml b/pkg/downloader/testdata/signtest/alpine/templates/alpine-pod.yaml similarity index 100% rename from cmd/helm/downloader/testdata/signtest/alpine/templates/alpine-pod.yaml rename to pkg/downloader/testdata/signtest/alpine/templates/alpine-pod.yaml diff --git a/cmd/helm/downloader/testdata/signtest/alpine/values.yaml b/pkg/downloader/testdata/signtest/alpine/values.yaml similarity index 100% rename from cmd/helm/downloader/testdata/signtest/alpine/values.yaml rename to pkg/downloader/testdata/signtest/alpine/values.yaml diff --git a/cmd/helm/downloader/testdata/signtest/templates/pod.yaml b/pkg/downloader/testdata/signtest/templates/pod.yaml similarity index 100% rename from cmd/helm/downloader/testdata/signtest/templates/pod.yaml rename to pkg/downloader/testdata/signtest/templates/pod.yaml diff --git a/cmd/helm/downloader/testdata/signtest/values.yaml b/pkg/downloader/testdata/signtest/values.yaml similarity index 100% rename from cmd/helm/downloader/testdata/signtest/values.yaml rename to pkg/downloader/testdata/signtest/values.yaml diff --git a/cmd/helm/resolver/resolver.go b/pkg/resolver/resolver.go similarity index 100% rename from cmd/helm/resolver/resolver.go rename to pkg/resolver/resolver.go diff --git a/cmd/helm/resolver/resolver_test.go b/pkg/resolver/resolver_test.go similarity index 100% rename from cmd/helm/resolver/resolver_test.go rename to pkg/resolver/resolver_test.go diff --git a/cmd/helm/resolver/testdata/helmhome/repository/cache/kubernetes-charts-index.yaml b/pkg/resolver/testdata/helmhome/repository/cache/kubernetes-charts-index.yaml similarity index 100% rename from cmd/helm/resolver/testdata/helmhome/repository/cache/kubernetes-charts-index.yaml rename to pkg/resolver/testdata/helmhome/repository/cache/kubernetes-charts-index.yaml From 4cdb2ac538b6bf474c3d16a0fd9b4ae5f1922d00 Mon Sep 17 00:00:00 2001 From: Adam Reese Date: Thu, 9 Feb 2017 15:45:54 -0800 Subject: [PATCH 4/7] feat(kube): support thirdpartyresources --- glide.lock | 5 ++-- pkg/kube/client.go | 35 ++++++++++++++++++---- pkg/tiller/environment/environment.go | 6 ++++ pkg/tiller/environment/environment_test.go | 3 ++ pkg/tiller/release_server.go | 2 +- 5 files changed, 42 insertions(+), 9 deletions(-) diff --git a/glide.lock b/glide.lock index e76cb318c..dfc5e995a 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ hash: f59cd1f34ecf299aeb8ca9e16cfc181d8aeaf5a5762b89d76f18d08be35e4d67 -updated: 2016-12-21T11:19:14.731981344-07:00 +updated: 2017-02-09T11:27:34.6825226-08:00 imports: - name: cloud.google.com/go version: 3b1ae45394a234c385be014e9a488f2bb6eef821 @@ -290,7 +290,7 @@ imports: - name: gopkg.in/yaml.v2 version: a83829b6f1293c91addabc89d0571c246397bbf4 - name: k8s.io/kubernetes - version: 5f332aab13e58173f85fd204a2c77731f7a2573f + version: 08e099554f3c31f6e6f07b448ab3ed78d0520507 subpackages: - cmd/kubeadm/app/apis/kubeadm - cmd/kubeadm/app/apis/kubeadm/install @@ -482,6 +482,7 @@ imports: - pkg/util/yaml - pkg/version - pkg/watch + - pkg/watch/json - pkg/watch/versioned - plugin/pkg/client/auth - plugin/pkg/client/auth/gcp diff --git a/pkg/kube/client.go b/pkg/kube/client.go index 850dfe1a9..b4b965f1f 100644 --- a/pkg/kube/client.go +++ b/pkg/kube/client.go @@ -78,7 +78,7 @@ func (c *Client) Create(namespace string, reader io.Reader, timeout int64, shoul if err := ensureNamespace(client, namespace); err != nil { return err } - infos, buildErr := c.Build(namespace, reader) + infos, buildErr := c.BuildUnstructured(namespace, reader) if buildErr != nil { return buildErr } @@ -107,6 +107,29 @@ func (c *Client) newBuilder(namespace string, reader io.Reader) *resource.Result Do() } +// BuildUnstructured validates for Kubernetes objects and returns unstructured infos. +func (c *Client) BuildUnstructured(namespace string, reader io.Reader) (Result, error) { + schema, err := c.Validator(true, c.SchemaCacheDir) + if err != nil { + log.Printf("warning: failed to load schema: %s", err) + } + + mapper, typer, err := c.UnstructuredObject() + if err != nil { + log.Printf("warning: failed to load mapper: %s", err) + } + var result Result + result, err = resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(c.UnstructuredClientForMapping), runtime.UnstructuredJSONScheme). + ContinueOnError(). + Schema(schema). + NamespaceParam(namespace). + DefaultNamespace(). + Stream(reader, ""). + Flatten(). + Do().Infos() + return result, scrubValidationError(err) +} + // Build validates for Kubernetes objects and returns resource Infos from a io.Reader. func (c *Client) Build(namespace string, reader io.Reader) (Result, error) { var result Result @@ -121,7 +144,7 @@ func (c *Client) Get(namespace string, reader io.Reader) (string, error) { // Since we don't know what order the objects come in, let's group them by the types, so // that when we print them, they come looking good (headers apply to subgroups, etc.) objs := make(map[string][]runtime.Object) - infos, err := c.Build(namespace, reader) + infos, err := c.BuildUnstructured(namespace, reader) if err != nil { return "", err } @@ -178,12 +201,12 @@ func (c *Client) Get(namespace string, reader io.Reader) (string, error) { // // Namespace will set the namespaces func (c *Client) Update(namespace string, originalReader, targetReader io.Reader, recreate bool, timeout int64, shouldWait bool) error { - original, err := c.Build(namespace, originalReader) + original, err := c.BuildUnstructured(namespace, originalReader) if err != nil { return fmt.Errorf("failed decoding reader into objects: %s", err) } - target, err := c.Build(namespace, targetReader) + target, err := c.BuildUnstructured(namespace, targetReader) if err != nil { return fmt.Errorf("failed decoding reader into objects: %s", err) } @@ -255,7 +278,7 @@ func (c *Client) Update(namespace string, originalReader, targetReader io.Reader // // Namespace will set the namespace func (c *Client) Delete(namespace string, reader io.Reader) error { - infos, err := c.Build(namespace, reader) + infos, err := c.BuildUnstructured(namespace, reader) if err != nil { return err } @@ -585,7 +608,7 @@ func (c *Client) waitForResources(timeout time.Duration, created Result) error { func waitForJob(e watch.Event, name string) (bool, error) { o, ok := e.Object.(*batch.Job) if !ok { - return true, fmt.Errorf("Expected %s to be a *batch.Job, got %T", name, o) + return true, fmt.Errorf("Expected %s to be a *batch.Job, got %T", name, e.Object) } for _, c := range o.Status.Conditions { diff --git a/pkg/tiller/environment/environment.go b/pkg/tiller/environment/environment.go index fa5d1ecab..d218818e8 100644 --- a/pkg/tiller/environment/environment.go +++ b/pkg/tiller/environment/environment.go @@ -137,6 +137,7 @@ type KubeClient interface { Update(namespace string, originalReader, modifiedReader io.Reader, recreate bool, timeout int64, shouldWait bool) error Build(namespace string, reader io.Reader) (kube.Result, error) + BuildUnstructured(namespace string, reader io.Reader) (kube.Result, error) // WaitAndGetCompletedPodPhase waits up to a timeout until a pod enters a completed phase // and returns said phase (PodSucceeded or PodFailed qualify) @@ -186,6 +187,11 @@ func (p *PrintingKubeClient) Build(ns string, reader io.Reader) (kube.Result, er return []*resource.Info{}, nil } +// BuildUnstructured implements KubeClient BuildUnstructured. +func (p *PrintingKubeClient) BuildUnstructured(ns string, reader io.Reader) (kube.Result, error) { + return []*resource.Info{}, nil +} + // WaitAndGetCompletedPodPhase implements KubeClient WaitAndGetCompletedPodPhase func (p *PrintingKubeClient) WaitAndGetCompletedPodPhase(namespace string, reader io.Reader, timeout time.Duration) (api.PodPhase, error) { _, err := io.Copy(p.Out, reader) diff --git a/pkg/tiller/environment/environment_test.go b/pkg/tiller/environment/environment_test.go index cb36de356..716836438 100644 --- a/pkg/tiller/environment/environment_test.go +++ b/pkg/tiller/environment/environment_test.go @@ -57,6 +57,9 @@ func (k *mockKubeClient) WatchUntilReady(ns string, r io.Reader, timeout int64, func (k *mockKubeClient) Build(ns string, reader io.Reader) (kube.Result, error) { return []*resource.Info{}, nil } +func (k *mockKubeClient) BuildUnstructured(ns string, reader io.Reader) (kube.Result, error) { + return []*resource.Info{}, nil +} func (k *mockKubeClient) WaitAndGetCompletedPodPhase(namespace string, reader io.Reader, timeout time.Duration) (api.PodPhase, error) { return api.PodUnknown, nil } diff --git a/pkg/tiller/release_server.go b/pkg/tiller/release_server.go index 29cb335b0..25150bcda 100644 --- a/pkg/tiller/release_server.go +++ b/pkg/tiller/release_server.go @@ -1047,7 +1047,7 @@ func (s *ReleaseServer) UninstallRelease(c ctx.Context, req *services.UninstallR func validateManifest(c environment.KubeClient, ns string, manifest []byte) error { r := bytes.NewReader(manifest) - _, err := c.Build(ns, r) + _, err := c.BuildUnstructured(ns, r) return err } From 0f461ba8b55cdfad6d10c8fa9caa658ecddefbd6 Mon Sep 17 00:00:00 2001 From: Adam Reese Date: Fri, 10 Feb 2017 11:46:04 -0800 Subject: [PATCH 5/7] feat(kube): use jsonpatch to update ThirdPartyResources --- cmd/tiller/tiller.go | 6 ++++- glide.lock | 4 +-- glide.yaml | 1 + pkg/kube/client.go | 60 +++++++++++++++++++++++++---------------- pkg/kube/client_test.go | 4 +-- 5 files changed, 47 insertions(+), 28 deletions(-) diff --git a/cmd/tiller/tiller.go b/cmd/tiller/tiller.go index 11baa5045..72388d307 100644 --- a/cmd/tiller/tiller.go +++ b/cmd/tiller/tiller.go @@ -82,7 +82,11 @@ func main() { p.StringVarP(&grpcAddr, "listen", "l", ":44134", "address:port to listen on") p.StringVar(&store, "storage", storageConfigMap, "storage driver to use. One of 'configmap' or 'memory'") p.BoolVar(&enableTracing, "trace", false, "enable rpc tracing") - rootCommand.Execute() + + if err := rootCommand.Execute(); err != nil { + fmt.Fprint(os.Stderr, err) + os.Exit(1) + } } func start(c *cobra.Command, args []string) { diff --git a/glide.lock b/glide.lock index dfc5e995a..35cd2846e 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: f59cd1f34ecf299aeb8ca9e16cfc181d8aeaf5a5762b89d76f18d08be35e4d67 -updated: 2017-02-09T11:27:34.6825226-08:00 +hash: d9b023509801b816bc80b3abd67eb80532af1625e71ad4e0ff8ef98664f96ded +updated: 2017-02-10T11:42:12.50337033-08:00 imports: - name: cloud.google.com/go version: 3b1ae45394a234c385be014e9a488f2bb6eef821 diff --git a/glide.yaml b/glide.yaml index 1c9ed6ece..60966b966 100644 --- a/glide.yaml +++ b/glide.yaml @@ -55,6 +55,7 @@ import: - openpgp - package: github.com/gobwas/glob version: ^0.2.1 +- package: github.com/evanphx/json-patch testImports: - package: github.com/stretchr/testify version: ^1.1.4 diff --git a/pkg/kube/client.go b/pkg/kube/client.go index b4b965f1f..eb0f63019 100644 --- a/pkg/kube/client.go +++ b/pkg/kube/client.go @@ -18,6 +18,7 @@ package kube // import "k8s.io/helm/pkg/kube" import ( "bytes" + "encoding/json" goerrors "errors" "fmt" "io" @@ -25,6 +26,7 @@ import ( "strings" "time" + jsonpatch "github.com/evanphx/json-patch" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/v1" @@ -116,7 +118,8 @@ func (c *Client) BuildUnstructured(namespace string, reader io.Reader) (Result, mapper, typer, err := c.UnstructuredObject() if err != nil { - log.Printf("warning: failed to load mapper: %s", err) + log.Printf("failed to load mapper: %s", err) + return nil, err } var result Result result, err = resource.NewBuilder(mapper, typer, resource.ClientMapperFunc(c.UnstructuredClientForMapping), runtime.UnstructuredJSONScheme). @@ -239,12 +242,7 @@ func (c *Client) Update(namespace string, originalReader, targetReader io.Reader return fmt.Errorf("no resource with the name %s found", info.Name) } - versionedObject, err := originalInfo.Mapping.ConvertToVersion(originalInfo.Object, originalInfo.Mapping.GroupVersionKind.GroupVersion()) - if err != nil { - return err - } - - if err := updateResource(c, info, versionedObject, recreate); err != nil { + if err := updateResource(c, info, originalInfo.Object, recreate); err != nil { log.Printf("error updating the resource %s:\n\t %v", info.Name, err) updateErrors = append(updateErrors, err.Error()) } @@ -268,10 +266,7 @@ func (c *Client) Update(namespace string, originalReader, targetReader io.Reader if shouldWait { err = c.waitForResources(time.Duration(timeout)*time.Second, target) } - if err != nil { - return err - } - return nil + return err } // Delete deletes kubernetes resources from an io.reader @@ -360,32 +355,51 @@ func deleteResource(c *Client, info *resource.Info) error { return reaper.Stop(info.Namespace, info.Name, 0, nil) } -func updateResource(c *Client, target *resource.Info, currentObj runtime.Object, recreate bool) error { - encoder := c.JSONEncoder() - original, err := runtime.Encode(encoder, currentObj) +func createPatch(target *resource.Info, currentObj runtime.Object) ([]byte, api.PatchType, error) { + // Get a versioned object + versionedObject, err := api.Scheme.New(target.Mapping.GroupVersionKind) if err != nil { - return err + return nil, api.StrategicMergePatchType, fmt.Errorf("failed to get versionedObject: %s", err) } - modified, err := runtime.Encode(encoder, target.Object) + oldData, err := json.Marshal(currentObj) if err != nil { - return err + return nil, api.StrategicMergePatchType, fmt.Errorf("serializing current configuration: %s", err) + } + newData, err := json.Marshal(target.Object) + if err != nil { + return nil, api.StrategicMergePatchType, fmt.Errorf("serializing target configuration: %s", err) } - if api.Semantic.DeepEqual(original, modified) { - log.Printf("Looks like there are no changes for %s", target.Name) - return nil + if api.Semantic.DeepEqual(oldData, newData) { + return nil, api.StrategicMergePatchType, nil } - patch, err := strategicpatch.CreateTwoWayMergePatch(original, modified, currentObj) + switch target.Object.(type) { + case *runtime.Unstructured: + patch, err := jsonpatch.CreateMergePatch(oldData, newData) + return patch, api.MergePatchType, err + default: + log.Printf("generating strategic merge patch for %T", target.Object) + patch, err := strategicpatch.CreateTwoWayMergePatch(oldData, newData, versionedObject) + return patch, api.StrategicMergePatchType, err + } +} + +func updateResource(c *Client, target *resource.Info, currentObj runtime.Object, recreate bool) error { + patch, patchType, err := createPatch(target, currentObj) if err != nil { - return err + return fmt.Errorf("failed to create patch: %s", err) + } + if patch == nil { + log.Printf("Looks like there are no changes for %s", target.Name) + return nil } // send patch to server helper := resource.NewHelper(target.Client, target.Mapping) var obj runtime.Object - if obj, err = helper.Patch(target.Namespace, target.Name, api.StrategicMergePatchType, patch); err != nil { + if obj, err = helper.Patch(target.Namespace, target.Name, patchType, patch); err != nil { return err } diff --git a/pkg/kube/client_test.go b/pkg/kube/client_test.go index 0c9cf788b..38946a06b 100644 --- a/pkg/kube/client_test.go +++ b/pkg/kube/client_test.go @@ -169,9 +169,9 @@ func TestUpdate(t *testing.T) { t.Fatalf("could not dump request: %s", err) } req.Body.Close() - expected := `{"spec":{"containers":[{"name":"app:v4","ports":[{"containerPort":443,"name":"https","protocol":"TCP"},{"$patch":"delete","containerPort":80}]}]}}` + expected := `{"spec":{"containers":[{"image":"abc/app:v4","name":"app:v4","ports":[{"containerPort":443,"name":"https"}],"resources":{}}]}}` if string(data) != expected { - t.Errorf("expected patch %s, got %s", expected, string(data)) + t.Errorf("expected patch\n%s\ngot\n%s", expected, string(data)) } return newResponse(200, &listB.Items[0]) case p == "/namespaces/default/pods" && m == "POST": From ae9691910d12716d117599f80cc330c0c49a06b3 Mon Sep 17 00:00:00 2001 From: Adam Reese Date: Fri, 10 Feb 2017 12:43:29 -0800 Subject: [PATCH 6/7] ref(kube): code style cleanup --- pkg/kube/client.go | 37 ++++++++++-------------------------- pkg/tiller/release_server.go | 6 ++---- 2 files changed, 12 insertions(+), 31 deletions(-) diff --git a/pkg/kube/client.go b/pkg/kube/client.go index eb0f63019..f6f2ec4b0 100644 --- a/pkg/kube/client.go +++ b/pkg/kube/client.go @@ -84,14 +84,13 @@ func (c *Client) Create(namespace string, reader io.Reader, timeout int64, shoul if buildErr != nil { return buildErr } - err = perform(c, namespace, infos, createResource) - if err != nil { + if err := perform(c, namespace, infos, createResource); err != nil { return err } if shouldWait { - err = c.waitForResources(time.Duration(timeout)*time.Second, infos) + return c.waitForResources(time.Duration(timeout)*time.Second, infos) } - return err + return nil } func (c *Client) newBuilder(namespace string, reader io.Reader) *resource.Result { @@ -264,9 +263,9 @@ func (c *Client) Update(namespace string, originalReader, targetReader io.Reader } } if shouldWait { - err = c.waitForResources(time.Duration(timeout)*time.Second, target) + return c.waitForResources(time.Duration(timeout)*time.Second, target) } - return err + return nil } // Delete deletes kubernetes resources from an io.reader @@ -338,8 +337,7 @@ func createResource(info *resource.Info) error { if err != nil { return err } - info.Refresh(obj, true) - return nil + return info.Refresh(obj, true) } func deleteResource(c *Client, info *resource.Info) error { @@ -398,8 +396,8 @@ func updateResource(c *Client, target *resource.Info, currentObj runtime.Object, // send patch to server helper := resource.NewHelper(target.Client, target.Mapping) - var obj runtime.Object - if obj, err = helper.Patch(target.Namespace, target.Name, patchType, patch); err != nil { + obj, err := helper.Patch(target.Namespace, target.Name, patchType, patch) + if err != nil { return err } @@ -407,8 +405,7 @@ func updateResource(c *Client, target *resource.Info, currentObj runtime.Object, client, _ := c.ClientSet() return recreatePods(client, target.Namespace, extractSelector(currentObj)) } - target.Refresh(obj, true) - return nil + return target.Refresh(obj, true) } func extractSelector(obj runtime.Object) map[string]string { @@ -431,7 +428,6 @@ func recreatePods(client *internalclientset.Clientset, namespace string, selecto FieldSelector: fields.Everything(), LabelSelector: labels.Set(selector).AsSelector(), }) - if err != nil { return err } @@ -445,7 +441,6 @@ func recreatePods(client *internalclientset.Clientset, namespace string, selecto return err } } - return nil } @@ -491,9 +486,6 @@ func watchUntilReady(timeout time.Duration, info *resource.Info) error { } func podsReady(pods []api.Pod) bool { - if len(pods) == 0 { - return true - } for _, pod := range pods { if !api.IsPodReady(&pod) { return false @@ -503,9 +495,6 @@ func podsReady(pods []api.Pod) bool { } func servicesReady(svc []api.Service) bool { - if len(svc) == 0 { - return true - } for _, s := range svc { if !api.IsServiceIPSet(&s) { return false @@ -519,9 +508,6 @@ func servicesReady(svc []api.Service) bool { } func volumesReady(vols []api.PersistentVolumeClaim) bool { - if len(vols) == 0 { - return true - } for _, v := range vols { if v.Status.Phase != api.ClaimBound { return false @@ -535,10 +521,7 @@ func getPods(client *internalclientset.Clientset, namespace string, selector map FieldSelector: fields.Everything(), LabelSelector: labels.Set(selector).AsSelector(), }) - if err != nil { - return nil, err - } - return list.Items, nil + return list.Items, err } // waitForResources polls to get the current status of all pods, PVCs, and Services diff --git a/pkg/tiller/release_server.go b/pkg/tiller/release_server.go index 25150bcda..a0236ecd9 100644 --- a/pkg/tiller/release_server.go +++ b/pkg/tiller/release_server.go @@ -1037,12 +1037,10 @@ func (s *ReleaseServer) UninstallRelease(c ctx.Context, req *services.UninstallR log.Printf("uninstall: Failed to store updated release: %s", err) } - var errs error if len(es) > 0 { - errs = fmt.Errorf("deletion completed with %d error(s): %s", len(es), strings.Join(es, "; ")) + return res, fmt.Errorf("deletion completed with %d error(s): %s", len(es), strings.Join(es, "; ")) } - - return res, errs + return res, nil } func validateManifest(c environment.KubeClient, ns string, manifest []byte) error { From 67fc1a21aaacb57ccec92b03bea10249a8049753 Mon Sep 17 00:00:00 2001 From: Adam Reese Date: Fri, 10 Feb 2017 14:49:33 -0800 Subject: [PATCH 7/7] feat(kube): support upgrading ThirdPartyResources --- pkg/kube/client.go | 26 +++++++++++++------------- pkg/kube/client_test.go | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkg/kube/client.go b/pkg/kube/client.go index f6f2ec4b0..ebf993898 100644 --- a/pkg/kube/client.go +++ b/pkg/kube/client.go @@ -29,6 +29,7 @@ import ( jsonpatch "github.com/evanphx/json-patch" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/v1" apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" "k8s.io/kubernetes/pkg/apis/batch" @@ -353,18 +354,12 @@ func deleteResource(c *Client, info *resource.Info) error { return reaper.Stop(info.Namespace, info.Name, 0, nil) } -func createPatch(target *resource.Info, currentObj runtime.Object) ([]byte, api.PatchType, error) { - // Get a versioned object - versionedObject, err := api.Scheme.New(target.Mapping.GroupVersionKind) - if err != nil { - return nil, api.StrategicMergePatchType, fmt.Errorf("failed to get versionedObject: %s", err) - } - - oldData, err := json.Marshal(currentObj) +func createPatch(mapping *meta.RESTMapping, target, current runtime.Object) ([]byte, api.PatchType, error) { + oldData, err := json.Marshal(current) if err != nil { return nil, api.StrategicMergePatchType, fmt.Errorf("serializing current configuration: %s", err) } - newData, err := json.Marshal(target.Object) + newData, err := json.Marshal(target) if err != nil { return nil, api.StrategicMergePatchType, fmt.Errorf("serializing target configuration: %s", err) } @@ -373,19 +368,24 @@ func createPatch(target *resource.Info, currentObj runtime.Object) ([]byte, api. return nil, api.StrategicMergePatchType, nil } - switch target.Object.(type) { - case *runtime.Unstructured: + // Get a versioned object + versionedObject, err := api.Scheme.New(mapping.GroupVersionKind) + switch { + case runtime.IsNotRegisteredError(err): + // fall back to generic JSON merge patch patch, err := jsonpatch.CreateMergePatch(oldData, newData) return patch, api.MergePatchType, err + case err != nil: + return nil, api.StrategicMergePatchType, fmt.Errorf("failed to get versionedObject: %s", err) default: - log.Printf("generating strategic merge patch for %T", target.Object) + log.Printf("generating strategic merge patch for %T", target) patch, err := strategicpatch.CreateTwoWayMergePatch(oldData, newData, versionedObject) return patch, api.StrategicMergePatchType, err } } func updateResource(c *Client, target *resource.Info, currentObj runtime.Object, recreate bool) error { - patch, patchType, err := createPatch(target, currentObj) + patch, patchType, err := createPatch(target.Mapping, target.Object, currentObj) if err != nil { return fmt.Errorf("failed to create patch: %s", err) } diff --git a/pkg/kube/client_test.go b/pkg/kube/client_test.go index 38946a06b..ed4997ac5 100644 --- a/pkg/kube/client_test.go +++ b/pkg/kube/client_test.go @@ -169,7 +169,7 @@ func TestUpdate(t *testing.T) { t.Fatalf("could not dump request: %s", err) } req.Body.Close() - expected := `{"spec":{"containers":[{"image":"abc/app:v4","name":"app:v4","ports":[{"containerPort":443,"name":"https"}],"resources":{}}]}}` + expected := `{"spec":{"containers":[{"name":"app:v4","ports":[{"containerPort":443,"name":"https"},{"$patch":"delete","containerPort":80}]}]}}` if string(data) != expected { t.Errorf("expected patch\n%s\ngot\n%s", expected, string(data)) }