Locally define protobuf Any to fix serialization issues.

_proto/hapi/chart/chart.proto

@@ -40,5 +40,15 @@ message Chart {
 
 	// Miscellaneous files in a chart archive,
 	// e.g. README, LICENSE, etc.
-	repeated google.protobuf.Any files = 5;
+	repeated Any files = 5;
+}
+
+// Copied from https://github.com/golang/protobuf/blob/master/ptypes/any/any.proto
+message Any {
+  // A resource name whose content describes the type of the
+  // serialized data.
+  string type_url = 1;
+
+  // Data for file.
+  bytes value = 2;
 }

pkg/chartutil/files.go

@@ -26,7 +26,7 @@ import (
 
 	"github.com/BurntSushi/toml"
 	"github.com/gobwas/glob"
-	"github.com/golang/protobuf/ptypes/any"
+	any "k8s.io/helm/pkg/proto/hapi/chart"
 )
 
 // Files is a map of files in a chart that can be accessed from a template.

pkg/chartutil/files_test.go

@@ -18,8 +18,8 @@ package chartutil
 import (
 	"testing"
 
-	"github.com/golang/protobuf/ptypes/any"
 	"github.com/stretchr/testify/assert"
+	any "k8s.io/helm/pkg/proto/hapi/chart"
 )
 
 var cases = []struct {

pkg/chartutil/load.go

@@ -29,7 +29,6 @@ import (
 	"strings"
 
 	"github.com/facebookgo/symwalk"
-	"github.com/golang/protobuf/ptypes/any"
 
 	"k8s.io/helm/pkg/ignore"
 	"k8s.io/helm/pkg/proto/hapi/chart"
@@ -139,7 +138,7 @@ func LoadFiles(files []*BufferedFile) (*chart.Chart, error) {
 			c.Templates = append(c.Templates, &chart.Template{Name: f.Name, Data: f.Data})
 		} else if strings.HasPrefix(f.Name, "charts/") {
 			if filepath.Ext(f.Name) == ".prov" {
-				c.Files = append(c.Files, &any.Any{TypeUrl: f.Name, Value: f.Data})
+				c.Files = append(c.Files, &chart.Any{TypeUrl: f.Name, Value: f.Data})
 				continue
 			}
 			cname := strings.TrimPrefix(f.Name, "charts/")
@@ -151,7 +150,7 @@ func LoadFiles(files []*BufferedFile) (*chart.Chart, error) {
 			scname := parts[0]
 			subcharts[scname] = append(subcharts[scname], &BufferedFile{Name: cname, Data: f.Data})
 		} else {
-			c.Files = append(c.Files, &any.Any{TypeUrl: f.Name, Value: f.Data})
+			c.Files = append(c.Files, &chart.Any{TypeUrl: f.Name, Value: f.Data})
 		}
 	}
 

pkg/chartutil/values_test.go

@@ -23,7 +23,7 @@ import (
 	"testing"
 	"text/template"
 
-	"github.com/golang/protobuf/ptypes/any"
+	any "k8s.io/helm/pkg/proto/hapi/chart"
 
 	kversion "k8s.io/apimachinery/pkg/version"
 	"k8s.io/helm/pkg/proto/hapi/chart"

pkg/engine/engine_test.go

@@ -24,7 +24,7 @@ import (
 	"k8s.io/helm/pkg/chartutil"
 	"k8s.io/helm/pkg/proto/hapi/chart"
 
-	"github.com/golang/protobuf/ptypes/any"
+	any "k8s.io/helm/pkg/proto/hapi/chart"
 )
 
 func TestSortTemplates(t *testing.T) {

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

@@ -12,6 +12,7 @@ It is generated from these files:
 
 It has these top-level messages:
 	Chart
+	Any
 	Config
 	Value
 	Maintainer
@@ -23,7 +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"
+import _ "github.com/golang/protobuf/ptypes/any"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -49,7 +50,7 @@ type Chart struct {
 	Values *Config `protobuf:"bytes,4,opt,name=values" json:"values,omitempty"`
 	// Miscellaneous files in a chart archive,
 	// e.g. README, LICENSE, etc.
-	Files []*google_protobuf.Any `protobuf:"bytes,5,rep,name=files" json:"files,omitempty"`
+	Files []*Any `protobuf:"bytes,5,rep,name=files" json:"files,omitempty"`
 }
 
 func (m *Chart) Reset()                    { *m = Chart{} }
@@ -85,35 +86,66 @@ func (m *Chart) GetValues() *Config {
 	return nil
 }
 
-func (m *Chart) GetFiles() []*google_protobuf.Any {
+func (m *Chart) GetFiles() []*Any {
 	if m != nil {
 		return m.Files
 	}
 	return nil
 }
 
+// Copied from https://github.com/golang/protobuf/blob/master/ptypes/any/any.proto
+type Any struct {
+	// A resource name whose content describes the type of the
+	// serialized data.
+	TypeUrl string `protobuf:"bytes,1,opt,name=type_url,json=typeUrl" json:"type_url,omitempty"`
+	// Data for file.
+	Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+}
+
+func (m *Any) Reset()                    { *m = Any{} }
+func (m *Any) String() string            { return proto.CompactTextString(m) }
+func (*Any) ProtoMessage()               {}
+func (*Any) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+
+func (m *Any) GetTypeUrl() string {
+	if m != nil {
+		return m.TypeUrl
+	}
+	return ""
+}
+
+func (m *Any) GetValue() []byte {
+	if m != nil {
+		return m.Value
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*Chart)(nil), "hapi.chart.Chart")
+	proto.RegisterType((*Any)(nil), "hapi.chart.Any")
 }
 
 func init() { proto.RegisterFile("hapi/chart/chart.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 242 bytes of a gzipped FileDescriptorProto
+	// 276 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xb1, 0x4e, 0xc3, 0x30,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xcf, 0x4b, 0xc3, 0x30,
-	0x10, 0x86, 0x15, 0x4a, 0x0a, 0x1c, 0x2c, 0x58, 0x08, 0x4c, 0xa7, 0x8a, 0x09, 0x75, 0x70, 0x50,
+	0x14, 0xc7, 0xe9, 0x6a, 0xf7, 0xe3, 0x39, 0x10, 0xc3, 0xd0, 0x6c, 0xa7, 0x32, 0x10, 0x86, 0x87,
-	0x11, 0x0f, 0x00, 0xcc, 0x2c, 0x16, 0x13, 0xdb, 0xb5, 0xb9, 0xa4, 0x91, 0x52, 0x3b, 0xaa, 0x5d,
+	0x56, 0x26, 0x7a, 0x9f, 0x9e, 0xbd, 0x04, 0xbd, 0x78, 0x91, 0x6c, 0x7d, 0xed, 0x0a, 0x59, 0x5a,
-	0xa4, 0xbe, 0x3b, 0x03, 0xea, 0xd9, 0xa6, 0x09, 0xea, 0x12, 0x29, 0xf7, 0x7d, 0xff, 0xe5, 0xbf,
+	0xda, 0x54, 0xe8, 0x5f, 0xee, 0x55, 0xfa, 0xd2, 0xba, 0x4e, 0x76, 0x29, 0xbc, 0x7c, 0x3e, 0xdf,
-	0xc0, 0xed, 0x0a, 0xbb, 0xa6, 0x58, 0xae, 0x70, 0xe3, 0xc3, 0x53, 0x75, 0x1b, 0xeb, 0xad, 0x80,
+	0x6f, 0x5f, 0x02, 0x37, 0x7b, 0x99, 0xa7, 0xe1, 0x6e, 0x2f, 0x0b, 0x63, 0xbf, 0x41, 0x5e, 0x64,
-	0xfd, 0x5c, 0xf1, 0x64, 0x72, 0xd7, 0x77, 0xac, 0xa9, 0x9a, 0x3a, 0x48, 0x93, 0xfb, 0x1e, 0x58,
+	0x26, 0x63, 0xd0, 0x9c, 0x07, 0x74, 0xb2, 0xb8, 0xed, 0x3b, 0x99, 0x8e, 0xd3, 0xc4, 0x4a, 0x8b,
-	0x93, 0xc7, 0x12, 0x3d, 0x1e, 0x41, 0x9e, 0xd6, 0x5d, 0x8b, 0x9e, 0x12, 0xaa, 0xad, 0xad, 0x5b,
+	0x79, 0x0f, 0x1c, 0xd0, 0xc8, 0x48, 0x1a, 0x79, 0x06, 0x19, 0x3c, 0xe4, 0x4a, 0x1a, 0xec, 0x50,
-	0x2a, 0xf8, 0x6d, 0xb1, 0xad, 0x0a, 0x34, 0xbb, 0x80, 0x1e, 0x7e, 0x32, 0xc8, 0xdf, 0xf7, 0x19,
+	0x92, 0x65, 0x89, 0xc2, 0x90, 0xa6, 0x6d, 0x15, 0x87, 0x52, 0xd7, 0x16, 0x2d, 0x7f, 0x1c, 0xf0,
-	0xf1, 0x04, 0xe7, 0x69, 0xa3, 0xcc, 0xa6, 0xd9, 0xe3, 0xe5, 0xfc, 0x46, 0x1d, 0x2a, 0xa9, 0x8f,
+	0x5e, 0x9b, 0x0c, 0x7b, 0x80, 0x71, 0xd7, 0xc8, 0x1d, 0xdf, 0x59, 0x5d, 0xae, 0x67, 0xc1, 0x71,
-	0xc8, 0xf4, 0x9f, 0x25, 0xe6, 0x70, 0x91, 0x3e, 0xe4, 0xe4, 0xc9, 0x74, 0xf4, 0x3f, 0xf2, 0x19,
+	0xa5, 0xe0, 0xad, 0x65, 0xe2, 0xcf, 0x62, 0x6b, 0x98, 0x74, 0x3f, 0x2a, 0xf9, 0xc0, 0x77, 0xff,
-	0xa1, 0x3e, 0x68, 0xe2, 0x05, 0xae, 0x4a, 0xea, 0xc8, 0x94, 0x64, 0x96, 0x0d, 0x39, 0x39, 0xe2,
+	0x47, 0xde, 0x5b, 0x28, 0x8e, 0x1a, 0x7b, 0x82, 0x69, 0x84, 0x39, 0xea, 0x08, 0xf5, 0x2e, 0xc5,
-	0xd8, 0x75, 0x3f, 0xc6, 0x75, 0xf4, 0x40, 0x13, 0x33, 0x18, 0x7f, 0x63, 0xbb, 0x25, 0x27, 0x4f,
+	0x92, 0xbb, 0x14, 0xbb, 0xee, 0xc7, 0x68, 0x1d, 0x71, 0xa2, 0xb1, 0x7b, 0x18, 0x7e, 0x4b, 0x55,
-	0xb9, 0x9a, 0x18, 0x04, 0xf8, 0x0f, 0xe9, 0x68, 0x88, 0x19, 0xe4, 0x55, 0xd3, 0x92, 0x93, 0x79,
+	0x61, 0xc9, 0x2f, 0x68, 0x35, 0x76, 0x12, 0xa0, 0x17, 0x12, 0xad, 0xc1, 0xee, 0xc0, 0x8b, 0x53,
-	0xac, 0x14, 0xae, 0x57, 0xe9, 0x7a, 0xf5, 0x6a, 0x76, 0x3a, 0x28, 0x6f, 0x67, 0x5f, 0x39, 0xef,
+	0x85, 0x25, 0xf7, 0xa8, 0xfb, 0xaa, 0xaf, 0x6e, 0x74, 0x2d, 0x2c, 0x5d, 0x3e, 0x83, 0xbb, 0xd1,
-	0x58, 0x8c, 0x99, 0x3e, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xe9, 0x70, 0x34, 0x75, 0x9e, 0x01,
+	0x35, 0x9b, 0xc3, 0xd8, 0xd4, 0x39, 0x7e, 0x55, 0x85, 0xa2, 0x6b, 0x4f, 0xc4, 0xa8, 0x99, 0x3f,
-	0x00, 0x00,
+	0x0a, 0xc5, 0x66, 0xe0, 0x51, 0x25, 0x1f, 0xf8, 0xce, 0x6a, 0x2a, 0xec, 0xf0, 0x32, 0xfa, 0xf4,
+	0xa8, 0x6b, 0x3b, 0xa4, 0x17, 0x7c, 0xfc, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x06, 0x23, 0x45, 0x93,
+	0xd1, 0x01, 0x00, 0x00,
 }