rename options to annotations

pull/2671/head
Kira 8 years ago
parent 3407f3af91
commit 5f92a6a356

@ -81,6 +81,6 @@ message Metadata {
// 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<string,string> options = 16;
// Annotations is an unstructured key value map for user to store arbitrary data.
map<string,string> annotations = 16;
}

@ -96,8 +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"`
// Annotations is an unstructured key value map for user to store arbitrary data.
Annotations map[string]string `protobuf:"bytes,16,rep,name=annotations" json:"annotations,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
}
func (m *Metadata) Reset() { *m = Metadata{} }
@ -210,9 +210,9 @@ func (m *Metadata) GetTillerVersion() string {
return ""
}
func (m *Metadata) GetOptions() map[string]string {
func (m *Metadata) GetAnnotations() map[string]string {
if m != nil {
return m.Options
return m.Annotations
}
return nil
}
@ -226,31 +226,31 @@ func init() {
func init() { proto.RegisterFile("hapi/chart/metadata.proto", fileDescriptor2) }
var fileDescriptor2 = []byte{
// 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,
// 412 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x52, 0x5d, 0x6b, 0xd5, 0x40,
0x10, 0x35, 0xbd, 0x9f, 0x99, 0x58, 0x0d, 0x83, 0x94, 0xb5, 0x88, 0x84, 0x8b, 0x42, 0x9e, 0x52,
0x50, 0x90, 0xe2, 0x83, 0xa0, 0x50, 0xfa, 0xa0, 0xbd, 0x95, 0xe0, 0x07, 0xf8, 0xb6, 0x26, 0x43,
0xef, 0xd2, 0x64, 0x37, 0xec, 0x6e, 0x2b, 0xf7, 0x47, 0xfb, 0x1f, 0x64, 0x37, 0xd9, 0x26, 0x95,
0xbe, 0xcd, 0x39, 0x67, 0xe6, 0xec, 0x9e, 0x61, 0xe0, 0xf9, 0x8e, 0x77, 0xe2, 0xa4, 0xda, 0x71,
0x6d, 0x4f, 0x5a, 0xb2, 0xbc, 0xe6, 0x96, 0x17, 0x9d, 0x56, 0x56, 0x21, 0x38, 0xa9, 0xf0, 0xd2,
0xe6, 0x1d, 0xc0, 0x05, 0x17, 0xd2, 0x72, 0x21, 0x49, 0x23, 0xc2, 0x5c, 0xf2, 0x96, 0x58, 0x94,
0x45, 0x79, 0x5c, 0xfa, 0x1a, 0x9f, 0xc1, 0x82, 0x5a, 0x2e, 0x1a, 0x76, 0xe0, 0xc9, 0x1e, 0x6c,
0xfe, 0xce, 0x61, 0x7d, 0x31, 0xd8, 0x3e, 0x38, 0x86, 0x30, 0xdf, 0xa9, 0x96, 0x86, 0x29, 0x5f,
0x23, 0x83, 0x95, 0x51, 0x37, 0xba, 0x22, 0xc3, 0x66, 0xd9, 0x2c, 0x8f, 0xcb, 0x00, 0x9d, 0x72,
0x4b, 0xda, 0x08, 0x25, 0xd9, 0xdc, 0x0f, 0x04, 0x88, 0x19, 0x24, 0x35, 0x99, 0x4a, 0x8b, 0xce,
0x3a, 0x75, 0xe1, 0xd5, 0x29, 0x85, 0xc7, 0xb0, 0xbe, 0xa6, 0xfd, 0x1f, 0xa5, 0x6b, 0xc3, 0x96,
0xde, 0xf6, 0x0e, 0xe3, 0x29, 0x24, 0xed, 0x5d, 0x3c, 0xc3, 0x56, 0xd9, 0x2c, 0x4f, 0xde, 0x1c,
0x15, 0xe3, 0x02, 0x8a, 0x31, 0x7d, 0x39, 0x6d, 0xc5, 0x23, 0x58, 0x92, 0xbc, 0x12, 0x92, 0xd8,
0xda, 0x3f, 0x39, 0x20, 0x97, 0x4b, 0x54, 0x4a, 0xb2, 0xb8, 0xcf, 0xe5, 0x6a, 0x7c, 0x09, 0xc0,
0x3b, 0xf1, 0x63, 0x08, 0x00, 0x5e, 0x99, 0x30, 0xf8, 0x02, 0xe2, 0x4a, 0xc9, 0x5a, 0xf8, 0x04,
0x89, 0x97, 0x47, 0xc2, 0x39, 0x5a, 0x7e, 0x65, 0xd8, 0xe3, 0xde, 0xd1, 0xd5, 0xbd, 0x63, 0x17,
0x1c, 0x0f, 0x83, 0x63, 0x60, 0x9c, 0x5e, 0x53, 0xa7, 0xa9, 0xe2, 0x96, 0x6a, 0xf6, 0x24, 0x8b,
0xf2, 0x75, 0x39, 0x61, 0xf0, 0x15, 0x1c, 0x5a, 0xd1, 0x34, 0xa4, 0x83, 0xc5, 0x53, 0x6f, 0x71,
0x9f, 0xc4, 0x73, 0x48, 0xb8, 0x94, 0xca, 0x72, 0xf7, 0x0f, 0xc3, 0x52, 0xbf, 0x9d, 0xd7, 0xf7,
0xb6, 0x13, 0x2e, 0xe7, 0xe3, 0xd8, 0x77, 0x26, 0xad, 0xde, 0x97, 0xd3, 0xc9, 0xe3, 0x0f, 0x90,
0xfe, 0xdf, 0x80, 0x29, 0xcc, 0xae, 0x69, 0x3f, 0xdc, 0x84, 0x2b, 0xdd, 0x25, 0xdd, 0xf2, 0xe6,
0x26, 0xdc, 0x44, 0x0f, 0xde, 0x1f, 0x9c, 0x46, 0x9b, 0x0c, 0x96, 0x67, 0xfd, 0x7a, 0x13, 0x58,
0x7d, 0xdf, 0x7e, 0xde, 0x5e, 0xfe, 0xdc, 0xa6, 0x8f, 0x30, 0x86, 0xc5, 0xf9, 0xe5, 0xb7, 0xaf,
0x5f, 0xd2, 0xe8, 0xd3, 0xea, 0xd7, 0xc2, 0xff, 0xe8, 0xf7, 0xd2, 0xdf, 0xf0, 0xdb, 0x7f, 0x01,
0x00, 0x00, 0xff, 0xff, 0xd7, 0x2b, 0xf5, 0x83, 0xe0, 0x02, 0x00, 0x00,
}

Loading…
Cancel
Save