Merge pull request #740 from fibonacci1729/master

fix(hapi): field for miscellaneous files

_proto/hapi/chart/chart.proto

@@ -5,6 +5,7 @@ package hapi.chart;
 import "hapi/chart/config.proto";
 import "hapi/chart/metadata.proto";
 import "hapi/chart/template.proto";
+import "google/protobuf/any.proto";
 
 option go_package = "chart";
 
@@ -23,9 +24,7 @@ message Chart {
 	// Default config for this template.
 	hapi.chart.Config values = 4;
 
-	// License is the text of the LICENSE file, if included.
+	// Miscellaneous files in a chart archive,
-	string license = 5;
+	// e.g. README, LICENSE, etc.
-
+	google.protobuf.Any files = 5;
-	// Readme is the text of the README.md file, if included.
-	string readme = 6;
 }

pkg/proto/hapi/chart/chart.pb.go

@@ -24,6 +24,7 @@ package chart
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
+import google_protobuf "github.com/golang/protobuf/ptypes/any"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -45,10 +46,9 @@ type Chart struct {
 	Dependencies []*Chart `protobuf:"bytes,3,rep,name=dependencies" json:"dependencies,omitempty"`
 	// Default config for this template.
 	Values *Config `protobuf:"bytes,4,opt,name=values" json:"values,omitempty"`
-	// License is the text of the LICENSE file, if included.
+	// Miscellaneous files in a chart archive,
-	License string `protobuf:"bytes,5,opt,name=license" json:"license,omitempty"`
+	// e.g. README, LICENSE, etc.
-	// Readme is the text of the README.md file, if included.
+	Files *google_protobuf.Any `protobuf:"bytes,5,opt,name=files" json:"files,omitempty"`
-	Readme string `protobuf:"bytes,6,opt,name=readme" json:"readme,omitempty"`
 }
 
 func (m *Chart) Reset()                    { *m = Chart{} }
@@ -84,25 +84,32 @@ func (m *Chart) GetValues() *Config {
 	return nil
 }
 
+func (m *Chart) GetFiles() *google_protobuf.Any {
+	if m != nil {
+		return m.Files
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*Chart)(nil), "hapi.chart.Chart")
 }
 
 var fileDescriptor0 = []byte{
-	// 232 bytes of a gzipped FileDescriptorProto
+	// 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, 0x10, 0x29, 0xa5, 0x26, 0x26, 0x2e, 0x56, 0x67, 0x90, 0x84,
+	0xb9, 0x05, 0x39, 0x89, 0x25, 0xa9, 0x30, 0xa9, 0xf4, 0xfc, 0xfc, 0xf4, 0x9c, 0x54, 0x7d, 0x30,
-	0x90, 0x01, 0x17, 0x07, 0x4c, 0x9b, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xb7, 0x91, 0x88, 0x1e, 0xc2,
+	0x2f, 0xa9, 0x34, 0x4d, 0x3f, 0x31, 0xaf, 0x12, 0x22, 0xa5, 0xf4, 0x87, 0x91, 0x8b, 0xd5, 0x19,
-	0x5e, 0x3d, 0x5f, 0xa8, 0x5c, 0x10, 0x5c, 0x95, 0x90, 0x11, 0x17, 0x27, 0xcc, 0xb4, 0x62, 0x09,
+	0xa4, 0x47, 0xc8, 0x80, 0x8b, 0x03, 0x66, 0xa2, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xb7, 0x91, 0x88,
-	0x26, 0x05, 0x66, 0x74, 0x2d, 0x21, 0x50, 0xc9, 0x20, 0x84, 0x32, 0x21, 0x53, 0x2e, 0x9e, 0x94,
+	0x1e, 0xc2, 0x49, 0x7a, 0xbe, 0x50, 0xb9, 0x20, 0xb8, 0x2a, 0x21, 0x23, 0x2e, 0x4e, 0x98, 0x45,
-	0xd4, 0x82, 0xd4, 0xbc, 0x94, 0xd4, 0xbc, 0xe4, 0x4c, 0xa0, 0x36, 0x66, 0xb0, 0x36, 0x41, 0x64,
+	0xc5, 0x12, 0x4c, 0x0a, 0xcc, 0xe8, 0x5a, 0x42, 0xa0, 0x92, 0x41, 0x08, 0x65, 0x42, 0xa6, 0x5c,
-	0x6d, 0x60, 0xe7, 0x04, 0xa1, 0x28, 0x13, 0xd2, 0xe2, 0x62, 0x2b, 0x4b, 0xcc, 0x29, 0x05, 0x6a,
+	0x3c, 0x29, 0xa9, 0x05, 0xa9, 0x79, 0x29, 0xa9, 0x79, 0xc9, 0x99, 0x40, 0x6d, 0xcc, 0x60, 0x6d,
-	0x60, 0x01, 0x3b, 0x4d, 0x08, 0x45, 0x03, 0x38, 0x18, 0x82, 0xa0, 0x2a, 0x84, 0x24, 0xb8, 0xd8,
+	0x82, 0xc8, 0xda, 0xc0, 0xce, 0x09, 0x42, 0x51, 0x26, 0xa4, 0xc5, 0xc5, 0x56, 0x96, 0x98, 0x53,
-	0x73, 0x32, 0x93, 0x53, 0xf3, 0x8a, 0x53, 0x25, 0x58, 0x81, 0x8a, 0x39, 0x83, 0x60, 0x5c, 0x21,
+	0x0a, 0xd4, 0xc0, 0x02, 0x76, 0x9a, 0x10, 0x8a, 0x06, 0x70, 0x08, 0x05, 0x41, 0x55, 0x00, 0xd5,
-	0x31, 0x2e, 0xb6, 0xa2, 0xd4, 0xc4, 0x94, 0xdc, 0x54, 0x09, 0x36, 0xb0, 0x04, 0x94, 0xe7, 0xc4,
+	0xb2, 0xa6, 0x65, 0xe6, 0x00, 0x95, 0xb2, 0x42, 0x7d, 0x01, 0xf1, 0xbd, 0x1e, 0xcc, 0xf7, 0x7a,
-	0x1e, 0xc5, 0x0a, 0x36, 0x29, 0x89, 0x0d, 0x1c, 0x28, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0x8e, 0x79, 0x95, 0x41, 0x10, 0x25, 0x4e, 0xec, 0x51, 0xac, 0x60, 0x33, 0x92, 0xd8, 0xc0, 0xb2,
-	0xf4, 0x06, 0xe5, 0x14, 0x89, 0x01, 0x00, 0x00,
+	0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8e, 0x28, 0xf5, 0xb0, 0x9e, 0x01, 0x00, 0x00,
 }