From a46a033de4a04f52ee57152786a3131765b57f42 Mon Sep 17 00:00:00 2001
From: Matt Butcher <mbutcher@engineyard.com>
Date: Mon, 22 Aug 2016 14:58:19 -0600
Subject: [PATCH] feat(chart): support 'image:URL' in charts.

Closes #1034
---
 _proto/hapi/chart/metadata.proto              |   3 ++
 docs/charts.md                                |   1 +
 pkg/chartutil/chartfile_test.go               |   4 ++
 pkg/chartutil/testdata/chartfiletest.yaml     |   1 +
 pkg/chartutil/testdata/frobnitz-1.2.3.tgz     | Bin 3775 -> 3777 bytes
 pkg/chartutil/testdata/frobnitz/Chart.yaml    |   1 +
 .../frobnitz/charts/mariner-4.3.2.tgz         | Bin 936 -> 941 bytes
 .../mariner/charts/albatross-0.1.0.tgz        | Bin 347 -> 347 bytes
 pkg/proto/hapi/chart/metadata.pb.go           |  39 ++++++++++--------
 9 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/_proto/hapi/chart/metadata.proto b/_proto/hapi/chart/metadata.proto
index 884f458db..40c8b40dc 100644
--- a/_proto/hapi/chart/metadata.proto
+++ b/_proto/hapi/chart/metadata.proto
@@ -58,4 +58,7 @@ message Metadata {
 
 	// The name of the template engine to use. Defaults to 'gotpl'.
 	string engine = 8;
+
+	// The URL to an icon file.
+	string icon = 9;
 }
diff --git a/docs/charts.md b/docs/charts.md
index 7fbe2b6ab..104c3ad18 100644
--- a/docs/charts.md
+++ b/docs/charts.md
@@ -51,6 +51,7 @@ maintainers: # (optional)
   - name: The maintainer's name (required for each maintainer)
     email: The maintainer's email (optional for each maintainer)
 engine: gotpl # The name of the template engine (optional, defaults to gotpl)
+icon: A URL to an SVG or PNG image to be used as an icon (optional).
 ```
 
 If you are familiar with the `Chart.yaml` file format for Helm Classic, you will
diff --git a/pkg/chartutil/chartfile_test.go b/pkg/chartutil/chartfile_test.go
index b43b8a5da..618cc2c73 100644
--- a/pkg/chartutil/chartfile_test.go
+++ b/pkg/chartutil/chartfile_test.go
@@ -75,6 +75,10 @@ func verifyChartfile(t *testing.T, f *chart.Metadata) {
 		t.Error("Unexpected home.")
 	}
 
+	if f.Icon != "https://example.com/64x64.png" {
+		t.Errorf("Unexpected icon: %q", f.Icon)
+	}
+
 	if len(f.Keywords) != 3 {
 		t.Error("Unexpected keywords")
 	}
diff --git a/pkg/chartutil/testdata/chartfiletest.yaml b/pkg/chartutil/testdata/chartfiletest.yaml
index 9f255b9bd..b665c61be 100644
--- a/pkg/chartutil/testdata/chartfiletest.yaml
+++ b/pkg/chartutil/testdata/chartfiletest.yaml
@@ -13,3 +13,4 @@ maintainers:
 sources:
   - https://example.com/foo/bar
 home: http://example.com
+icon: https://example.com/64x64.png
diff --git a/pkg/chartutil/testdata/frobnitz-1.2.3.tgz b/pkg/chartutil/testdata/frobnitz-1.2.3.tgz
index 50d1ef01484094a445c867e612e363f4f527d604..4e68564fc1202e94581eb43ef9dfb354d12f59c7 100644
GIT binary patch
literal 3777
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

literal 3775
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

diff --git a/pkg/chartutil/testdata/frobnitz/Chart.yaml b/pkg/chartutil/testdata/frobnitz/Chart.yaml
index 9f255b9bd..b665c61be 100644
--- a/pkg/chartutil/testdata/frobnitz/Chart.yaml
+++ b/pkg/chartutil/testdata/frobnitz/Chart.yaml
@@ -13,3 +13,4 @@ maintainers:
 sources:
   - https://example.com/foo/bar
 home: http://example.com
+icon: https://example.com/64x64.png
diff --git a/pkg/chartutil/testdata/frobnitz/charts/mariner-4.3.2.tgz b/pkg/chartutil/testdata/frobnitz/charts/mariner-4.3.2.tgz
index 27bd51f654f64fa50e431c35bd69c9e7d509a5c1..d454bb9b1dc11fa526246b9534aceef8a4d80f91 100644
GIT binary patch
literal 941
zcmV;e15*4SiwFRQX1iAa1ItY;%FIhG(r2I{FfcGMH#JoN(`FFbz{mtbLxF;!k-3qn
ziLt4%iMfJ-p^1^934?+uEgb~|rNt$QML?(ICYF>Wm6jxDq!wXS2UM1phQ}PJKj8Eb
z0lColcg{#GD$%P<%*~;`9l-D~Gcmy(|AvO<;P^K&Ha9mhH37!InW2d>gMtC|oq`EQ
zc>L!j=B8RHKvMx%N@{U(QD#9&W`3TPf}?^*YEG^~GALyzq~#YWc$X%n7UiXuq!x3P
zr4|)~6`AN6>ltxn<bzC6QsNqD?~DQx0WAN6W4V|%)c}#@zp0UlnSr^9F);s|nwXo7
zmjCnsu=p=Y%`M1D1ZHg-BmrXUf28u?$k22&{^<c=@n4phQ<_>#n+5=(`rpXZ46XfV
zW@2D8TL04nC@Z+6rX`l<lqf(_0Jx%uCJH?+WrdK8%wh!~N>qq+^!3pN%7OwaHANvU
zGbdF~A)}<Epx8=ZKRvS~qclk`IX_pwBtJJtHzzSK9n9haS&*EQSd^*&YHC2znL<Hg
zW>K+1Nxni7h+SL^G%qs`$gRvTEmD9NMIiej?Gq)iw$bJV^#Nx252TV)GxBp%fC-?a
zfEuL%q5N-PY=~O^8yN!OX#S@MK+fUFF+ZBsMg~A@|0m`oC6*NB7Z>Xq=o#u6=#`{b
zQEmsJ{BLS(3~v9MnVA_I8JGd{zk!*l$!Pwk2axaPU}#I*9nQe~_S)U7!wM2?4`iQf
zEfK#^tM<>~oSQ$}Zm!F>mL+5vF59qsex^6m;@?YOntiiVpVx75&#UEyQ#%iCfBW}t
zN{5H{$-cE#Tc>mfS0Afb$E_7|aAm@gR-G<uwdJ!ft;k-?nW@#=x$)JbP1_zO?Z1+{
zw=R9oXREev{RYnex^J~u)SLD0{$_sZe}L1Tx%THP=hy3Tt!)+2tXC~LHGiG$MDKr<
z|Ew?Hn8dqVA^K*S<hI{CzV4o6yTSdn)V4R}Y|+0D%-eOUZEo+jvwUV-j{BKBFFuuZ
zzu$Ovs{LMtACo@*kq@4?gs0}yzw?&QRYbo&x1Y*z=l^ztXY#q5%hhDxuFh}Ff1+R9
z`X@i}%>RU#^xK+p4Dwg&C;htm+yCX9fdBc4C+tPvOITT--qibfYGLZJ884IGI-eA~
zcXLB*uFfiJ<lsDz|BXqXJyMH7W1u2*6pVsVFbYP&C>RB!U=)mkQ7{Td!6+C7qhJ(_
P0we$c>4Z%>04M+esP@qU

literal 936
zcmV;Z16TYXiwFR;38hy61MQZ3XcI{s$Abq|<Kr(qtDqgK_O#f|zN0Bxwc-i&u7biL
zDs+-glC8VhxI3xVR}rkJrHbVW2WtC=kNQCAd0s0<QBi!<_Y>bQ#8S10ibbrZ?k1_k
zXBC@>IG+S&LS|=X=llEq=BGeS@*&M;i6b;k+XVrHTQSnoEFWp30EV@*0?!E?ZwEBP
zvkY$mLOeIsMnK0<Gq$2YjGY1O@*?e{<BVZ$_h;sbzQ^142SJJIpY4Sjri!2<cl;X0
zd5Ap!Y5f_-9@d}d>~>z@4gE!i=PZEk_^o`%Pp-cYD#!t%QDDtSx=WM%SW<lsFa}IO
zvI1OYWB|9Sft-L7X+DIJZY@Nb9v;L~9K~9_syRz)s`Y!n4&f_l^M6=nJwDgKm*#(w
z7VWIjrx}44MUwv$L7V;<DSjCm){a96e5w91`JZJ3qJJW2)4veP0i?&L0BG<2X9e-S
z`cLF(mfZh|U?3QW+%O<x5Q%{BMIQ|c$~q8C@k%-{z7R|u^T)&t<6rZjP(E-=GNOPN
zW54dO**p^V2Aq^jRcu&Q<O~`5JmH?zT)-tm4FR*%h{PH2LrK#CR)N#(>$)+Y<THL2
zsR0eVO-1JVk@_Sx{1_=OI-U>nztOmmSC#XP0Koo^$Oi5CpXQi%^FPZNAL9Q+5bN+*
z<%!jP4&JN(q3ncMQ*}LqrWlH*uxIYKuhE|W1&%ZQFEA`^)cvOajqxJ!e<DaJ?PA&4
zb;DnlUz#r6C^!g`lWzBKNMGOQ%!0Jg=u_i!lY-XsS2yMrFdJ)vRZ>o;buAkj#pY4J
zRW3cd=Rx(Xie(4tnqJ??UpgV@*otkA|NkzXJn!(F?cLI+9N3(9sASmk%(Uv&=Qhn;
z*Hua{TlVjRyE|&{IQLyp_Ad0SdFEKsypqlim0n#uyjUy?Hrvm&P8z#sZPw|cs$$Bz
zt)$n`;=#DSYWv7lIiaFZ=K0IzJ%V7`mBPNYExVov%SYDy{;*%|quEK*TJ~4&u3xgY
ztoCG2ap#dg`3Akd;MPiRHOkrxUX(w1l`^?<efRlKL#IbH4C?*7A*;f2y|s?MpQ8LX
zJFS1yR&|kj&!(5WQsIf#yy>26LkCz=E*6)+yx5Z4xMotT3Xf*>ew^&cJiepsS;Z`L
z_@72+Q}(f6Z(gaHp$yxS8GD@j)#gsN&QsGZL%x@w1OkCTAP@)y0)apv5C{Z93~vC_
KC$O{tC;$M@pyPM|

diff --git a/pkg/chartutil/testdata/mariner/charts/albatross-0.1.0.tgz b/pkg/chartutil/testdata/mariner/charts/albatross-0.1.0.tgz
index c35e1b9701734924198f1739129a9563f75ba7cd..d92a38e676f1527815c247a0b06aeb59c0806a62 100644
GIT binary patch
delta 16
Xcmcc3beoA?zMF%gEp7Kk_7Fw@E{Fvv

delta 16
Xcmcc3beoA?zMF$#3+K{}>>-Q*EiMG(

diff --git a/pkg/proto/hapi/chart/metadata.pb.go b/pkg/proto/hapi/chart/metadata.pb.go
index b753f8608..d6270bda9 100644
--- a/pkg/proto/hapi/chart/metadata.pb.go
+++ b/pkg/proto/hapi/chart/metadata.pb.go
@@ -67,6 +67,8 @@ type Metadata struct {
 	Maintainers []*Maintainer `protobuf:"bytes,7,rep,name=maintainers" json:"maintainers,omitempty"`
 	// The name of the template engine to use. Defaults to 'gotpl'.
 	Engine string `protobuf:"bytes,8,opt,name=engine" json:"engine,omitempty"`
+	// The URL to an icon file.
+	Icon string `protobuf:"bytes,9,opt,name=icon" json:"icon,omitempty"`
 }
 
 func (m *Metadata) Reset()                    { *m = Metadata{} }
@@ -88,22 +90,23 @@ func init() {
 }
 
 var fileDescriptor2 = []byte{
-	// 266 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x90, 0x4b, 0x4b, 0xc4, 0x40,
-	0x10, 0x84, 0xdd, 0x47, 0x1e, 0xdb, 0xb9, 0x2c, 0x8d, 0x2c, 0xa3, 0xa7, 0x90, 0x93, 0xa7, 0x2c,
-	0x28, 0x88, 0x67, 0x41, 0x3c, 0xe8, 0x66, 0x65, 0x51, 0x04, 0x6f, 0x63, 0xd2, 0x98, 0x41, 0x93,
-	0x09, 0x33, 0xa3, 0xe2, 0x3f, 0xf1, 0xe7, 0x3a, 0xe9, 0x7d, 0x1e, 0x3c, 0x04, 0xaa, 0xea, 0x4b,
-	0xd7, 0xd0, 0x0d, 0x27, 0xb5, 0xec, 0xd4, 0xbc, 0xac, 0xa5, 0x71, 0xf3, 0x86, 0x9c, 0xac, 0xa4,
-	0x93, 0x79, 0x67, 0xb4, 0xd3, 0x08, 0x3d, 0xca, 0x19, 0x65, 0x97, 0x00, 0x0b, 0xa9, 0x5a, 0xe7,
-	0x3f, 0x32, 0x88, 0x30, 0x6e, 0x65, 0x43, 0x62, 0x90, 0x0e, 0xce, 0x26, 0x2b, 0xd6, 0x78, 0x0c,
-	0x01, 0x35, 0x52, 0x7d, 0x88, 0x21, 0x87, 0x6b, 0x93, 0xfd, 0x0e, 0x21, 0x5e, 0x6c, 0x6a, 0xff,
-	0x1d, 0xf3, 0x59, 0xad, 0x7d, 0xb6, 0x9e, 0x62, 0x8d, 0x02, 0x22, 0xab, 0x3f, 0x4d, 0x49, 0x56,
-	0x8c, 0xd2, 0x91, 0x8f, 0xb7, 0xb6, 0x27, 0x5f, 0x64, 0xac, 0xd2, 0xad, 0x18, 0xf3, 0xc0, 0xd6,
-	0x62, 0x0a, 0x49, 0x45, 0xb6, 0x34, 0xaa, 0x73, 0x3d, 0x0d, 0x98, 0x1e, 0x46, 0x78, 0x0a, 0xf1,
-	0x3b, 0xfd, 0x7c, 0x6b, 0x53, 0x59, 0x11, 0x72, 0xed, 0xce, 0xe3, 0x15, 0x24, 0xcd, 0x6e, 0x3d,
-	0x2b, 0x22, 0x8f, 0x93, 0xf3, 0x59, 0xbe, 0x3f, 0x40, 0xbe, 0xdf, 0x7e, 0x75, 0xf8, 0x2b, 0xce,
-	0x20, 0xa4, 0xf6, 0xcd, 0x6b, 0x11, 0xf3, 0x93, 0x1b, 0x97, 0xa5, 0x10, 0xde, 0xb0, 0xc2, 0x04,
-	0xa2, 0xa7, 0xe2, 0xae, 0x58, 0x3e, 0x17, 0xd3, 0x23, 0x9c, 0x40, 0x70, 0xbb, 0x7c, 0x7c, 0xb8,
-	0x9f, 0x0e, 0xae, 0xa3, 0x97, 0x80, 0xab, 0x5f, 0x43, 0x3e, 0xf7, 0xc5, 0x5f, 0x00, 0x00, 0x00,
-	0xff, 0xff, 0xe5, 0xf8, 0x57, 0xee, 0x8b, 0x01, 0x00, 0x00,
+	// 275 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x91, 0x4b, 0x4b, 0xc4, 0x30,
+	0x14, 0x85, 0x9d, 0x47, 0x5f, 0xb7, 0x9b, 0xe1, 0x22, 0x43, 0x74, 0x55, 0xba, 0x72, 0xd5, 0x01,
+	0x05, 0x71, 0x2d, 0x88, 0x0b, 0x9d, 0x8e, 0x0c, 0x8a, 0xe0, 0x2e, 0xb6, 0xc1, 0x06, 0x6d, 0x53,
+	0x92, 0xa8, 0xf8, 0x9f, 0xfc, 0x91, 0x26, 0xb7, 0xf3, 0x5a, 0xb8, 0x28, 0x9c, 0x73, 0xbe, 0xde,
+	0xdc, 0x9e, 0x06, 0x4e, 0x1a, 0xde, 0xcb, 0x45, 0xd5, 0x70, 0x6d, 0x17, 0xad, 0xb0, 0xbc, 0xe6,
+	0x96, 0x17, 0xbd, 0x56, 0x56, 0x21, 0x78, 0x54, 0x10, 0xca, 0x2f, 0x01, 0x96, 0x5c, 0x76, 0xd6,
+	0x3d, 0x42, 0x23, 0xc2, 0xb4, 0xe3, 0xad, 0x60, 0xa3, 0x6c, 0x74, 0x96, 0xac, 0x49, 0xe3, 0x31,
+	0x04, 0xa2, 0xe5, 0xf2, 0x83, 0x8d, 0x29, 0x1c, 0x4c, 0xfe, 0x3b, 0x86, 0x78, 0xb9, 0x39, 0xf6,
+	0xdf, 0x31, 0x97, 0x35, 0xca, 0x65, 0xc3, 0x14, 0x69, 0x64, 0x10, 0x19, 0xf5, 0xa9, 0x2b, 0x61,
+	0xd8, 0x24, 0x9b, 0xb8, 0x78, 0x6b, 0x3d, 0xf9, 0x12, 0xda, 0x48, 0xd5, 0xb1, 0x29, 0x0d, 0x6c,
+	0x2d, 0x66, 0x90, 0xd6, 0xc2, 0x54, 0x5a, 0xf6, 0xd6, 0xd3, 0x80, 0xe8, 0x61, 0x84, 0xa7, 0x10,
+	0xbf, 0x8b, 0x9f, 0x6f, 0xa5, 0x6b, 0xc3, 0x42, 0x3a, 0x76, 0xe7, 0xf1, 0x0a, 0xd2, 0x76, 0x57,
+	0xcf, 0xb0, 0xc8, 0xe1, 0xf4, 0x7c, 0x5e, 0xec, 0x7f, 0x40, 0xb1, 0x6f, 0xbf, 0x3e, 0x7c, 0x15,
+	0xe7, 0x10, 0x8a, 0xee, 0xcd, 0x69, 0x16, 0xd3, 0xca, 0x8d, 0xf3, 0xbd, 0x64, 0xe5, 0x3e, 0x24,
+	0x19, 0x7a, 0x79, 0x9d, 0x67, 0x10, 0xde, 0x0c, 0x34, 0x85, 0xe8, 0xa9, 0xbc, 0x2b, 0x57, 0xcf,
+	0xe5, 0xec, 0x08, 0x13, 0x08, 0x6e, 0x57, 0x8f, 0x0f, 0xf7, 0xb3, 0xd1, 0x75, 0xf4, 0x12, 0xd0,
+	0xba, 0xd7, 0x90, 0xae, 0xe0, 0xe2, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x72, 0xdf, 0x74, 0xb5, 0x9f,
+	0x01, 0x00, 0x00,
 }