From 9ca8c27e16bebd9a5bde4a653c31f79027d6bad1 Mon Sep 17 00:00:00 2001
From: Matt Butcher <mbutcher@engineyard.com>
Date: Mon, 6 Jun 2016 19:34:30 -0600
Subject: [PATCH] fix(*): change TOML to YAML

---
 _proto/hapi/services/tiller.proto             |   4 +--
 cmd/helm/create.go                            |   2 +-
 cmd/helm/install.go                           |   2 +-
 docs/charts.md                                |  34 +++++++++---------
 docs/examples/alpine/README.md                |   2 +-
 docs/examples/alpine/values.toml              |   2 --
 docs/examples/alpine/values.yaml              |   2 ++
 pkg/chartutil/load.go                         |   4 ++-
 pkg/chartutil/testdata/frobnitz-1.2.3.tgz     | Bin 3459 -> 3333 bytes
 .../charts/alpine/charts/mast1/values.yaml    |   2 +-
 .../charts/alpine/charts/mast2-0.1.0.tgz      | Bin 435 -> 325 bytes
 .../frobnitz/charts/mariner-4.3.2.tgz         | Bin 895 -> 896 bytes
 .../mariner/charts/albatross-0.1.0.tgz        | Bin 322 -> 322 bytes
 pkg/engine/engine.go                          |   7 ++--
 pkg/engine/engine_test.go                     |  23 ++++++------
 pkg/helm/error.go                             |   2 +-
 pkg/lint/lint_test.go                         |   4 +--
 pkg/lint/message.go                           |   2 +-
 pkg/lint/testdata/albatross/values.toml       |   1 -
 pkg/lint/testdata/albatross/values.yaml       |   1 +
 pkg/lint/testdata/badchartfile/values.toml    |   4 ---
 pkg/lint/testdata/badchartfile/values.yaml    |   1 +
 .../{values.toml => values.yaml}              |   4 +--
 pkg/lint/testdata/goodone/values.toml         |   1 -
 pkg/lint/testdata/goodone/values.yaml         |   1 +
 pkg/lint/values.go                            |  10 +++---
 pkg/proto/hapi/services/tiller.pb.go          |   2 +-
 27 files changed, 58 insertions(+), 59 deletions(-)
 delete mode 100644 docs/examples/alpine/values.toml
 create mode 100644 docs/examples/alpine/values.yaml
 delete mode 100644 pkg/lint/testdata/albatross/values.toml
 create mode 100644 pkg/lint/testdata/albatross/values.yaml
 delete mode 100644 pkg/lint/testdata/badchartfile/values.toml
 create mode 100644 pkg/lint/testdata/badchartfile/values.yaml
 rename pkg/lint/testdata/badvaluesfile/{values.toml => values.yaml} (66%)
 delete mode 100644 pkg/lint/testdata/goodone/values.toml
 create mode 100644 pkg/lint/testdata/goodone/values.yaml

diff --git a/_proto/hapi/services/tiller.proto b/_proto/hapi/services/tiller.proto
index 4829633e8..729a9848e 100644
--- a/_proto/hapi/services/tiller.proto
+++ b/_proto/hapi/services/tiller.proto
@@ -16,7 +16,7 @@ option go_package = "services";
 // 				 config. At any given time a release has one
 //				 chart and one config.
 //
-//		Config:  A config is a TOML file that supplies values
+//		Config:  A config is a YAML file that supplies values
 //				 to the parametrizable templates of a chart.
 //
 //		Chart:   A chart is a helm package that contains
@@ -150,7 +150,7 @@ message UpdateReleaseResponse {
 message InstallReleaseRequest {
 	// Chart is the protobuf representation of a chart.
 	hapi.chart.Chart chart = 1;
-	// Values is a string containing (unparsed) TOML values.
+	// Values is a string containing (unparsed) YAML values.
 	hapi.chart.Config values = 2;
 	// DryRun, if true, will run through the release logic, but neither create
 	// a release object nor deploy to Kubernetes. The release object returned
diff --git a/cmd/helm/create.go b/cmd/helm/create.go
index 4270e1bbc..e99a05cc9 100644
--- a/cmd/helm/create.go
+++ b/cmd/helm/create.go
@@ -19,7 +19,7 @@ something like this:
 	foo/
 	  |- Chart.yaml    # Information about your chart
 	  |
-	  |- values.toml   # The default values for your templates
+	  |- values.yaml   # The default values for your templates
 	  |
 	  |- charts/       # Charts that this chart depends on
 	  |
diff --git a/cmd/helm/install.go b/cmd/helm/install.go
index a8de096c5..1d0717836 100644
--- a/cmd/helm/install.go
+++ b/cmd/helm/install.go
@@ -42,7 +42,7 @@ var installCmd = &cobra.Command{
 
 func init() {
 	f := installCmd.Flags()
-	f.StringVarP(&installValues, "values", "f", "", "path to a values TOML file")
+	f.StringVarP(&installValues, "values", "f", "", "path to a values YAML file")
 	f.StringVarP(&installRelName, "name", "n", "", "the release name. If unspecified, it will autogenerate one for you.")
 	f.BoolVar(&installDryRun, "dry-run", false, "simulate an install")
 
diff --git a/docs/charts.md b/docs/charts.md
index ced2aa3e1..ed95e0ba8 100644
--- a/docs/charts.md
+++ b/docs/charts.md
@@ -25,7 +25,7 @@ wordpress/
   Chart.yaml        # A YAML file containing information about the chart
   LICENSE           # OPTIONAL: A plain text file containing the license for the chart
   README.md         # OPTIONAL: A human-readable README file
-  values.toml       # The default configuration values for this chart
+  values.yaml       # The default configuration values for this chart
   charts/           # A directory containing any charts upon which this chart depends.
   templates/        # A directory of templates that, when combined with values,
                     # will generate valid Kubernetes manifest files.
@@ -133,13 +133,13 @@ Helm renders the charts, it will pass every file in that directory
 through the template engine.
 
 Values for the templates are supplied two ways:
-  - Chart developers may supply a file called `values.toml` inside of a
+  - Chart developers may supply a file called `values.yaml` inside of a
     chart. This file can contain default values.
-  - Chart users may supply a TOML file that contains values. This can be
+  - Chart users may supply a YAML file that contains values. This can be
     provided on the command line with `helm install`.
 
 When a user supplies custom values, these values will override the
-values in the chart's `values.toml` file.
+values in the chart's `values.yaml` file.
 ### Template Files
 
 Template files follow the standard conventions for writing Go templates.
@@ -207,36 +207,36 @@ used to pass arbitrarily structured data into the template.
 
 ### Values files
 
-Considering the template in the previous section, a `values.toml` file
+Considering the template in the previous section, a `values.yaml` file
 that supplies the necessary values would look like this:
 
-```toml
+```yaml
 imageRegistry = "quay.io/deis"
 dockerTag = "latest"
 pullPolicy = "alwaysPull"
 storage = "s3"
 ```
 
-A values file is formatted in TOML. A chart may include a default
-`values.toml` file. The Helm install command allows a user to override
-values by supplying additional TOML values:
+A values file is formatted in YAML. A chart may include a default
+`values.yaml` file. The Helm install command allows a user to override
+values by supplying additional YAML values:
 
 ```console
-$ helm install --values=myvals.toml wordpress
+$ helm install --values=myvals.yaml wordpress
 ```
 
 When values are passed in this way, they will be merged into the default
-values file. For example, consider a `myvals.toml` file that looks like
+values file. For example, consider a `myvals.yaml` file that looks like
 this:
 
-```toml
+```yaml
 storage = "gcs"
 ```
 
-When this is merged with the `values.toml` in the chart, the resulting
+When this is merged with the `values.yaml` in the chart, the resulting
 generated content will be:
 
-```toml
+```yaml
 imageRegistry = "quay.io/deis"
 dockerTag = "latest"
 pullPolicy = "alwaysPull"
@@ -246,7 +246,7 @@ storage = "gcs"
 Note that only the last field was overridden.
 
 **NOTE:** The default values file included inside of a chart _must_ be named
-`values.toml`. But files specified on the command line can be named
+`values.yaml`. But files specified on the command line can be named
 anything.
 
 ### Scope, Dependencies, and Values
@@ -259,7 +259,7 @@ demonstration Wordpress chart above has both `mysql` and `apache` as
 dependencies. The values file could supply values to all of these
 components:
 
-```toml
+```yaml
 title = "My Wordpress Site" # Sent to the Wordpress template
 
 [mysql]
@@ -289,7 +289,7 @@ standard references that will help you out.
 
 - [Go templates](https://godoc.org/text/template)
 - [Extra template functions](https://godoc.org/github.com/Masterminds/sprig)
-- [The TOML format](https://github.com/toml-lang/toml)
+- [The YAML format]()
 
 ## Using Helm to Manage Charts
 
diff --git a/docs/examples/alpine/README.md b/docs/examples/alpine/README.md
index a7c84fc41..5bd595747 100644
--- a/docs/examples/alpine/README.md
+++ b/docs/examples/alpine/README.md
@@ -3,7 +3,7 @@ This example was generated using the command `helm create alpine`.
 The `templates/` directory contains a very simple pod resource with a
 couple of parameters.
 
-The `values.toml` file contains the default values for the
+The `values.yaml` file contains the default values for the
 `alpine-pod.yaml` template.
 
 You can install this example using `helm install docs/examples/alpine`.
diff --git a/docs/examples/alpine/values.toml b/docs/examples/alpine/values.toml
deleted file mode 100644
index 504e6e1be..000000000
--- a/docs/examples/alpine/values.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-# The pod name
-name = "my-alpine"
diff --git a/docs/examples/alpine/values.yaml b/docs/examples/alpine/values.yaml
new file mode 100644
index 000000000..bb6c06ae4
--- /dev/null
+++ b/docs/examples/alpine/values.yaml
@@ -0,0 +1,2 @@
+# The pod name
+name: my-alpine
diff --git a/pkg/chartutil/load.go b/pkg/chartutil/load.go
index c7b3b6d59..ef1662a8d 100644
--- a/pkg/chartutil/load.go
+++ b/pkg/chartutil/load.go
@@ -93,7 +93,9 @@ func loadFiles(files []*afile) (*chart.Chart, error) {
 				return c, err
 			}
 			c.Metadata = m
-		} else if f.name == "values.toml" || f.name == "values.yaml" {
+		} else if f.name == "values.toml" {
+			return c, errors.New("values.toml is illegal as of 2.0.0-alpha.2")
+		} else if f.name == "values.yaml" {
 			c.Values = &chart.Config{Raw: string(f.data)}
 		} else if strings.HasPrefix(f.name, "templates/") {
 			c.Templates = append(c.Templates, &chart.Template{Name: f.name, Data: f.data})
diff --git a/pkg/chartutil/testdata/frobnitz-1.2.3.tgz b/pkg/chartutil/testdata/frobnitz-1.2.3.tgz
index 80c0a25022b6306a4aadb290475650981f1fcef5..31c855223046ed3bba9abb2a7ca707195ad6daa4 100644
GIT binary patch
literal 3333
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
P_}Ta$fGYPr0C)fZ@}|9H

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

diff --git a/pkg/chartutil/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml b/pkg/chartutil/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml
index f0cab9e08..42c39c262 100644
--- a/pkg/chartutil/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml
+++ b/pkg/chartutil/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml
@@ -1,4 +1,4 @@
 # Default values for mast1.
-# This is a TOML-formatted file. https://github.com/toml-lang/toml
+# This is a YAML-formatted file.
 # Declare name/value pairs to be passed into your templates.
 # name = "value"
diff --git a/pkg/chartutil/testdata/frobnitz/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/chartutil/testdata/frobnitz/charts/alpine/charts/mast2-0.1.0.tgz
index 232322a261bbcfd9e8c2ce7fcc00414081f84e71..ced5a4a6adf946f76033b6ee584affc12433cb78 100644
GIT binary patch
literal 325
zcmV-L0lNMliwFRxBUV=c1MSw|YJ)Ho2Jl|{6o>BKov2ah-PkS$dy3RWS}<CYSlHW7
zld_Al|B#Nd?{|}%5ToBojz&3O+^&*h=0-{iV;x5>syLpID4If6g{VtOEXtaBMKbNS
zqRDw>=dBp!{dV&0PTP0q&C|N>lXXt-@itxw6Y{^`DeLnWW%?A)n7>C|RUhXsgbeu$
zF~=_IIe#g+SrMn$%(;J_|DcTCP^g0JS-aNm4}L!m8@i)M-5Y9`%Ajtv^fYa?9kkaj
zJ8J8~B+f<7*=}6cSg*6cei`_&c>Y7mE>#=&?)@Lnf3ci@t|adNONjY<Z4SMfk9Lw0
z_(lFwHpu@HV*W?fPuivW0r;x_b6K7J|H-Ci^#4n^p$FZmsrM9XAhh~W6gk>C00000
X0000000000z?FFgy`&fL04M+ebFHRB

literal 435
zcmV;k0ZjfMiwG0|32ul0|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PL3CYQrED$8(*hIJDPI)W!q~yBOQWU>m#X3)s{)0TY9oLf?LV
z&@l#Mlr0%!{s<gH^c>CqsHbDvkYrjADo{nKwFp&Zu!t1F1`<pvf^mruCJDlbtg8g*
z#Pjlu+Aw9O@?Afdg<R|(!Rw#jHB6c8%sMee467$9i{exLF{bbIFKvH93Y@?!Kk=XI
z-?NTyz-K|a=ekzyU|QL4;1(XZ=%99)0SBqzaolm$bHjCd;!68YD8m^_8|i#37U^#<
zCUP}l|9h47R57kU|1l-&c>d2p(BJTG5X^4vNn%{DKOt)x^`C>F|A~o_>&(bW3V^Tf
ze?sX;{V9(3|12!wo*&pK41^r;SG`Y)EM3C3X*Jk~!S?0(X=T54%ox6hLo0X&jWL7X
z<oU5R&A7{I+2t;UR)Y0M-%6ePS}?`I6&fMWU|_A%U?l8ZTWjmD?d|JXjtbt6A{XBc
df*V-)ak0LLL?V$N<TU^Q|NkS3k2L@i007j>&{6;Z

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 3b6f987b3b39b992636405c611bc710066b3a8cd..90c7979afe88fb36ef00f6fe09041217b874323f 100644
GIT binary patch
literal 896
zcmV-`1AqJ<iwFSOBUV=c1MQYuNEA^R$G0TQh4Q6`O2MNdw8+lR%+Ab)1))V*T1HkT
zR4}_c>yFIqY%^yyyBQQ+^g%6q>LQwJ^q?dW1r=f!(cXlzOnT`iX_i51-kZHxmX%8G
zN_c*=@XfGi&N*}b-%Vs?-oeQRO#s1h+(gsBYZ;%#Ny=ya0D?4;G(|AD(FkyYB5|Vz
z(1G047%l~}vbq(Kh0yGR7CR^ZcAPrQX8X%L{_ps1{}V*N{_E_l46!^`6lQ)6^*k7g
z`m_E7Ve;xv8BHdNrd0hIf>QOzXMQUandAC9SdmKrelO5kImIILPRL7+1ds@lIY9&#
zk7odzB!d)}nUftH<P>cVCoA4T6lTOotzGiW5)-4H?ax6>ld<^ss;mU23`{lu|A>E@
zM)^NDjOh<K(J8QMXa~RrrmsIk5;W337>wzk!wN1=2}}bpS^Xzz=9m7DF`5We|ARp+
zSkKv5mjHp!1H6Ua?-ZCe7VNO|3Q&J6$V}Xls#pK@9292-HeTQ`V29ADBp3`?JhZ#a
zm_-r|P!a{bz&f(LcUsQ^7J-#H;Au5{eg>Q@FDn2_!0fqK6m>q{p+4qGE*X4JMV|G2
z{Yi}XHPl|rJQMT3YAl>x60E8NK<7+kgUR9_HxfVRf09ry6#v0se1wlz9);T6;FtcN
z70fJ@B}LKW7=hs!%sTk*YfKjZG*0^KKS`L>T!53f+5n*V4+c?%i!`mVyD~H(T`g_d
z4?tvS_r7*rWq9$m9?iY@JIg=lQf<l6rz)zh-zwXbGXKizv)0lhbrE5wn-6!at$Lj5
ztnLfH@MzoSo26F!Q@4B1o)_`=Z@=4)U!!A7!*uUYHomQ*-XF%Xt!^gTy0<Z<)6rY_
zvf$OZ{WYD-+E%j-Ls2QOlLoRovOnfN{8WD8>#F>Q*5bP7yuR{ue|&jvL{j_ZM*ZlT
z(S|2EX$^ae@9r+U^I8|#W=mW0rfC=5G<Yeoprxc8yHQhHKk!Dl6qV3i>ZWvUM=y3U
z{hbTyi&ES3lk-Z*?w5mQ#0Gc8aDP#prf+mb)zI<kwDV^+9_rP17Y@Z`H0Cc(AIVC0
zwHQ8!bnhI#da-VBH2w3up8Um@k=g?bpJgs}jz6_ygFT`5YQL0eR?e1g2m}IwKp+qZ
W1OkCTAP@+|RQLwGttd?ZC;$MWiMs;;

literal 895
zcmV-_1AzP=iwFRo99CBV1MQbvNEA^R$G0M@1@oncE`mozXpx<rnVp#p3qp&sw2bTu
z7R>I>?vBjtY%^yy%Q7gs=z~`FR4Q6)^iU)b1s2jxw%&rWi}X^Ks96SCdEI6&nrUT{
zyAqz?EPONU*>ldE|94xFm3b#88#G}A$8i%)gMej%7AL8o4FL$!MA8(&;6@|B35vvx
z8bF70Q$x5F$ja(gL>5A`8(JKk{L69bFq`cU^Mu}G*#0MoA^lf5SQ%mktSC(W8tQp4
z6!m-k3BnZ6pE8<E6iuo6GX$mTk5B$q#xl+Icd{av0zzJ(wQ`C@=3S7NoGBm`q;rA@
zEPl@bHc18<ZZju4Imjv6JWf^ugDA|1ky?l3pCutdJJqj)m>@&(A5d8dPZ{{z{Qo2V
zX&UAK$S|Zo<V2Uis-YbQ7nr#I3`x*P|41;Te;zBiIVC&|z<Bkaq?u9uA7eBTsQyQS
zM6jB(v2Fo^pa%pBeaI;=Z6es>;1!^LSg<p7L#AH+)_+i(71(%z!+--qmy%*I*m>x1
zn=y+d8lWT!dVzJ?19w{g0v3UlIpA+Kf_?^EEH5hnO2F*DR}^(V-l;woNNyPnry~FQ
z!Tuy6@H5n2Og>}tziKR;LlUg213=egWP|bIA2$*|=YNt=FBJcgU}S`kR33%e^k7u~
z&kAN1%95h!ag4xl4BGeo`x@iLKaG>a^`A5{YW%C?(f|L55LYr+QyIH$yJl8rQ*-V;
z5F6FCyH$4~rtDI;=5})ZqW8K?TYCJln%b*3s@7%9Jiq*uwfsQCl6l7;7q+jgeU$0C
z{59t6gH7wNms=fAJ)WGLm&tc;zT1pnq7%#K>DrEZ-_}xXg*dj+!^B&6c{4hkUrJsT
zzdpU^O2@+H<!obrT*jNU-rV-w5Bc{$Rv-Dctf=utS;KQ)f8lsfa&`WawAM<m-nYWn
z_#`i@aaY-`9aZ&jbg|90tobbux6u##DpHG^PPSs#uGHP>Z4oNsQXZFkC|&cxbDd02
z$Lu?$nXN_X1t-a_SAA8)8c)qYPid0ot8Z~_|KZD7XHKl$|3%+b(x0^5TNIr=XwP;x
z89vSG+B$IYTtlBP`_qi>qG-!t-QGFRb}n#@Jhel8-BGveK38d$PL*y51OkCTAP@)y
V0)apv5D3KI@Ex#|jWGZy005ZBxA6b~

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 6795b2d9e8d5ac0f91c5d842bb20f3ab82b42a0c..3d5b6a2420ffcdf46d8f9de74f056c4d7e47bb9e 100644
GIT binary patch
delta 15
WcmX@abcl&fzMF&Lrt(HM8%6*nDg-eA

delta 15
WcmX@abcl&fzMF$#p3Fuz8%6*lr33E(

diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go
index 70e809580..17254f17e 100644
--- a/pkg/engine/engine.go
+++ b/pkg/engine/engine.go
@@ -7,8 +7,7 @@ import (
 	"text/template"
 
 	"github.com/Masterminds/sprig"
-
-	chartutil "k8s.io/helm/pkg/chart"
+	"k8s.io/helm/pkg/chartutil"
 	"k8s.io/helm/pkg/proto/hapi/chart"
 )
 
@@ -177,7 +176,7 @@ func coalesceValues(c *chart.Chart, v chartutil.Values) chartutil.Values {
 	nv, err := chartutil.ReadValues([]byte(c.Values.Raw))
 	if err != nil {
 		// On error, we return just the overridden values.
-		// FIXME: We should log this error. It indicates that the TOML data
+		// FIXME: We should log this error. It indicates that the YAML data
 		// did not parse.
 		log.Printf("error reading default values: %s", err)
 		return v
@@ -226,7 +225,7 @@ func coalesceTables(dst, src map[string]interface{}) {
 	}
 }
 
-// istable is a special-purpose function to see if the present thing matches the definition of a TOML table.
+// istable is a special-purpose function to see if the present thing matches the definition of a YAML table.
 func istable(v interface{}) bool {
 	_, ok := v.(map[string]interface{})
 	return ok
diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go
index aa9cc4110..2d0b7de6f 100644
--- a/pkg/engine/engine_test.go
+++ b/pkg/engine/engine_test.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 	"testing"
 
-	chartutil "k8s.io/helm/pkg/chart"
+	"k8s.io/helm/pkg/chartutil"
 	"k8s.io/helm/pkg/proto/hapi/chart"
 )
 
@@ -31,13 +31,12 @@ func TestRender(t *testing.T) {
 			{Name: "test1", Data: []byte("{{.outer | title }} {{.inner | title}}")},
 		},
 		Values: &chart.Config{
-			Raw: `outer = "DEFAULT"\ninner= "DEFAULT"\n`,
+			Raw: "outer: DEFAULT\ninner: DEFAULT",
 		},
 	}
 
 	vals := &chart.Config{
-		Raw: `outer = "BAD"
-		inner= "inn"`,
+		Raw: "outer: BAD\ninner: inn",
 	}
 
 	overrides := map[string]interface{}{
@@ -207,18 +206,20 @@ func TestRenderNestedValues(t *testing.T) {
 			{Name: outerpath, Data: []byte(`Gather ye {{.what}} while ye may`)},
 		},
 		Values: &chart.Config{
-			Raw: `what = "stinkweed"
-	[herrick]
-	who = "time"
-	`},
+			Raw: `
+what: stinkweed
+herrick:
+  who: time`,
+		},
 		Dependencies: []*chart.Chart{inner},
 	}
 
 	inject := chart.Config{
 		Raw: `
-		what = "rosebuds"
-		[herrick.deepest]
-		what = "flower"`,
+what: rosebuds
+herrick:
+  deepest:
+    what: flower`,
 	}
 
 	out, err := e.Render(outer, &inject, map[string]interface{}{})
diff --git a/pkg/helm/error.go b/pkg/helm/error.go
index 88dd2cd90..450999246 100644
--- a/pkg/helm/error.go
+++ b/pkg/helm/error.go
@@ -9,7 +9,7 @@ const (
 	ErrMissingTpls = Error("missing chart templates")
 	// ErrMissingChart indicates that the Chart.yaml data is missing.
 	ErrMissingChart = Error("missing chart metadata")
-	// ErrMissingValues indicates that the config values.toml data is missing.
+	// ErrMissingValues indicates that the config values.yaml data is missing.
 	ErrMissingValues = Error("missing chart values")
 )
 
diff --git a/pkg/lint/lint_test.go b/pkg/lint/lint_test.go
index 65f4ace7f..634b10145 100644
--- a/pkg/lint/lint_test.go
+++ b/pkg/lint/lint_test.go
@@ -53,8 +53,8 @@ func TestBadValues(t *testing.T) {
 	if len(m) != 1 {
 		t.Errorf("All didn't fail with expected errors, got %#v", m)
 	}
-	if !strings.Contains(m[0].Text, "Bare keys cannot contain ':'") {
-		t.Errorf("All didn't have the error for invalid key format")
+	if !strings.Contains(m[0].Text, "cannot unmarshal") {
+		t.Errorf("All didn't have the error for invalid key format: %s", m[0].Text)
 	}
 }
 
diff --git a/pkg/lint/message.go b/pkg/lint/message.go
index ba4eee8ff..62bf9cf58 100644
--- a/pkg/lint/message.go
+++ b/pkg/lint/message.go
@@ -8,7 +8,7 @@ type Severity int
 const (
 	// UnknownSev indicates that the severity of the error is unknown, and should not stop processing.
 	UnknownSev = iota
-	// InfoSev indicates information, for example missing values.toml file
+	// InfoSev indicates information, for example missing values.yaml file
 	InfoSev
 	// WarningSev indicates that something does not meet code standards, but will likely function.
 	WarningSev
diff --git a/pkg/lint/testdata/albatross/values.toml b/pkg/lint/testdata/albatross/values.toml
deleted file mode 100644
index 388764d49..000000000
--- a/pkg/lint/testdata/albatross/values.toml
+++ /dev/null
@@ -1 +0,0 @@
-name = "mariner"
diff --git a/pkg/lint/testdata/albatross/values.yaml b/pkg/lint/testdata/albatross/values.yaml
new file mode 100644
index 000000000..74cc6a0dc
--- /dev/null
+++ b/pkg/lint/testdata/albatross/values.yaml
@@ -0,0 +1 @@
+name: "mariner"
diff --git a/pkg/lint/testdata/badchartfile/values.toml b/pkg/lint/testdata/badchartfile/values.toml
deleted file mode 100644
index d6bba222c..000000000
--- a/pkg/lint/testdata/badchartfile/values.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default values for badchartfile.
-# This is a TOML-formatted file. https://github.com/toml-lang/toml
-# Declare name/value pairs to be passed into your templates.
-# name = "value"
diff --git a/pkg/lint/testdata/badchartfile/values.yaml b/pkg/lint/testdata/badchartfile/values.yaml
new file mode 100644
index 000000000..9f367033b
--- /dev/null
+++ b/pkg/lint/testdata/badchartfile/values.yaml
@@ -0,0 +1 @@
+# Default values for badchartfile.
diff --git a/pkg/lint/testdata/badvaluesfile/values.toml b/pkg/lint/testdata/badvaluesfile/values.yaml
similarity index 66%
rename from pkg/lint/testdata/badvaluesfile/values.toml
rename to pkg/lint/testdata/badvaluesfile/values.yaml
index 80488f4f7..b5a10271c 100644
--- a/pkg/lint/testdata/badvaluesfile/values.toml
+++ b/pkg/lint/testdata/badvaluesfile/values.yaml
@@ -1,2 +1,2 @@
-# Invalid value for badvaluesfile for testing lint fails with invalid toml format
-name: "value"
+# Invalid value for badvaluesfile for testing lint fails with invalid yaml format
+name= "value"
diff --git a/pkg/lint/testdata/goodone/values.toml b/pkg/lint/testdata/goodone/values.toml
deleted file mode 100644
index 6c50ac9cc..000000000
--- a/pkg/lint/testdata/goodone/values.toml
+++ /dev/null
@@ -1 +0,0 @@
-name = "goodone here"
diff --git a/pkg/lint/testdata/goodone/values.yaml b/pkg/lint/testdata/goodone/values.yaml
new file mode 100644
index 000000000..fe9abd983
--- /dev/null
+++ b/pkg/lint/testdata/goodone/values.yaml
@@ -0,0 +1 @@
+name: "goodone here"
diff --git a/pkg/lint/values.go b/pkg/lint/values.go
index 1fb4773f3..2549f2937 100644
--- a/pkg/lint/values.go
+++ b/pkg/lint/values.go
@@ -4,18 +4,18 @@ import (
 	"os"
 	"path/filepath"
 
-	"k8s.io/helm/pkg/chart"
+	"k8s.io/helm/pkg/chartutil"
 )
 
-// Values lints a chart's values.toml file.
+// Values lints a chart's values.yaml file.
 func Values(basepath string) (messages []Message) {
-	vf := filepath.Join(basepath, "values.toml")
+	vf := filepath.Join(basepath, "values.yaml")
 	messages = []Message{}
 	if _, err := os.Stat(vf); err != nil {
-		messages = append(messages, Message{Severity: InfoSev, Text: "No values.toml file"})
+		messages = append(messages, Message{Severity: InfoSev, Text: "No values.yaml file"})
 		return
 	}
-	_, err := chart.ReadValuesFile(vf)
+	_, err := chartutil.ReadValuesFile(vf)
 	if err != nil {
 		messages = append(messages, Message{Severity: ErrorSev, Text: err.Error()})
 	}
diff --git a/pkg/proto/hapi/services/tiller.pb.go b/pkg/proto/hapi/services/tiller.pb.go
index dac4868b2..40a18d7f4 100644
--- a/pkg/proto/hapi/services/tiller.pb.go
+++ b/pkg/proto/hapi/services/tiller.pb.go
@@ -238,7 +238,7 @@ func (*UpdateReleaseResponse) Descriptor() ([]byte, []int) { return fileDescript
 type InstallReleaseRequest struct {
 	// Chart is the protobuf representation of a chart.
 	Chart *hapi_chart3.Chart `protobuf:"bytes,1,opt,name=chart" json:"chart,omitempty"`
-	// Values is a string containing (unparsed) TOML values.
+	// Values is a string containing (unparsed) YAML values.
 	Values *hapi_chart.Config `protobuf:"bytes,2,opt,name=values" json:"values,omitempty"`
 	// DryRun, if true, will run through the release logic, but neither create
 	// a release object nor deploy to Kubernetes. The release object returned