From 3407f3af91cb36edc42e69fc9ea6e7f1e2bebf51 Mon Sep 17 00:00:00 2001 From: Kira Date: Tue, 11 Jul 2017 19:54:14 +0800 Subject: [PATCH] feat(2450): add options to chart metadata --- _proto/hapi/chart/metadata.proto | 3 ++ pkg/proto/hapi/chart/metadata.pb.go | 60 +++++++++++++++++------------ 2 files changed, 39 insertions(+), 24 deletions(-) diff --git a/_proto/hapi/chart/metadata.proto b/_proto/hapi/chart/metadata.proto index 7416c7706..d4a547a54 100644 --- a/_proto/hapi/chart/metadata.proto +++ b/_proto/hapi/chart/metadata.proto @@ -80,4 +80,7 @@ message Metadata { // TillerVersion is a SemVer constraints on what version of Tiller is required. // See SemVer ranges here: https://github.com/Masterminds/semver#basic-comparisons string tillerVersion = 15; + + // Options is an unstructured key value map for user to store arbitrary data. + map options = 16; } diff --git a/pkg/proto/hapi/chart/metadata.pb.go b/pkg/proto/hapi/chart/metadata.pb.go index 82abb04ff..6340d79be 100644 --- a/pkg/proto/hapi/chart/metadata.pb.go +++ b/pkg/proto/hapi/chart/metadata.pb.go @@ -96,6 +96,8 @@ type Metadata struct { // TillerVersion is a SemVer constraints on what version of Tiller is required. // See SemVer ranges here: https://github.com/Masterminds/semver#basic-comparisons TillerVersion string `protobuf:"bytes,15,opt,name=tillerVersion" json:"tillerVersion,omitempty"` + // Options is an unstructured key value map for user to store arbitrary data. + Options map[string]string `protobuf:"bytes,16,rep,name=options" json:"options,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` } func (m *Metadata) Reset() { *m = Metadata{} } @@ -208,6 +210,13 @@ func (m *Metadata) GetTillerVersion() string { return "" } +func (m *Metadata) GetOptions() map[string]string { + if m != nil { + return m.Options + } + return nil +} + func init() { proto.RegisterType((*Maintainer)(nil), "hapi.chart.Maintainer") proto.RegisterType((*Metadata)(nil), "hapi.chart.Metadata") @@ -217,28 +226,31 @@ func init() { func init() { proto.RegisterFile("hapi/chart/metadata.proto", fileDescriptor2) } var fileDescriptor2 = []byte{ - // 354 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0x5f, 0x4b, 0xe3, 0x40, - 0x14, 0xc5, 0x37, 0x9b, 0xe6, 0xdf, 0xcd, 0x76, 0xb7, 0x0c, 0x4b, 0x99, 0x5d, 0x44, 0x42, 0xf1, - 0x21, 0x4f, 0x29, 0x28, 0x88, 0xcf, 0x82, 0xf8, 0xa0, 0x6d, 0x25, 0xf8, 0x07, 0x7c, 0x1b, 0x93, - 0x4b, 0x3b, 0xd8, 0xcc, 0x84, 0xc9, 0xa8, 0xf8, 0x7d, 0xfd, 0x20, 0x32, 0x93, 0xa4, 0x8d, 0xe0, - 0xdb, 0x3d, 0xe7, 0xe4, 0xfe, 0xc2, 0xb9, 0x0c, 0xfc, 0xdb, 0xb0, 0x9a, 0xcf, 0x8b, 0x0d, 0x53, - 0x7a, 0x5e, 0xa1, 0x66, 0x25, 0xd3, 0x2c, 0xab, 0x95, 0xd4, 0x92, 0x80, 0x89, 0x32, 0x1b, 0xcd, - 0x4e, 0x01, 0x16, 0x8c, 0x0b, 0xcd, 0xb8, 0x40, 0x45, 0x08, 0x8c, 0x04, 0xab, 0x90, 0x3a, 0x89, - 0x93, 0x46, 0xb9, 0x9d, 0xc9, 0x5f, 0xf0, 0xb0, 0x62, 0x7c, 0x4b, 0x7f, 0x5a, 0xb3, 0x15, 0xb3, - 0x0f, 0x17, 0xc2, 0x45, 0x87, 0xfd, 0x76, 0x8d, 0xc0, 0x68, 0x23, 0x2b, 0xec, 0xb6, 0xec, 0x4c, - 0x28, 0x04, 0x8d, 0x7c, 0x51, 0x05, 0x36, 0xd4, 0x4d, 0xdc, 0x34, 0xca, 0x7b, 0x69, 0x92, 0x57, - 0x54, 0x0d, 0x97, 0x82, 0x8e, 0xec, 0x42, 0x2f, 0x49, 0x02, 0x71, 0x89, 0x4d, 0xa1, 0x78, 0xad, - 0x4d, 0xea, 0xd9, 0x74, 0x68, 0x91, 0xff, 0x10, 0x3e, 0xe3, 0xfb, 0x9b, 0x54, 0x65, 0x43, 0x7d, - 0x8b, 0xdd, 0x69, 0x72, 0x06, 0x71, 0xb5, 0xab, 0xd7, 0xd0, 0x20, 0x71, 0xd3, 0xf8, 0x78, 0x9a, - 0xed, 0x0f, 0x90, 0xed, 0xdb, 0xe7, 0xc3, 0x4f, 0xc9, 0x14, 0x7c, 0x14, 0x6b, 0x2e, 0x90, 0x86, - 0xf6, 0x97, 0x9d, 0x32, 0xbd, 0x78, 0x21, 0x05, 0x8d, 0xda, 0x5e, 0x66, 0x26, 0x87, 0x00, 0xac, - 0xe6, 0xf7, 0x5d, 0x01, 0xb0, 0xc9, 0xc0, 0x21, 0x07, 0x10, 0x15, 0x52, 0x94, 0xdc, 0x36, 0x88, - 0x6d, 0xbc, 0x37, 0x0c, 0x51, 0xb3, 0x75, 0x43, 0x7f, 0xb5, 0x44, 0x33, 0xb7, 0xc4, 0xba, 0x27, - 0x8e, 0x7b, 0x62, 0xef, 0x98, 0xbc, 0xc4, 0x5a, 0x61, 0xc1, 0x34, 0x96, 0xf4, 0x77, 0xe2, 0xa4, - 0x61, 0x3e, 0x70, 0xc8, 0x11, 0x8c, 0x35, 0xdf, 0x6e, 0x51, 0xf5, 0x88, 0x3f, 0x16, 0xf1, 0xd5, - 0x9c, 0x25, 0xe0, 0x5f, 0xb4, 0xad, 0x62, 0x08, 0xee, 0x96, 0x57, 0xcb, 0xd5, 0xc3, 0x72, 0xf2, - 0x83, 0x44, 0xe0, 0x5d, 0xae, 0x6e, 0x6f, 0xae, 0x27, 0xce, 0x79, 0xf0, 0xe8, 0xd9, 0x33, 0x3d, - 0xf9, 0xf6, 0xe9, 0x9c, 0x7c, 0x06, 0x00, 0x00, 0xff, 0xff, 0xea, 0xb5, 0x4c, 0xbe, 0x57, 0x02, - 0x00, 0x00, + // 409 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x52, 0x5d, 0x6b, 0xd4, 0x40, + 0x14, 0x35, 0xdd, 0x8f, 0x6c, 0x6e, 0x5a, 0x5d, 0x2e, 0x52, 0xc6, 0x22, 0x12, 0x17, 0x1f, 0xf6, + 0x69, 0x0b, 0x0a, 0x52, 0xea, 0x9b, 0x50, 0x7c, 0xd0, 0xee, 0x4a, 0xf0, 0x03, 0x7c, 0x1b, 0x93, + 0x4b, 0x77, 0xe8, 0x66, 0x26, 0xcc, 0x4c, 0x2b, 0xfb, 0x63, 0xfd, 0x2f, 0x32, 0x37, 0x99, 0x6e, + 0x0a, 0xbe, 0xdd, 0x73, 0xce, 0xdc, 0x93, 0x9c, 0xcb, 0x81, 0x17, 0x5b, 0xd9, 0xaa, 0xf3, 0x6a, + 0x2b, 0xad, 0x3f, 0x6f, 0xc8, 0xcb, 0x5a, 0x7a, 0xb9, 0x6a, 0xad, 0xf1, 0x06, 0x21, 0x48, 0x2b, + 0x96, 0x16, 0xef, 0x01, 0xae, 0xa5, 0xd2, 0x5e, 0x2a, 0x4d, 0x16, 0x11, 0xc6, 0x5a, 0x36, 0x24, + 0x92, 0x22, 0x59, 0x66, 0x25, 0xcf, 0xf8, 0x1c, 0x26, 0xd4, 0x48, 0xb5, 0x13, 0x47, 0x4c, 0x76, + 0x60, 0xf1, 0x77, 0x0c, 0xb3, 0xeb, 0xde, 0xf6, 0xbf, 0x6b, 0x08, 0xe3, 0xad, 0x69, 0xa8, 0xdf, + 0xe2, 0x19, 0x05, 0xa4, 0xce, 0xdc, 0xd9, 0x8a, 0x9c, 0x18, 0x15, 0xa3, 0x65, 0x56, 0x46, 0x18, + 0x94, 0x7b, 0xb2, 0x4e, 0x19, 0x2d, 0xc6, 0xbc, 0x10, 0x21, 0x16, 0x90, 0xd7, 0xe4, 0x2a, 0xab, + 0x5a, 0x1f, 0xd4, 0x09, 0xab, 0x43, 0x0a, 0xcf, 0x60, 0x76, 0x4b, 0xfb, 0x3f, 0xc6, 0xd6, 0x4e, + 0x4c, 0xd9, 0xf6, 0x01, 0xe3, 0x05, 0xe4, 0xcd, 0x43, 0x3c, 0x27, 0xd2, 0x62, 0xb4, 0xcc, 0xdf, + 0x9e, 0xae, 0x0e, 0x07, 0x58, 0x1d, 0xd2, 0x97, 0xc3, 0xa7, 0x78, 0x0a, 0x53, 0xd2, 0x37, 0x4a, + 0x93, 0x98, 0xf1, 0x27, 0x7b, 0x14, 0x72, 0xa9, 0xca, 0x68, 0x91, 0x75, 0xb9, 0xc2, 0x8c, 0xaf, + 0x00, 0x64, 0xab, 0x7e, 0xf4, 0x01, 0x80, 0x95, 0x01, 0x83, 0x2f, 0x21, 0xab, 0x8c, 0xae, 0x15, + 0x27, 0xc8, 0x59, 0x3e, 0x10, 0xc1, 0xd1, 0xcb, 0x1b, 0x27, 0x8e, 0x3b, 0xc7, 0x30, 0x77, 0x8e, + 0x6d, 0x74, 0x3c, 0x89, 0x8e, 0x91, 0x09, 0x7a, 0x4d, 0xad, 0xa5, 0x4a, 0x7a, 0xaa, 0xc5, 0xd3, + 0x22, 0x59, 0xce, 0xca, 0x01, 0x83, 0x6f, 0xe0, 0xc4, 0xab, 0xdd, 0x8e, 0x6c, 0xb4, 0x78, 0xc6, + 0x16, 0x8f, 0x49, 0xfc, 0x00, 0xa9, 0xe1, 0x1b, 0x3a, 0x31, 0xe7, 0xcb, 0xbc, 0x7e, 0x74, 0x99, + 0xd8, 0x9a, 0x4d, 0xf7, 0xe6, 0x4a, 0x7b, 0xbb, 0x2f, 0xe3, 0xc6, 0xd9, 0x25, 0x1c, 0x0f, 0x05, + 0x9c, 0xc3, 0xe8, 0x96, 0xf6, 0x7d, 0x07, 0xc2, 0x18, 0x9a, 0x73, 0x2f, 0x77, 0x77, 0xb1, 0x03, + 0x1d, 0xb8, 0x3c, 0xba, 0x48, 0x16, 0x05, 0x4c, 0xaf, 0xba, 0x73, 0xe6, 0x90, 0x7e, 0x5f, 0x7f, + 0x5e, 0x6f, 0x7e, 0xae, 0xe7, 0x4f, 0x30, 0x83, 0xc9, 0xa7, 0xcd, 0xb7, 0xaf, 0x5f, 0xe6, 0xc9, + 0xc7, 0xf4, 0xd7, 0x84, 0xff, 0xe2, 0xf7, 0x94, 0x3b, 0xfb, 0xee, 0x5f, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xc8, 0x2c, 0xa3, 0x3c, 0xd0, 0x02, 0x00, 0x00, }