From 3df75ec1d908f3c36da1b0e0c2c825eba6ffadac Mon Sep 17 00:00:00 2001
From: Scott Rigby <scott@r6by.com>
Date: Fri, 19 Apr 2019 19:33:05 -0400
Subject: [PATCH 01/27] Improve getting LoadBalancer address in NOTES.txt

See https://github.com/helm/charts/issues/84

Signed-off-by: Scott Rigby <scott@r6by.com>
---
 pkg/chartutil/create.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/chartutil/create.go b/pkg/chartutil/create.go
index 9af4b8f45..736dc31b3 100644
--- a/pkg/chartutil/create.go
+++ b/pkg/chartutil/create.go
@@ -256,7 +256,7 @@ const defaultNotes = `1. Get the application URL by running these commands:
 {{- else if contains "LoadBalancer" .Values.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
            You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "<CHARTNAME>.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "<CHARTNAME>.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "<CHARTNAME>.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
   echo http://$SERVICE_IP:{{ .Values.service.port }}
 {{- else if contains "ClusterIP" .Values.service.type }}
   export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "<CHARTNAME>.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")

From 5b67d6fbd97ca1258e5ae9276c9c88905fc56a2e Mon Sep 17 00:00:00 2001
From: Tine Jozelj <tine.jozelj@tjo.space>
Date: Tue, 16 Jul 2019 14:47:20 +0200
Subject: [PATCH 02/27] feat(helm:create): allow absolute paths

If starter template path is an absolute path, it shouldn't
be prefixed with c.home.Starters() but rather be used as is.

Signed-off-by: Tine Jozelj <tine.jozelj@tjo.space>
---
 cmd/helm/create.go       |  6 ++-
 cmd/helm/create_test.go  | 92 ++++++++++++++++++++++++++++++++++++++++
 docs/helm/helm_create.md |  4 +-
 3 files changed, 99 insertions(+), 3 deletions(-)

diff --git a/cmd/helm/create.go b/cmd/helm/create.go
index 451b4ce86..da91291fd 100644
--- a/cmd/helm/create.go
+++ b/cmd/helm/create.go
@@ -88,7 +88,7 @@ func newCreateCmd(out io.Writer) *cobra.Command {
 		},
 	}
 
-	cmd.Flags().StringVarP(&cc.starter, "starter", "p", "", "The named Helm starter scaffold")
+	cmd.Flags().StringVarP(&cc.starter, "starter", "p", "", "The name or absolute path to Helm starter scaffold")
 	return cmd
 }
 
@@ -106,6 +106,10 @@ func (c *createCmd) run() error {
 	if c.starter != "" {
 		// Create from the starter
 		lstarter := filepath.Join(c.home.Starters(), c.starter)
+		// If path is absolute, we dont want to prefix it with helm starters folder
+		if filepath.IsAbs(c.starter) {
+			lstarter = c.starter
+		}
 		return chartutil.CreateFrom(cfile, filepath.Dir(c.name), lstarter)
 	}
 
diff --git a/cmd/helm/create_test.go b/cmd/helm/create_test.go
index 20bace864..fb118ba58 100644
--- a/cmd/helm/create_test.go
+++ b/cmd/helm/create_test.go
@@ -163,3 +163,95 @@ func TestCreateStarterCmd(t *testing.T) {
 	}
 
 }
+
+func TestCreateStarterAbsoluteCmd(t *testing.T) {
+	cname := "testchart"
+	// Make a temp dir
+	tdir, err := ioutil.TempDir("", "helm-create-")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(tdir)
+
+	thome, err := tempHelmHome(t)
+	if err != nil {
+		t.Fatal(err)
+	}
+	cleanup := resetEnv()
+	defer func() {
+		os.RemoveAll(thome.String())
+		cleanup()
+	}()
+
+	settings.Home = thome
+
+	// Create a starter.
+	starterchart := filepath.Join(tdir, "starters")
+	os.Mkdir(starterchart, 0755)
+	if dest, err := chartutil.Create(&chart.Metadata{Name: "starterchart"}, starterchart); err != nil {
+		t.Fatalf("Could not create chart: %s", err)
+	} else {
+		t.Logf("Created %s", dest)
+	}
+	tplpath := filepath.Join(starterchart, "starterchart", "templates", "foo.tpl")
+	if err := ioutil.WriteFile(tplpath, []byte("test"), 0755); err != nil {
+		t.Fatalf("Could not write template: %s", err)
+	}
+
+	// CD into it
+	pwd, err := os.Getwd()
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := os.Chdir(tdir); err != nil {
+		t.Fatal(err)
+	}
+	defer os.Chdir(pwd)
+
+	// Run a create
+	cmd := newCreateCmd(ioutil.Discard)
+	cmd.ParseFlags([]string{"--starter", filepath.Join(starterchart, "starterchart")})
+	if err := cmd.RunE(cmd, []string{cname}); err != nil {
+		t.Errorf("Failed to run create: %s", err)
+		return
+	}
+
+	// Test that the chart is there
+	if fi, err := os.Stat(cname); err != nil {
+		t.Fatalf("no chart directory: %s", err)
+	} else if !fi.IsDir() {
+		t.Fatalf("chart is not directory")
+	}
+
+	c, err := chartutil.LoadDir(cname)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if c.Metadata.Name != cname {
+		t.Errorf("Expected %q name, got %q", cname, c.Metadata.Name)
+	}
+	if c.Metadata.ApiVersion != chartutil.ApiVersionV1 {
+		t.Errorf("Wrong API version: %q", c.Metadata.ApiVersion)
+	}
+
+	expectedTemplateCount := 8
+	if l := len(c.Templates); l != expectedTemplateCount {
+		t.Errorf("Expected %d templates, got %d", expectedTemplateCount, l)
+	}
+
+	found := false
+	for _, tpl := range c.Templates {
+		if tpl.Name == "templates/foo.tpl" {
+			found = true
+			data := tpl.Data
+			if string(data) != "test" {
+				t.Errorf("Expected template 'test', got %q", string(data))
+			}
+		}
+	}
+	if !found {
+		t.Error("Did not find foo.tpl")
+	}
+
+}
diff --git a/docs/helm/helm_create.md b/docs/helm/helm_create.md
index 0bf526a22..f0c5cd037 100644
--- a/docs/helm/helm_create.md
+++ b/docs/helm/helm_create.md
@@ -44,7 +44,7 @@ helm create NAME [flags]
 
 ```
   -h, --help             help for create
-  -p, --starter string   The named Helm starter scaffold
+  -p, --starter string   The name or absolute path to Helm starter scaffold
 ```
 
 ### Options inherited from parent commands
@@ -63,4 +63,4 @@ helm create NAME [flags]
 
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 5-Jun-2019
+###### Auto generated by spf13/cobra on 7-Jul-2019

From e98534d69414c53c9c7309e1ce9805096dc34b25 Mon Sep 17 00:00:00 2001
From: Matthew Fisher <matt.fisher@microsoft.com>
Date: Mon, 22 Jul 2019 12:44:15 -0700
Subject: [PATCH 03/27] docs(CONTRIBUTING): one LGTM for maintainers

Signed-off-by: Matthew Fisher <matt.fisher@microsoft.com>
---
 CONTRIBUTING.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3965e18db..996f6d224 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -263,6 +263,8 @@ Like any good open source project, we use Pull Requests (PRs) to track code chan
     - PRs should stay open until merged or if they have not been active for more than 30 days.
     This will help keep the PR queue to a manageable size and reduce noise. Should the PR need
     to stay open (like in the case of a WIP), the `keep open` label can be added.
+    - Before merging a PR, refer to the topic on [Size Labels](#size-labels) below to determine if
+      the PR requires more than one LGTM to merge.
     - If the owner of the PR is listed in `OWNERS`, that user **must** merge their own PRs or explicitly
     request another OWNER do that for them.
     - If the owner of a PR is _not_ listed in `OWNERS`, any maintainer may merge the PR once it is approved.
@@ -320,11 +322,15 @@ The following tables define all label types used for Helm. It is split up by cat
 
 Size labels are used to indicate how "dangerous" a PR is. The guidelines below are used to assign the
 labels, but ultimately this can be changed by the maintainers. For example, even if a PR only makes
-30 lines of changes in 1 file, but it changes key functionality, it will likely be labeled as `size/large`
+30 lines of changes in 1 file, but it changes key functionality, it will likely be labeled as `size/L`
 because it requires sign off from multiple people. Conversely, a PR that adds a small feature, but requires
-another 150 lines of tests to cover all cases, could be labeled as `size/small` even though the number
+another 150 lines of tests to cover all cases, could be labeled as `size/S` even though the number
 lines is greater than defined below.
 
+PRs submitted by a core maintainer, regardless of size, only requires approval from one additional
+maintainer. This ensures there are at least two maintainers who are aware of any significant PRs
+introduced to the codebase.
+
 | Label | Description |
 | ----- | ----------- |
 | `size/XS` | Anything less than or equal to 9 lines ignoring generated files. Only small amounts of manual testing may be required. |

From 7247956b96d0f038195af41f1be9b7ce6002c662 Mon Sep 17 00:00:00 2001
From: Pete Hodgson <github@thepete.net>
Date: Tue, 23 Jul 2019 09:48:17 -0700
Subject: [PATCH 04/27] Fix broken link in docs/related.md

Looks like this hackernoon link is now broken, probably from when they moved off of Medium.

Signed-off-by: Pete Hodgson <git@thepete.net>
---
 docs/related.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/related.md b/docs/related.md
index 06527d75d..63919790b 100644
--- a/docs/related.md
+++ b/docs/related.md
@@ -14,7 +14,7 @@ or [pull request](https://github.com/helm/helm/pulls).
 - [GitLab, Consumer Driven Contracts, Helm and Kubernetes](https://medium.com/@enxebre/gitlab-consumer-driven-contracts-helm-and-kubernetes-b7235a60a1cb#.xwp1y4tgi)
 - [Honestbee's Helm Chart Conventions](https://gist.github.com/so0k/f927a4b60003cedd101a0911757c605a)
 - [Releasing backward-incompatible changes: Kubernetes, Jenkins, Prometheus Operator, Helm and Traefik](https://medium.com/@enxebre/releasing-backward-incompatible-changes-kubernetes-jenkins-plugin-prometheus-operator-helm-self-6263ca61a1b1#.e0c7elxhq)
-- [The Missing CI/CD Kubernetes Component: Helm package manager](https://hackernoon.com/the-missing-ci-cd-kubernetes-component-helm-package-manager-1fe002aac680#.691sk2zhu)
+- [The Missing CI/CD Kubernetes Component: Helm package manager](https://medium.com/@gajus/the-missing-ci-cd-kubernetes-component-helm-package-manager-1fe002aac680)
 - [Using Helm to Deploy to Kubernetes](https://daemonza.github.io/2017/02/20/using-helm-to-deploy-to-kubernetes/)
 - [Writing a Helm Chart](https://www.influxdata.com/packaged-kubernetes-deployments-writing-helm-chart/)
 - [A basic walk through Kubernetes Helm](https://github.com/muffin87/helm-tutorial)

From d8b7984d75e958c2e160363af1128ad3bdbc2ba7 Mon Sep 17 00:00:00 2001
From: Bridget Kromhout <bridget@kromhout.org>
Date: Tue, 23 Jul 2019 13:13:55 -0500
Subject: [PATCH 05/27] Fixing link; adding AKS.

Signed-off-by: Bridget Kromhout <bridget@kromhout.org>
---
 docs/install.md            | 2 +-
 docs/kubernetes_distros.md | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/install.md b/docs/install.md
index 3742385f3..759ec1759 100755
--- a/docs/install.md
+++ b/docs/install.md
@@ -123,7 +123,7 @@ configured to talk to a remote Kubernetes cluster.
 
 Most cloud providers enable a feature called Role-Based Access Control - RBAC for short. If your cloud provider enables this feature, you will need to create a service account for Tiller with the right roles and permissions to access resources.
 
-Check the [Kubernetes Distribution Guide](kubernetes_distros.md) to see if there's any further points of interest on using Helm with your cloud provider. Also check out the guide on [Tiller and Role-Based Access Control](rbac.md) for more information on how to run Tiller in an RBAC-enabled Kubernetes cluster.
+Check the [Kubernetes Distribution Guide](kubernetes-distribution-guide) to see if there's any further points of interest on using Helm with your cloud provider. Also check out the guide on [Tiller and Role-Based Access Control](rbac.md) for more information on how to run Tiller in an RBAC-enabled Kubernetes cluster.
 
 ### Easy In-Cluster Installation
 
diff --git a/docs/kubernetes_distros.md b/docs/kubernetes_distros.md
index bb14043da..48a73204c 100644
--- a/docs/kubernetes_distros.md
+++ b/docs/kubernetes_distros.md
@@ -22,6 +22,10 @@ Google's GKE hosted Kubernetes platform enables RBAC by default. You will need t
 
 See [Tiller and role-based access control](https://docs.helm.sh/using_helm/#role-based-access-control) for more information.
 
+## AKS
+
+Helm works with [Azure Kubernetes Service](https://docs.microsoft.com/en-us/azure/aks/kubernetes-helm). If using an RBAC-enabled AKS cluster, you need [a service account and role binding for the Tiller service](https://helm.sh/docs/using_helm/#tiller-namespaces-and-rbac).
+
 ## Ubuntu with 'kubeadm'
 
 Kubernetes bootstrapped with `kubeadm` is known to work on the following Linux

From ce0ad06e941e12e335c5d083c145f830bf7f3083 Mon Sep 17 00:00:00 2001
From: Bridget Kromhout <bridget@kromhout.org>
Date: Tue, 23 Jul 2019 15:47:11 -0500
Subject: [PATCH 06/27] Fixes per helpful feedback

Signed-off-by: Bridget Kromhout <bridget@kromhout.org>
---
 docs/install.md            | 2 +-
 docs/kubernetes_distros.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/install.md b/docs/install.md
index 759ec1759..06a319486 100755
--- a/docs/install.md
+++ b/docs/install.md
@@ -123,7 +123,7 @@ configured to talk to a remote Kubernetes cluster.
 
 Most cloud providers enable a feature called Role-Based Access Control - RBAC for short. If your cloud provider enables this feature, you will need to create a service account for Tiller with the right roles and permissions to access resources.
 
-Check the [Kubernetes Distribution Guide](kubernetes-distribution-guide) to see if there's any further points of interest on using Helm with your cloud provider. Also check out the guide on [Tiller and Role-Based Access Control](rbac.md) for more information on how to run Tiller in an RBAC-enabled Kubernetes cluster.
+Check the [Kubernetes Distribution Guide](#kubernetes-distribution-guide) to see if there's any further points of interest on using Helm with your cloud provider. Also check out the guide on [Tiller and Role-Based Access Control](rbac.md) for more information on how to run Tiller in an RBAC-enabled Kubernetes cluster.
 
 ### Easy In-Cluster Installation
 
diff --git a/docs/kubernetes_distros.md b/docs/kubernetes_distros.md
index 48a73204c..52a5e1acc 100644
--- a/docs/kubernetes_distros.md
+++ b/docs/kubernetes_distros.md
@@ -24,7 +24,7 @@ See [Tiller and role-based access control](https://docs.helm.sh/using_helm/#role
 
 ## AKS
 
-Helm works with [Azure Kubernetes Service](https://docs.microsoft.com/en-us/azure/aks/kubernetes-helm). If using an RBAC-enabled AKS cluster, you need [a service account and role binding for the Tiller service](https://helm.sh/docs/using_helm/#tiller-namespaces-and-rbac).
+Helm works with [Azure Kubernetes Service](https://docs.microsoft.com/en-us/azure/aks/kubernetes-helm). If using an RBAC-enabled AKS cluster, you need [a service account and role binding for the Tiller service](https://docs.microsoft.com/en-us/azure/aks/kubernetes-helm#create-a-service-account).
 
 ## Ubuntu with 'kubeadm'
 

From 276bb9b1c8ee3c51064f768e8c0e2fb64c3fd5f2 Mon Sep 17 00:00:00 2001
From: Tariq Ibrahim <tariq181290@gmail.com>
Date: Wed, 24 Jul 2019 16:22:46 -0700
Subject: [PATCH 07/27] fix golint issues reported by make test

Signed-off-by: Tariq Ibrahim <tariq181290@gmail.com>
---
 pkg/kube/client.go                    | 18 +++++++++++++-----
 pkg/kube/client_test.go               |  2 +-
 pkg/lint/rules/chartfile.go           |  4 ++--
 pkg/tiller/environment/environment.go |  1 +
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkg/kube/client.go b/pkg/kube/client.go
index fcaa28760..8fbfba1fd 100644
--- a/pkg/kube/client.go
+++ b/pkg/kube/client.go
@@ -314,7 +314,14 @@ func (c *Client) Get(namespace string, reader io.Reader) (string, error) {
 	return buf.String(), nil
 }
 
-// Deprecated; use UpdateWithOptions instead
+// Update reads the current configuration and a target configuration from io.reader
+// and creates resources that don't already exist, updates resources that have been modified
+// in the target configuration and deletes resources from the current configuration that are
+// not present in the target configuration.
+//
+// Namespace will set the namespaces.
+//
+// Deprecated: use UpdateWithOptions instead.
 func (c *Client) Update(namespace string, originalReader, targetReader io.Reader, force bool, recreate bool, timeout int64, shouldWait bool) error {
 	return c.UpdateWithOptions(namespace, originalReader, targetReader, UpdateOptions{
 		Force:      force,
@@ -334,12 +341,13 @@ type UpdateOptions struct {
 	CleanupOnFail bool
 }
 
-// UpdateWithOptions reads in the current configuration and a target configuration from io.reader
-// and creates resources that don't already exists, updates resources that have been modified
+// UpdateWithOptions reads the current configuration and a target configuration from io.reader
+// and creates resources that don't already exist, updates resources that have been modified
 // in the target configuration and deletes resources from the current configuration that are
 // not present in the target configuration.
 //
-// Namespace will set the namespaces.
+// Namespace will set the namespaces. UpdateOptions provides additional parameters to control
+// update behavior.
 func (c *Client) UpdateWithOptions(namespace string, originalReader, targetReader io.Reader, opts UpdateOptions) error {
 	original, err := c.BuildUnstructured(namespace, originalReader)
 	if err != nil {
@@ -552,7 +560,7 @@ func (c *Client) WatchUntilReady(namespace string, reader io.Reader, timeout int
 	return perform(infos, c.watchTimeout(time.Duration(timeout)*time.Second))
 }
 
-// WatchUntilCRDEstablished polls the given CRD until it reaches the established
+// WaitUntilCRDEstablished polls the given CRD until it reaches the established
 // state. A CRD needs to reach the established state before CRs can be created.
 //
 // If a naming conflict condition is found, this function will return an error.
diff --git a/pkg/kube/client_test.go b/pkg/kube/client_test.go
index 6faea02d0..d33b4b9d9 100644
--- a/pkg/kube/client_test.go
+++ b/pkg/kube/client_test.go
@@ -558,7 +558,7 @@ func TestWaitUntilCRDEstablished(t *testing.T) {
 					} else {
 						crd = crdWithConditions
 					}
-					requestCount += 1
+					requestCount++
 					return newResponse(200, &crd)
 				}),
 			}
diff --git a/pkg/lint/rules/chartfile.go b/pkg/lint/rules/chartfile.go
index 8ef33d0c5..8f6c16d94 100644
--- a/pkg/lint/rules/chartfile.go
+++ b/pkg/lint/rules/chartfile.go
@@ -51,7 +51,7 @@ func Chartfile(linter *support.Linter) {
 	linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartNameDirMatch(linter.ChartDir, chartFile))
 
 	// Chart metadata
-	linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartApiVersion(chartFile))
+	linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartAPIVersion(chartFile))
 	linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartVersion(chartFile))
 	linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartEngine(chartFile))
 	linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartMaintainer(chartFile))
@@ -97,7 +97,7 @@ func validateChartNameDirMatch(chartDir string, cf *chart.Metadata) error {
 	return nil
 }
 
-func validateChartApiVersion(cf *chart.Metadata) error {
+func validateChartAPIVersion(cf *chart.Metadata) error {
 	if cf.ApiVersion == "" {
 		return errors.New("apiVersion is required")
 	}
diff --git a/pkg/tiller/environment/environment.go b/pkg/tiller/environment/environment.go
index d84ad55db..83ec5e647 100644
--- a/pkg/tiller/environment/environment.go
+++ b/pkg/tiller/environment/environment.go
@@ -255,6 +255,7 @@ func (p *PrintingKubeClient) WaitAndGetCompletedPodPhase(namespace string, reade
 	return v1.PodUnknown, err
 }
 
+// WaitUntilCRDEstablished implements KubeClient WaitUntilCRDEstablished.
 func (p *PrintingKubeClient) WaitUntilCRDEstablished(reader io.Reader, timeout time.Duration) error {
 	_, err := io.Copy(p.Out, reader)
 	return err

From c086f78583f1996939b73ab8dfdb6f24f0cb1488 Mon Sep 17 00:00:00 2001
From: ethan <guangming.wang@daocloud.io>
Date: Thu, 25 Jul 2019 22:36:25 +0800
Subject: [PATCH 08/27] cleanup: error message typos in sql.go

Signed-off-by: ethan <guangming.wang@daocloud.io>
---
 pkg/storage/driver/sql.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/storage/driver/sql.go b/pkg/storage/driver/sql.go
index 46bcccc32..be2962da4 100644
--- a/pkg/storage/driver/sql.go
+++ b/pkg/storage/driver/sql.go
@@ -199,7 +199,7 @@ func (s *SQL) Query(labels map[string]string) ([]*rspb.Release, error) {
 			sqlFilter[dbField] = val
 		} else {
 			s.Log("unknown label %s", key)
-			return nil, fmt.Errorf("unknow label %s", key)
+			return nil, fmt.Errorf("unknown label %s", key)
 		}
 	}
 	sort.Strings(sqlFilterKeys)

From ae52477fbd1c9fd177a638a7954332772463b77f Mon Sep 17 00:00:00 2001
From: Yusuke Kuoka <ykuoka@gmail.com>
Date: Fri, 26 Jul 2019 23:08:01 +0900
Subject: [PATCH 09/27] fix: upgrade with CRD changes

Probably since K8s 1.13.x, `converter.ConvertToVersion(info.Object, groupVersioner)` which is the body of `asVersioned` doesn't return an error or an "unstructured" object, but `apiextensions/v1beta1.CustomResourceDefinition`.

The result was `helm upgrade` with any changes in CRD consistently failing.

This fixes that by adding an additional case of the conversion result being `v1beta1.CustomResourceDefinition`.

This is a backward-compatible change as it doesn't remove existing switch cases for older K8s versions.

Fixes #5853

Signed-off-by: Yusuke Kuoka <ykuoka@gmail.com>
---
 pkg/kube/client.go | 35 +++++++++++++++++++++++++----------
 pkg/kube/wait.go   |  2 +-
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/pkg/kube/client.go b/pkg/kube/client.go
index 8fbfba1fd..e61d526a7 100644
--- a/pkg/kube/client.go
+++ b/pkg/kube/client.go
@@ -656,7 +656,7 @@ func createPatch(target *resource.Info, current runtime.Object) ([]byte, types.P
 	}
 
 	// Get a versioned object
-	versionedObject := asVersioned(target)
+	versionedObject, err := asVersioned(target)
 
 	// Unstructured objects, such as CRDs, may not have an not registered error
 	// returned from ConvertToVersion. Anything that's unstructured should
@@ -664,16 +664,25 @@ func createPatch(target *resource.Info, current runtime.Object) ([]byte, types.P
 	// on objects like CRDs.
 	_, isUnstructured := versionedObject.(runtime.Unstructured)
 
+	// On newer K8s versions, CRDs aren't unstructured but has this dedicated type
+	_, isCRD := versionedObject.(*apiextv1beta1.CustomResourceDefinition)
+
 	switch {
-	case runtime.IsNotRegisteredError(err), isUnstructured:
+	case runtime.IsNotRegisteredError(err), isUnstructured, isCRD:
 		// fall back to generic JSON merge patch
 		patch, err := jsonpatch.CreateMergePatch(oldData, newData)
-		return patch, types.MergePatchType, err
+		if err != nil {
+			return nil, types.MergePatchType, fmt.Errorf("failed to create merge patch: %v", err)
+		}
+		return patch, types.MergePatchType, nil
 	case err != nil:
 		return nil, types.StrategicMergePatchType, fmt.Errorf("failed to get versionedObject: %s", err)
 	default:
 		patch, err := strategicpatch.CreateTwoWayMergePatch(oldData, newData, versionedObject)
-		return patch, types.StrategicMergePatchType, err
+		if err != nil {
+			return nil, types.StrategicMergePatchType, fmt.Errorf("failed to create two-way merge patch: %v", err)
+		}
+		return patch, types.StrategicMergePatchType, nil
 	}
 }
 
@@ -728,7 +737,7 @@ func updateResource(c *Client, target *resource.Info, currentObj runtime.Object,
 		return nil
 	}
 
-	versioned := asVersioned(target)
+	versioned := asVersionedOrUnstructured(target)
 	selector, ok := getSelectorFromObject(versioned)
 	if !ok {
 		return nil
@@ -944,7 +953,7 @@ func (c *Client) getSelectRelationPod(info *resource.Info, objPods map[string][]
 
 	c.Log("get relation pod of object: %s/%s/%s", info.Namespace, info.Mapping.GroupVersionKind.Kind, info.Name)
 
-	versioned := asVersioned(info)
+	versioned := asVersionedOrUnstructured(info)
 	selector, ok := getSelectorFromObject(versioned)
 	if !ok {
 		return objPods, nil
@@ -977,17 +986,23 @@ func isFoundPod(podItem []v1.Pod, pod v1.Pod) bool {
 	return false
 }
 
-func asVersioned(info *resource.Info) runtime.Object {
+func asVersionedOrUnstructured(info *resource.Info) runtime.Object {
+	obj, _ := asVersioned(info)
+	return obj
+}
+
+func asVersioned(info *resource.Info) (runtime.Object, error) {
 	converter := runtime.ObjectConvertor(scheme.Scheme)
 	groupVersioner := runtime.GroupVersioner(schema.GroupVersions(scheme.Scheme.PrioritizedVersionsAllGroups()))
 	if info.Mapping != nil {
 		groupVersioner = info.Mapping.GroupVersionKind.GroupVersion()
 	}
 
-	if obj, err := converter.ConvertToVersion(info.Object, groupVersioner); err == nil {
-		return obj
+	obj, err := converter.ConvertToVersion(info.Object, groupVersioner)
+	if err != nil {
+		return info.Object, err
 	}
-	return info.Object
+	return obj, nil
 }
 
 func asInternal(info *resource.Info) (runtime.Object, error) {
diff --git a/pkg/kube/wait.go b/pkg/kube/wait.go
index 105d79b93..51fa6a6df 100644
--- a/pkg/kube/wait.go
+++ b/pkg/kube/wait.go
@@ -53,7 +53,7 @@ func (c *Client) waitForResources(timeout time.Duration, created Result) error {
 		pvc := []v1.PersistentVolumeClaim{}
 		deployments := []deployment{}
 		for _, v := range created {
-			switch value := asVersioned(v).(type) {
+			switch value := asVersionedOrUnstructured(v).(type) {
 			case *v1.ReplicationController:
 				list, err := getPods(kcs, value.Namespace, value.Spec.Selector)
 				if err != nil {

From 88fc1f03c39631bc4c3f1bbbcb54b8fb284134b1 Mon Sep 17 00:00:00 2001
From: Matt Farina <matt@mattfarina.com>
Date: Fri, 26 Jul 2019 10:32:44 -0400
Subject: [PATCH 10/27] Adding a KEYS file with public pgp signing keys for
 Helm releases

This file contains the keys and instructions for adding KEYS and
importing them. It follows the model Apache uses for a file like
this.

Signed-off-by: Matt Farina <matt@mattfarina.com>
---
 KEYS | 152 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 152 insertions(+)
 create mode 100644 KEYS

diff --git a/KEYS b/KEYS
new file mode 100644
index 000000000..bd0b7e3b1
--- /dev/null
+++ b/KEYS
@@ -0,0 +1,152 @@
+This file contains the PGP keys of developers who have signed releases of Helm.
+
+For your convenience, commands are provided for those who use pgp and gpg.
+
+For users to import keys:
+       pgp < KEYS
+       or
+       gpg --import KEYS
+
+Developers to add their keys: 
+        pgp -kxa <your name> and append it to this file.
+        or
+        (pgpk -ll <your name> && pgpk -xa <your name>) >> KEYS
+        or
+        (gpg --list-sigs <your name>
+             && gpg --armor --export <your name>) >> KEYS
+
+pub   rsa4096/0x461449C25E36B98E 2017-11-10 [SC]
+      672C657BE06B4B30969C4A57461449C25E36B98E
+uid                   [ultimate] Matthew Farina <matt@mattfarina.com>
+sig 3        0x461449C25E36B98E 2017-11-10  Matthew Farina <matt@mattfarina.com>
+sig          0x2CDBBFBB37AE822A 2018-12-12  Adnan Abdulhussein <prydonius@gmail.com>
+sig          0x1EF612347F8A9958 2018-12-12  Adam Reese <adam@reese.io>
+sig          0x62F49E747D911B60 2018-12-12  Matt Butcher <matt.butcher@microsoft.com>
+sub   rsa4096/0xCCCE67689DF05738 2017-11-10 [E]
+sig          0x461449C25E36B98E 2017-11-10  Matthew Farina <matt@mattfarina.com>
+sub   rsa4096/0x9436E80BFBA46909 2017-11-10 [S] [expires: 2022-11-09]
+sig          0x461449C25E36B98E 2017-11-10  Matthew Farina <matt@mattfarina.com>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
++YMbPW0/IQ==
+=g11H
+-----END PGP PUBLIC KEY BLOCK-----
+

From 50386b29170810da639f09c42fbe9cffc70aacf4 Mon Sep 17 00:00:00 2001
From: Matt Farina <matt@mattfarina.com>
Date: Fri, 26 Jul 2019 11:02:15 -0400
Subject: [PATCH 11/27] Adding release docs for the KEYS file and keyservers

Signed-off-by: Matt Farina <matt@mattfarina.com>
---
 docs/release_checklist.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/release_checklist.md b/docs/release_checklist.md
index 7474a01a6..0d877fc66 100644
--- a/docs/release_checklist.md
+++ b/docs/release_checklist.md
@@ -86,6 +86,11 @@ If you do not have GPG already setup you can follow these steps:
 3. [Add key to GitHub account](https://help.github.com/en/articles/adding-a-new-gpg-key-to-your-github-account)
 4. [Set signing key in Git](https://help.github.com/en/articles/telling-git-about-your-signing-key)
 
+Once you have a signing key you need to add it to the KEYS file at the root of
+the repository. The instructions for adding it to the KEYS file are in the file.
+If you have not done so already, you need to add your public key to the keyserver
+network. If you use GnuPG you can follow the [instructions provided by Debian](https://debian-administration.org/article/451/Submitting_your_GPG_key_to_a_keyserver).
+
 ## 1. Create the Release Branch
 
 ### Major/Minor Releases

From 9e33f84a6f7c4483b88a916b44029c38a9bc5f42 Mon Sep 17 00:00:00 2001
From: Martin Hickey <martin.hickey@ie.ibm.com>
Date: Mon, 29 Jul 2019 15:32:43 +0100
Subject: [PATCH 12/27] Add public signing key

Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com>
---
 KEYS | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/KEYS b/KEYS
index bd0b7e3b1..3a34a468b 100644
--- a/KEYS
+++ b/KEYS
@@ -150,3 +150,62 @@ qdCDQHoUOgtZ4v6+QaxI3WV1KPBsPb7SAjuphubIQVK/6qHse9OoWVwWAABXHFqX
 =g11H
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub   rsa4096 2019-05-15 [SC]
+      F1261BDE929012C8FF2E501D6EA5D7598529A53E
+uid           [ultimate] Martin Hickey <martin.hickey@ie.ibm.com>
+sig 3        6EA5D7598529A53E 2019-05-15  Martin Hickey <martin.hickey@ie.ibm.com>
+sub   rsa4096 2019-05-15 [E]
+sig          6EA5D7598529A53E 2019-05-15  Martin Hickey <martin.hickey@ie.ibm.com>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+1qneNQ==
+=oCPv
+-----END PGP PUBLIC KEY BLOCK-----

From 5af2c31822aea4b717a804e3a9ec2bf376cea515 Mon Sep 17 00:00:00 2001
From: Dominic Joseph <dtpjoseph@gmail.com>
Date: Mon, 29 Jul 2019 15:32:39 -0700
Subject: [PATCH 13/27] Update example to set selector labels

Signed-off-by: Dominic Joseph <dtpjoseph@gmail.com>
---
 docs/examples/nginx/templates/deployment.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/examples/nginx/templates/deployment.yaml b/docs/examples/nginx/templates/deployment.yaml
index 139d780cd..59b94a8aa 100644
--- a/docs/examples/nginx/templates/deployment.yaml
+++ b/docs/examples/nginx/templates/deployment.yaml
@@ -19,6 +19,10 @@ metadata:
     app.kubernetes.io/name: {{ template "nginx.name" . }}
 spec:
   replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ template "nginx.name" . }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
   template:
     metadata:
       {{- if .Values.podAnnotations }}

From 6485fec30979357284ae989f29f223bf08b7034f Mon Sep 17 00:00:00 2001
From: AllenZMC <zhongming.chang@daocloud.io>
Date: Tue, 30 Jul 2019 21:11:04 +0800
Subject: [PATCH 14/27] fix word `constrint` to `constraint`

Signed-off-by: czm <zhongming.chang@daocloud.io>
---
 pkg/plugin/installer/vcs_installer.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/plugin/installer/vcs_installer.go b/pkg/plugin/installer/vcs_installer.go
index 4b502dae4..9ec61ccfe 100644
--- a/pkg/plugin/installer/vcs_installer.go
+++ b/pkg/plugin/installer/vcs_installer.go
@@ -136,7 +136,7 @@ func (i *VCSInstaller) solveVersion(repo vcs.Repo) (string, error) {
 	sort.Sort(sort.Reverse(semver.Collection(semvers)))
 	for _, v := range semvers {
 		if constraint.Check(v) {
-			// If the constrint passes get the original reference
+			// If the constraint passes get the original reference
 			ver := v.Original()
 			debug("setting to %s", ver)
 			return ver, nil

From d600c927240b1ffd25164957b886f141acf5361e Mon Sep 17 00:00:00 2001
From: dinesh reddy <dinesh.reddy@bestbuy.com>
Date: Wed, 31 Jul 2019 09:04:47 -0500
Subject: [PATCH 15/27] Clean code: delete commented code

Signed-off-by: dinesh reddy <dinesh.reddy@bestbuy.com>
---
 pkg/lint/rules/template.go | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkg/lint/rules/template.go b/pkg/lint/rules/template.go
index 69b9c397f..26c548bac 100644
--- a/pkg/lint/rules/template.go
+++ b/pkg/lint/rules/template.go
@@ -106,13 +106,6 @@ func Templates(linter *support.Linter, values []byte, namespace string, strict b
 			continue
 		}
 
-		// NOTE: disabled for now, Refs https://github.com/kubernetes/helm/issues/1463
-		// Check that all the templates have a matching value
-		//linter.RunLinterRule(support.WarningSev, path, validateNoMissingValues(templatesPath, valuesToRender, preExecutedTemplate))
-
-		// NOTE: disabled for now, Refs https://github.com/kubernetes/helm/issues/1037
-		// linter.RunLinterRule(support.WarningSev, path, validateQuotes(string(preExecutedTemplate)))
-
 		renderedContent := renderedContentMap[filepath.Join(chart.GetMetadata().Name, fileName)]
 		var yamlStruct K8sYamlStruct
 		// Even though K8sYamlStruct only defines Metadata namespace, an error in any other

From 6105acd3a89d62dd740672f41de4fe715dc67aa2 Mon Sep 17 00:00:00 2001
From: Matt Farina <matt@mattfarina.com>
Date: Wed, 31 Jul 2019 16:27:17 -0400
Subject: [PATCH 16/27] Uploading KEYS file to azure along with dist files

Signed-off-by: Matt Farina <matt@mattfarina.com>
---
 .circleci/deploy.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.circleci/deploy.sh b/.circleci/deploy.sh
index fe95a5634..bdaef92ca 100755
--- a/.circleci/deploy.sh
+++ b/.circleci/deploy.sh
@@ -75,3 +75,6 @@ ${HOME}/google-cloud-sdk/bin/gsutil cp ./_dist/* "gs://${PROJECT_NAME}"
 
 echo "Pushing binaries to Azure"
 az storage blob upload-batch -s _dist/ -d "$AZURE_STORAGE_CONTAINER_NAME" --pattern 'helm-*' --connection-string "$AZURE_STORAGE_CONNECTION_STRING"
+
+echo "Pushing KEYS file to Azure"
+az storage blob upload -f "KEYS" -n "KEYS" -c "$AZURE_STORAGE_CONTAINER_NAME" --connection-string "$AZURE_STORAGE_CONNECTION_STRING"
\ No newline at end of file

From b788e3dce965e76368f8af66b93c6a21abf730a3 Mon Sep 17 00:00:00 2001
From: AllenZMC <zhongming.chang@daocloud.io>
Date: Thu, 1 Aug 2019 21:55:54 +0800
Subject: [PATCH 17/27] fix word 'potgres' to 'postgres'

Signed-off-by: czm <zhongming.chang@daocloud.io>
---
 pkg/storage/driver/sql.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/storage/driver/sql.go b/pkg/storage/driver/sql.go
index be2962da4..e1677c9ed 100644
--- a/pkg/storage/driver/sql.go
+++ b/pkg/storage/driver/sql.go
@@ -25,7 +25,7 @@ import (
 	"github.com/jmoiron/sqlx"
 	migrate "github.com/rubenv/sql-migrate"
 
-	// Import pq for potgres dialect
+	// Import pq for postgres dialect
 	_ "github.com/lib/pq"
 
 	rspb "k8s.io/helm/pkg/proto/hapi/release"

From b80fbeef630c5341e7ac6e5892e7eed30a22d443 Mon Sep 17 00:00:00 2001
From: Matthew Fisher <matt.fisher@microsoft.com>
Date: Thu, 1 Aug 2019 09:04:25 -0700
Subject: [PATCH 18/27] feat(KEYS): add bacongobbler's keys

Signed-off-by: Matthew Fisher <matt.fisher@microsoft.com>
---
 KEYS | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/KEYS b/KEYS
index 3a34a468b..e01cfdb9d 100644
--- a/KEYS
+++ b/KEYS
@@ -209,3 +209,63 @@ m3MUub704EDCTSqz9LJc+4/NbA2esZj7mExCtsMEqaoHW7BU4ws6BRHTyeHgi+Le
 1qneNQ==
 =oCPv
 -----END PGP PUBLIC KEY BLOCK-----
+
+pub   rsa4096 2018-03-14 [SC]
+      967F8AC5E2216F9F4FD270AD92AA783CBAAE8E3B
+uid           [ultimate] Matthew Fisher <matt.fisher@microsoft.com>
+sig 3        92AA783CBAAE8E3B 2018-03-14  Matthew Fisher <matt.fisher@microsoft.com>
+sub   rsa4096 2018-03-14 [E]
+sig          92AA783CBAAE8E3B 2018-03-14  Matthew Fisher <matt.fisher@microsoft.com>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+Qknjx8fW
+=jz9T
+-----END PGP PUBLIC KEY BLOCK-----

From 4117b38ae621a8061563417c4b125dfb8ff59b00 Mon Sep 17 00:00:00 2001
From: dzzg <zhengguang.zhu@daocloud.io>
Date: Fri, 2 Aug 2019 10:04:59 +0800
Subject: [PATCH 19/27] cleanup: log message typo fix

Signed-off-by: dzzg <zhengguang.zhu@daocloud.io>
---
 cmd/helm/reset.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/helm/reset.go b/cmd/helm/reset.go
index cbe1795db..9e7a14710 100644
--- a/cmd/helm/reset.go
+++ b/cmd/helm/reset.go
@@ -115,7 +115,7 @@ func (d *resetCmd) run() error {
 	}
 
 	if err := installer.Uninstall(d.kubeClient, &installer.Options{Namespace: d.namespace}); err != nil {
-		return fmt.Errorf("error unstalling Tiller: %s", err)
+		return fmt.Errorf("error uninstalling Tiller: %s", err)
 	}
 
 	if d.removeHelmHome {

From f653192882b488afd34422c9168e3d492f7df09f Mon Sep 17 00:00:00 2001
From: Kevin Lau <kelau1993@gmail.com>
Date: Fri, 2 Aug 2019 01:08:58 -0700
Subject: [PATCH 20/27] Fix typo notes -> note

Signed-off-by: Kevin Lau <kelau1993@gmail.com>
---
 docs/charts.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/charts.md b/docs/charts.md
index ed2e2f9eb..62b77647d 100644
--- a/docs/charts.md
+++ b/docs/charts.md
@@ -302,7 +302,7 @@ In the above example all charts with the tag `front-end` would be disabled but s
 `front-end` tag and `subchart1` will be enabled.
 
 Since `subchart2` is tagged with `back-end` and that tag evaluates to `true`, `subchart2` will be
-enabled. Also notes that although `subchart2` has a condition specified in `requirements.yaml`, there
+enabled. Also note that although `subchart2` has a condition specified in `requirements.yaml`, there
 is no corresponding path and value in the parent's values so that condition has no effect.
 
 ##### Using the CLI with Tags and Conditions

From 6b5ab08a61d73980ca6f84ccdb3f6b996d950cae Mon Sep 17 00:00:00 2001
From: AllenZMC <zhongming.chang@daocloud.io>
Date: Fri, 2 Aug 2019 22:54:00 +0800
Subject: [PATCH 21/27] fix word 'efault' to 'default'

Signed-off-by: czm <zhongming.chang@daocloud.io>
---
 pkg/getter/httpgetter.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/getter/httpgetter.go b/pkg/getter/httpgetter.go
index 66ea82863..bf99b1cfa 100644
--- a/pkg/getter/httpgetter.go
+++ b/pkg/getter/httpgetter.go
@@ -26,7 +26,7 @@ import (
 	"k8s.io/helm/pkg/version"
 )
 
-//HttpGetter is the efault HTTP(/S) backend handler
+//HttpGetter is the default HTTP(/S) backend handler
 // TODO: change the name to HTTPGetter in Helm 3
 type HttpGetter struct { //nolint
 	client   *http.Client

From bb69a1edd68cffe6aec4be8bfaa47f38135e8af8 Mon Sep 17 00:00:00 2001
From: Kevin Lau <kelau1993@gmail.com>
Date: Fri, 2 Aug 2019 09:22:15 -0700
Subject: [PATCH 22/27] Clarify operator docs wording

The original is explaining the negation, when the body would not be
included. Which would happen in the complement of the if expression,
ie. flipped by De Morgan's law's:

```
not (or .Values.anUnsetVariable (not .Values.aSetVariable))
==
and (not .Values.anUnsetVariable) .Values.aSetVariable
```

> unset variables evaluate to false

is equivalent to `not .Values.anUnsetVariable`.

> and

is equivalent to `and`.

> .Values.setVariable was negated with the not function

doesn't seem to match `.Values.aSetVariable`.
To me, that would be `not .Values.aSetVariable` instead.

Anyway, explaining the `if` expression as-is and not the negation is
clearer and parallels the first `if` operator.

Signed-off-by: Kevin Lau <kelau1993@gmail.com>
---
 docs/chart_template_guide/functions_and_pipelines.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/chart_template_guide/functions_and_pipelines.md b/docs/chart_template_guide/functions_and_pipelines.md
index 1c099887d..bbce53e71 100644
--- a/docs/chart_template_guide/functions_and_pipelines.md
+++ b/docs/chart_template_guide/functions_and_pipelines.md
@@ -159,7 +159,7 @@ Operators are implemented as functions that return a boolean value. To use `eq`,
 {{ end }}
 
 
-{{/* do not include the body of this if statement because unset variables evaluate to false and .Values.setVariable was negated with the not function. */}}
+{{/* include the body of this if statement when the variable .Values.anUnsetVariable is set or .values.aSetVariable is not set */}}
 {{ if or .Values.anUnsetVariable (not .Values.aSetVariable) }}
    {{ ... }}
 {{ end }}

From 915d69a2c6a0026599f28c4857edff1c1f45bab9 Mon Sep 17 00:00:00 2001
From: AllenZMC <zhongming.chang@daocloud.io>
Date: Sat, 3 Aug 2019 22:02:11 +0800
Subject: [PATCH 23/27] fix word 'resoures' to 'resources

Signed-off-by: czm <zhongming.chang@daocloud.io>
---
 pkg/tiller/environment/environment.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/tiller/environment/environment.go b/pkg/tiller/environment/environment.go
index 83ec5e647..d3a478ea0 100644
--- a/pkg/tiller/environment/environment.go
+++ b/pkg/tiller/environment/environment.go
@@ -160,7 +160,7 @@ type KubeClient interface {
 
 	// BuildUnstructured reads a stream of manifests from a reader and turns them into
 	// info objects. Manifests are not validated against the schema, but it will fail if
-	// any resoures types are not known by the apiserver.
+	// any resources types are not known by the apiserver.
 	//
 	// reader must contain a YAML stream (one or more YAML documents separated by "\n---\n").
 	BuildUnstructured(namespace string, reader io.Reader) (kube.Result, error)

From 53f1ab50e5ec38a33e7329c79a2ad61e747c4e18 Mon Sep 17 00:00:00 2001
From: AllenZMC <zhongming.chang@daocloud.io>
Date: Tue, 6 Aug 2019 10:14:00 +0800
Subject: [PATCH 24/27] fix wrong spells in hooks.go

Signed-off-by: czm <zhongming.chang@daocloud.io>
---
 pkg/tiller/hooks.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/tiller/hooks.go b/pkg/tiller/hooks.go
index 5aa961080..0eae3c475 100644
--- a/pkg/tiller/hooks.go
+++ b/pkg/tiller/hooks.go
@@ -53,7 +53,7 @@ var deletePolices = map[string]release.Hook_DeletePolicy{
 	hooks.BeforeHookCreation: release.Hook_BEFORE_HOOK_CREATION,
 }
 
-// Timout used when deleting resources with a hook-delete-policy.
+// Timeout used when deleting resources with a hook-delete-policy.
 const defaultHookDeleteTimeoutInSeconds = int64(60)
 
 // Manifest represents a manifest file, which has a name and some content.

From 7b0a407ff7247aa41ad8efc6c4c1e0bd2cc2a046 Mon Sep 17 00:00:00 2001
From: AllenZMC <zhongming.chang@daocloud.io>
Date: Wed, 7 Aug 2019 20:51:31 +0800
Subject: [PATCH 25/27] fix mis-spelling in  manager.go

Signed-off-by: czm <zhongming.chang@daocloud.io>
---
 pkg/downloader/manager.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/downloader/manager.go b/pkg/downloader/manager.go
index 970bd9546..dfaa56bf3 100644
--- a/pkg/downloader/manager.go
+++ b/pkg/downloader/manager.go
@@ -357,7 +357,7 @@ func (m *Manager) hasAllRepos(deps []*chartutil.Dependency) error {
 	return nil
 }
 
-// getRepoNames returns the repo names of the referenced deps which can be used to fetch the cahced index file.
+// getRepoNames returns the repo names of the referenced deps which can be used to fetch the cached index file.
 func (m *Manager) getRepoNames(deps []*chartutil.Dependency) (map[string]string, error) {
 	rf, err := repo.LoadRepositoriesFile(m.HelmHome.RepositoryFile())
 	if err != nil {

From e9ea2e0d1524b7de68feb3efb7a763d92a360f91 Mon Sep 17 00:00:00 2001
From: AllenZMC <zhongming.chang@daocloud.io>
Date: Fri, 9 Aug 2019 21:27:33 +0800
Subject: [PATCH 26/27] fix some log typos in tlsutil_test.go

Signed-off-by: czm <zhongming.chang@daocloud.io>
---
 pkg/tlsutil/tlsutil_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/tlsutil/tlsutil_test.go b/pkg/tlsutil/tlsutil_test.go
index a4b3c9c22..e4df1e7e7 100644
--- a/pkg/tlsutil/tlsutil_test.go
+++ b/pkg/tlsutil/tlsutil_test.go
@@ -47,7 +47,7 @@ func TestClientConfig(t *testing.T) {
 		t.Fatalf("expecting 1 client certificates, got %d", got)
 	}
 	if cfg.InsecureSkipVerify {
-		t.Fatalf("insecure skip verify mistmatch, expecting false")
+		t.Fatalf("insecure skip verify mismatch, expecting false")
 	}
 	if cfg.RootCAs == nil {
 		t.Fatalf("mismatch tls RootCAs, expecting non-nil")

From dd4afa6af0d6b4994243e8bc401f5c5b9c6cd8c1 Mon Sep 17 00:00:00 2001
From: Martin Hickey <martin.hickey@ie.ibm.com>
Date: Sat, 10 Aug 2019 11:55:26 +0100
Subject: [PATCH 27/27] Fail to load charts that are not v1 apiVersion (#6180)

Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com>
---
 pkg/chartutil/load.go                         |   4 ++++
 pkg/chartutil/load_test.go                    |  12 +++++++++++
 .../testdata/frobnitz.v2/.helmignore          |   1 +
 pkg/chartutil/testdata/frobnitz.v2/Chart.yaml |  20 ++++++++++++++++++
 .../testdata/frobnitz.v2/INSTALL.txt          |   1 +
 pkg/chartutil/testdata/frobnitz.v2/LICENSE    |   1 +
 pkg/chartutil/testdata/frobnitz.v2/README.md  |  11 ++++++++++
 .../testdata/frobnitz.v2/charts/_ignore_me    |   1 +
 .../frobnitz.v2/charts/alpine/Chart.yaml      |   4 ++++
 .../frobnitz.v2/charts/alpine/README.md       |   9 ++++++++
 .../charts/alpine/charts/mast1/Chart.yaml     |   4 ++++
 .../charts/alpine/charts/mast1/values.yaml    |   4 ++++
 .../charts/alpine/charts/mast2-0.1.0.tgz      | Bin 0 -> 325 bytes
 .../charts/alpine/templates/alpine-pod.yaml   |  16 ++++++++++++++
 .../frobnitz.v2/charts/alpine/values.yaml     |   2 ++
 .../frobnitz.v2/charts/mariner-4.3.2.tgz      | Bin 0 -> 1012 bytes
 .../testdata/frobnitz.v2/docs/README.md       |   1 +
 pkg/chartutil/testdata/frobnitz.v2/icon.svg   |   8 +++++++
 .../testdata/frobnitz.v2/ignore/me.txt        |   0
 .../testdata/frobnitz.v2/requirements.lock    |   8 +++++++
 .../testdata/frobnitz.v2/requirements.yaml    |   7 ++++++
 .../frobnitz.v2/templates/template.tpl        |   1 +
 .../testdata/frobnitz.v2/values.yaml          |   6 ++++++
 23 files changed, 121 insertions(+)
 create mode 100644 pkg/chartutil/testdata/frobnitz.v2/.helmignore
 create mode 100644 pkg/chartutil/testdata/frobnitz.v2/Chart.yaml
 create mode 100644 pkg/chartutil/testdata/frobnitz.v2/INSTALL.txt
 create mode 100644 pkg/chartutil/testdata/frobnitz.v2/LICENSE
 create mode 100644 pkg/chartutil/testdata/frobnitz.v2/README.md
 create mode 100644 pkg/chartutil/testdata/frobnitz.v2/charts/_ignore_me
 create mode 100644 pkg/chartutil/testdata/frobnitz.v2/charts/alpine/Chart.yaml
 create mode 100644 pkg/chartutil/testdata/frobnitz.v2/charts/alpine/README.md
 create mode 100644 pkg/chartutil/testdata/frobnitz.v2/charts/alpine/charts/mast1/Chart.yaml
 create mode 100644 pkg/chartutil/testdata/frobnitz.v2/charts/alpine/charts/mast1/values.yaml
 create mode 100644 pkg/chartutil/testdata/frobnitz.v2/charts/alpine/charts/mast2-0.1.0.tgz
 create mode 100644 pkg/chartutil/testdata/frobnitz.v2/charts/alpine/templates/alpine-pod.yaml
 create mode 100644 pkg/chartutil/testdata/frobnitz.v2/charts/alpine/values.yaml
 create mode 100644 pkg/chartutil/testdata/frobnitz.v2/charts/mariner-4.3.2.tgz
 create mode 100644 pkg/chartutil/testdata/frobnitz.v2/docs/README.md
 create mode 100644 pkg/chartutil/testdata/frobnitz.v2/icon.svg
 create mode 100644 pkg/chartutil/testdata/frobnitz.v2/ignore/me.txt
 create mode 100644 pkg/chartutil/testdata/frobnitz.v2/requirements.lock
 create mode 100644 pkg/chartutil/testdata/frobnitz.v2/requirements.yaml
 create mode 100644 pkg/chartutil/testdata/frobnitz.v2/templates/template.tpl
 create mode 100644 pkg/chartutil/testdata/frobnitz.v2/values.yaml

diff --git a/pkg/chartutil/load.go b/pkg/chartutil/load.go
index b0927a5cf..95b835d5b 100644
--- a/pkg/chartutil/load.go
+++ b/pkg/chartutil/load.go
@@ -171,6 +171,10 @@ func LoadFiles(files []*BufferedFile) (*chart.Chart, error) {
 				return c, err
 			}
 			c.Metadata = m
+			var apiVersion = c.Metadata.ApiVersion
+			if apiVersion != "" && apiVersion != ApiVersionV1 {
+				return c, fmt.Errorf("apiVersion '%s' is not valid. The value must be \"v1\"", apiVersion)
+			}
 		} 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" {
diff --git a/pkg/chartutil/load_test.go b/pkg/chartutil/load_test.go
index c031a6a96..f139abf5c 100644
--- a/pkg/chartutil/load_test.go
+++ b/pkg/chartutil/load_test.go
@@ -23,6 +23,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"strings"
 	"testing"
 	"time"
 
@@ -39,6 +40,17 @@ func TestLoadDir(t *testing.T) {
 	verifyRequirements(t, c)
 }
 
+func TestLoadNonV1Chart(t *testing.T) {
+	_, err := Load("testdata/frobnitz.v2")
+	if err != nil {
+		if strings.Compare(err.Error(), "apiVersion 'v2' is not valid. The value must be \"v1\"") != 0 {
+			t.Errorf("Unexpected message: %s", err)
+		}
+		return
+	}
+	t.Fatalf("chart with v2 apiVersion should not load")
+}
+
 func TestLoadFile(t *testing.T) {
 	c, err := Load("testdata/frobnitz-1.2.3.tgz")
 	if err != nil {
diff --git a/pkg/chartutil/testdata/frobnitz.v2/.helmignore b/pkg/chartutil/testdata/frobnitz.v2/.helmignore
new file mode 100644
index 000000000..9973a57b8
--- /dev/null
+++ b/pkg/chartutil/testdata/frobnitz.v2/.helmignore
@@ -0,0 +1 @@
+ignore/
diff --git a/pkg/chartutil/testdata/frobnitz.v2/Chart.yaml b/pkg/chartutil/testdata/frobnitz.v2/Chart.yaml
new file mode 100644
index 000000000..157af54c1
--- /dev/null
+++ b/pkg/chartutil/testdata/frobnitz.v2/Chart.yaml
@@ -0,0 +1,20 @@
+apiVersion: v2
+name: frobnitz
+description: This is a frobnitz as a v2 chart
+version: "1.2.3"
+keywords:
+  - frobnitz
+  - sprocket
+  - dodad
+maintainers:
+  - name: The Helm Team
+    email: helm@example.com
+  - name: Someone Else
+    email: nobody@example.com
+sources:
+  - https://example.com/foo/bar
+home: http://example.com
+icon: https://example.com/64x64.png
+annotations:
+  extrakey: extravalue
+  anotherkey: anothervalue
diff --git a/pkg/chartutil/testdata/frobnitz.v2/INSTALL.txt b/pkg/chartutil/testdata/frobnitz.v2/INSTALL.txt
new file mode 100644
index 000000000..2010438c2
--- /dev/null
+++ b/pkg/chartutil/testdata/frobnitz.v2/INSTALL.txt
@@ -0,0 +1 @@
+This is an install document. The client may display this.
diff --git a/pkg/chartutil/testdata/frobnitz.v2/LICENSE b/pkg/chartutil/testdata/frobnitz.v2/LICENSE
new file mode 100644
index 000000000..6121943b1
--- /dev/null
+++ b/pkg/chartutil/testdata/frobnitz.v2/LICENSE
@@ -0,0 +1 @@
+LICENSE placeholder.
diff --git a/pkg/chartutil/testdata/frobnitz.v2/README.md b/pkg/chartutil/testdata/frobnitz.v2/README.md
new file mode 100644
index 000000000..8cf4cc3d7
--- /dev/null
+++ b/pkg/chartutil/testdata/frobnitz.v2/README.md
@@ -0,0 +1,11 @@
+# Frobnitz
+
+This is an example chart.
+
+## Usage
+
+This is an example. It has no usage.
+
+## Development
+
+For developer info, see the top-level repository.
diff --git a/pkg/chartutil/testdata/frobnitz.v2/charts/_ignore_me b/pkg/chartutil/testdata/frobnitz.v2/charts/_ignore_me
new file mode 100644
index 000000000..2cecca682
--- /dev/null
+++ b/pkg/chartutil/testdata/frobnitz.v2/charts/_ignore_me
@@ -0,0 +1 @@
+This should be ignored by the loader, but may be included in a chart.
diff --git a/pkg/chartutil/testdata/frobnitz.v2/charts/alpine/Chart.yaml b/pkg/chartutil/testdata/frobnitz.v2/charts/alpine/Chart.yaml
new file mode 100644
index 000000000..38a4aaa54
--- /dev/null
+++ b/pkg/chartutil/testdata/frobnitz.v2/charts/alpine/Chart.yaml
@@ -0,0 +1,4 @@
+name: alpine
+description: Deploy a basic Alpine Linux pod
+version: 0.1.0
+home: https://k8s.io/helm
diff --git a/pkg/chartutil/testdata/frobnitz.v2/charts/alpine/README.md b/pkg/chartutil/testdata/frobnitz.v2/charts/alpine/README.md
new file mode 100644
index 000000000..a7c84fc41
--- /dev/null
+++ b/pkg/chartutil/testdata/frobnitz.v2/charts/alpine/README.md
@@ -0,0 +1,9 @@
+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
+`alpine-pod.yaml` template.
+
+You can install this example using `helm install docs/examples/alpine`.
diff --git a/pkg/chartutil/testdata/frobnitz.v2/charts/alpine/charts/mast1/Chart.yaml b/pkg/chartutil/testdata/frobnitz.v2/charts/alpine/charts/mast1/Chart.yaml
new file mode 100644
index 000000000..171e36156
--- /dev/null
+++ b/pkg/chartutil/testdata/frobnitz.v2/charts/alpine/charts/mast1/Chart.yaml
@@ -0,0 +1,4 @@
+name: mast1
+description: A Helm chart for Kubernetes
+version: 0.1.0
+home: ""
diff --git a/pkg/chartutil/testdata/frobnitz.v2/charts/alpine/charts/mast1/values.yaml b/pkg/chartutil/testdata/frobnitz.v2/charts/alpine/charts/mast1/values.yaml
new file mode 100644
index 000000000..42c39c262
--- /dev/null
+++ b/pkg/chartutil/testdata/frobnitz.v2/charts/alpine/charts/mast1/values.yaml
@@ -0,0 +1,4 @@
+# Default values for mast1.
+# 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.v2/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/chartutil/testdata/frobnitz.v2/charts/alpine/charts/mast2-0.1.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..ced5a4a6adf946f76033b6ee584affc12433cb78
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 0
HcmV?d00001

diff --git a/pkg/chartutil/testdata/frobnitz.v2/charts/alpine/templates/alpine-pod.yaml b/pkg/chartutil/testdata/frobnitz.v2/charts/alpine/templates/alpine-pod.yaml
new file mode 100644
index 000000000..c34fa8c47
--- /dev/null
+++ b/pkg/chartutil/testdata/frobnitz.v2/charts/alpine/templates/alpine-pod.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: {{.Release.Name}}-{{.Chart.Name}}
+  labels:
+    app.kubernetes.io/managed-by: {{.Release.Service}}
+    chartName: {{.Chart.Name}}
+    chartVersion: {{.Chart.Version | quote}}
+  annotations:
+    "helm.sh/created": "{{.Release.Time.Seconds}}"
+spec:
+  restartPolicy: {{default "Never" .restart_policy}}
+  containers:
+  - name: waiter
+    image: "alpine:3.3"
+    command: ["/bin/sleep","9000"]
diff --git a/pkg/chartutil/testdata/frobnitz.v2/charts/alpine/values.yaml b/pkg/chartutil/testdata/frobnitz.v2/charts/alpine/values.yaml
new file mode 100644
index 000000000..6c2aab7ba
--- /dev/null
+++ b/pkg/chartutil/testdata/frobnitz.v2/charts/alpine/values.yaml
@@ -0,0 +1,2 @@
+# The pod name
+name: "my-alpine"
diff --git a/pkg/chartutil/testdata/frobnitz.v2/charts/mariner-4.3.2.tgz b/pkg/chartutil/testdata/frobnitz.v2/charts/mariner-4.3.2.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..78fabe241b042dcd5ec2ce08dacaaf26fc110640
GIT binary patch
literal 1012
zcmV<Q0}K2giwFR5n9f=N1MQb>XdFct$FCMzS*7)(8lmGQQS%|2-P@PLQ%XW@8+wgs
zC{cqN=XU3ETlOupvu)3qh#>i3n-2{XEL0(gmeQ(NX#^|8)Y=AHVz8k>LqKV1T8daG
zEj<%$=k{JmQfgYfTrJLzgPFUVotfQdp8x+@3u41YxGuDa2!aq*6cDs(t`#D3uFV5P
zDWXcUtctP>1W^(NH3XE!+*ASIBM{TAXenrG=+@)tuw?Qd=E>hjvAsvI^6_7jf|&4W
zXqly7gFX*cmTw(@QH;{~3yLaB(TF0^_$z`Wg@91{t=!E2JpMMcPz>Zx0jDER!-h)?
z$Buyp(1=V6XxWnik`4xOKY_4~2=cfs2z$XGnV0womvXYRgu~q3z8%ILQpo=x%HHDG
z!0qY(?EI%4iRphiD8wJ54&T7YLN@VAZ37GHzY>`je^n7>rvK$YM=r8;WNQZUVjKXq
zAm<3sOhAGi&!fKqfRXEX261pY22zB$UaYPTZG)C;B3^T>y16P6TvBw1u)vGFz^viF
zNg;9s(O^Pq?TcUmw_X3!tQSQ&sQ;o0)Bkc%i2oL7`l#f}pJO5YmqcaW`=1ht3QYgY
zK_z$&C82K;kUIfEq5tff#)jri&o?x!UCncqU{lKQ0R2GlN<-7eS~|jlgdiOx4XXb|
zLufZh%1;D-Kpe}gHKE-e^tkLInh7xq%q4f$fC~-m0pfr}w(og#KEtM8(~gfpQI4|f
z=Nu^<To&fIS-Z<R79B)lfM6dni@9@d)_>Y)DCL+s!aQ+Hp#}@qe}Xbs|08rDtN+Tv
z?ChQ$d5&A}IC>(DKxZf4k~4>F9)h=ko)?VpRtKAUxT}lh-M!1a_y1zqUmH~IJZXRP
z-><Py{>${wV*aZl_5Y|Mi!A@k!K&@|hdSOLX$>v?eJsBDJK>>aZ+z~*H?-WXjvpL4
z+}G5<_l3u*R}8o8JX`OyO}(?U->9kT8ofSoa@}xcZ+FF4a?Q1eR~<b3+n({(Q~fQ+
ze~9}Bo~)`G-__^utL}JwSMwtmrVkPIn0{nz!^H0XL*wI3Cr)2ndG+ZJw9nptclXrb
z`HhX=@4qnl>7Y2d{^PMLneEN5o@_g@A$io99Pa!(Gqe2EM9;aGzHLzl;B?<Wck2Ak
z4-Z`2H#zuV>va8(XMXA#dZOazk)CZYAAR6O_jKm3)#;J$KkF}5PtE+Xqr&>;_{v|u
zobg_3J2%*OU*`IX%QJf~eIop_=ZoIU@iULE(~pg1Mn{i4Q!%i=ckS0p=02G2kD@hK
icf1~Y>h8pa!C){L3<iV2U@#brQgQ=Ua*&<?C;$LNCkdng

literal 0
HcmV?d00001

diff --git a/pkg/chartutil/testdata/frobnitz.v2/docs/README.md b/pkg/chartutil/testdata/frobnitz.v2/docs/README.md
new file mode 100644
index 000000000..d40747caf
--- /dev/null
+++ b/pkg/chartutil/testdata/frobnitz.v2/docs/README.md
@@ -0,0 +1 @@
+This is a placeholder for documentation.
diff --git a/pkg/chartutil/testdata/frobnitz.v2/icon.svg b/pkg/chartutil/testdata/frobnitz.v2/icon.svg
new file mode 100644
index 000000000..892130606
--- /dev/null
+++ b/pkg/chartutil/testdata/frobnitz.v2/icon.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    version="1.0" width="256" height="256" id="test">
+  <desc>Example icon</desc>
+  <rect id="first" x="2" y="2" width="40" height="60" fill="navy"/>
+  <rect id="second" x="15" y="4" width="40" height="60" fill="red"/>
+</svg>
diff --git a/pkg/chartutil/testdata/frobnitz.v2/ignore/me.txt b/pkg/chartutil/testdata/frobnitz.v2/ignore/me.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/pkg/chartutil/testdata/frobnitz.v2/requirements.lock b/pkg/chartutil/testdata/frobnitz.v2/requirements.lock
new file mode 100644
index 000000000..6fcc2ed9f
--- /dev/null
+++ b/pkg/chartutil/testdata/frobnitz.v2/requirements.lock
@@ -0,0 +1,8 @@
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
+digest: invalid
diff --git a/pkg/chartutil/testdata/frobnitz.v2/requirements.yaml b/pkg/chartutil/testdata/frobnitz.v2/requirements.yaml
new file mode 100644
index 000000000..5eb0bc98b
--- /dev/null
+++ b/pkg/chartutil/testdata/frobnitz.v2/requirements.yaml
@@ -0,0 +1,7 @@
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
diff --git a/pkg/chartutil/testdata/frobnitz.v2/templates/template.tpl b/pkg/chartutil/testdata/frobnitz.v2/templates/template.tpl
new file mode 100644
index 000000000..c651ee6a0
--- /dev/null
+++ b/pkg/chartutil/testdata/frobnitz.v2/templates/template.tpl
@@ -0,0 +1 @@
+Hello {{.Name | default "world"}}
diff --git a/pkg/chartutil/testdata/frobnitz.v2/values.yaml b/pkg/chartutil/testdata/frobnitz.v2/values.yaml
new file mode 100644
index 000000000..61f501258
--- /dev/null
+++ b/pkg/chartutil/testdata/frobnitz.v2/values.yaml
@@ -0,0 +1,6 @@
+# A values file contains configuration.
+
+name: "Some Name"
+
+section:
+  name: "Name in a section"