From dfc6d74637ba5fc2c9b9e95fdb32639449f1d726 Mon Sep 17 00:00:00 2001
From: fqsghostcloud <fanqingsong@ghostcloud.cn>
Date: Thu, 22 Mar 2018 23:28:04 +0800
Subject: [PATCH 01/54] Update CONTRIBUTING.md

"Semantic Versioning" will be better
---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 34b4f8b16..ec3db568c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -53,7 +53,7 @@ An issue that we are not sure we will be doing will not be added to any mileston
 
 A milestone (and hence release) is considered done when all outstanding issues/PRs have been closed or moved to another milestone.
 
-## Semver
+## Semantic Versioning
 
 Helm maintains a strong commitment to backward compatibility. All of our changes to protocols and formats are backward compatible from Helm 2.0 until Helm 3.0. No features, flags, or commands are removed or substantially modified (other than bug fixes).
 

From 00376d4d1f7ea78e81cd2a9c1905c3d606402b2c Mon Sep 17 00:00:00 2001
From: Derek Bassett <derek.bassett@protonmail.com>
Date: Mon, 26 Feb 2018 20:03:43 -0700
Subject: [PATCH 02/54] The default defined role does not allow Tiller to
 launch Kubernetes jobs.

---
 docs/rbac.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/rbac.md b/docs/rbac.md
index bc138ceee..b6d407863 100644
--- a/docs/rbac.md
+++ b/docs/rbac.md
@@ -71,7 +71,7 @@ metadata:
   name: tiller-manager
   namespace: tiller-world
 rules:
-- apiGroups: ["", "extensions", "apps"]
+- apiGroups: ["", "batch", "extensions", "apps"]
   resources: ["*"]
   verbs: ["*"]
 ```

From 49c3d50e4eb4b61135d58a6cb52a5cd3304e2c51 Mon Sep 17 00:00:00 2001
From: Sean Eagan <sean.eagan@att.com>
Date: Wed, 18 Apr 2018 13:27:37 -0500
Subject: [PATCH 03/54] feat(list): Optional output as JSON and YAML

The choice of interface `--output (json|yaml)` is to match that of the
status command, except that -o is not available as it is already used
by --offset.

WIP #1534
---
 cmd/helm/list.go       | 138 +++++++++++++++++++++++++++++++++--------
 cmd/helm/list_test.go  |  80 +++++++++++++++++++++++-
 docs/helm/helm_list.md |   3 +-
 pkg/helm/fake.go       |  23 ++++++-
 4 files changed, 215 insertions(+), 29 deletions(-)

diff --git a/cmd/helm/list.go b/cmd/helm/list.go
index c2633d21c..4614c7f67 100644
--- a/cmd/helm/list.go
+++ b/cmd/helm/list.go
@@ -17,10 +17,12 @@ limitations under the License.
 package main
 
 import (
+	"encoding/json"
 	"fmt"
 	"io"
 	"strings"
 
+	"github.com/ghodss/yaml"
 	"github.com/gosuri/uitable"
 	"github.com/spf13/cobra"
 
@@ -75,6 +77,22 @@ type listCmd struct {
 	pending    bool
 	client     helm.Interface
 	colWidth   uint
+	output     string
+}
+
+type listResult struct {
+	Next     string
+	Releases []listRelease
+}
+
+type listRelease struct {
+	Name       string
+	Revision   int32
+	Updated    string
+	Status     string
+	Chart      string
+	AppVersion string
+	Namespace  string
 }
 
 func newListCmd(client helm.Interface, out io.Writer) *cobra.Command {
@@ -114,6 +132,7 @@ func newListCmd(client helm.Interface, out io.Writer) *cobra.Command {
 	f.BoolVar(&list.pending, "pending", false, "show pending releases")
 	f.StringVar(&list.namespace, "namespace", "", "show releases within a specific namespace")
 	f.UintVar(&list.colWidth, "col-width", 60, "specifies the max column width of output")
+	f.StringVar(&list.output, "output", "", "output the specified format (json or yaml)")
 
 	// TODO: Do we want this as a feature of 'helm list'?
 	//f.BoolVar(&list.superseded, "history", true, "show historical releases")
@@ -148,23 +167,17 @@ func (l *listCmd) run() error {
 		return prettyError(err)
 	}
 
-	if len(res.GetReleases()) == 0 {
-		return nil
-	}
+	rels := filterList(res.Releases)
 
-	if res.Next != "" && !l.short {
-		fmt.Fprintf(l.out, "\tnext: %s\n", res.Next)
-	}
+	result := getListResult(rels, res.Next)
 
-	rels := filterList(res.Releases)
+	output, err := formatResult(l.output, l.short, result, l.colWidth)
 
-	if l.short {
-		for _, r := range rels {
-			fmt.Fprintln(l.out, r.Name)
-		}
-		return nil
+	if err != nil {
+		return prettyError(err)
 	}
-	fmt.Fprintln(l.out, formatList(rels, l.colWidth))
+
+	fmt.Fprintln(l.out, output)
 	return nil
 }
 
@@ -233,23 +246,98 @@ func (l *listCmd) statusCodes() []release.Status_Code {
 	return status
 }
 
-func formatList(rels []*release.Release, colWidth uint) string {
-	table := uitable.New()
-
-	table.MaxColWidth = colWidth
-	table.AddRow("NAME", "REVISION", "UPDATED", "STATUS", "CHART", "APP VERSION", "NAMESPACE")
+func getListResult(rels []*release.Release, next string) listResult {
+	listReleases := []listRelease{}
 	for _, r := range rels {
 		md := r.GetChart().GetMetadata()
-		c := fmt.Sprintf("%s-%s", md.GetName(), md.GetVersion())
 		t := "-"
 		if tspb := r.GetInfo().GetLastDeployed(); tspb != nil {
 			t = timeconv.String(tspb)
 		}
-		s := r.GetInfo().GetStatus().GetCode().String()
-		v := r.GetVersion()
-		a := md.GetAppVersion()
-		n := r.GetNamespace()
-		table.AddRow(r.GetName(), v, t, s, c, a, n)
+
+		lr := listRelease{
+			Name:       r.GetName(),
+			Revision:   r.GetVersion(),
+			Updated:    t,
+			Status:     r.GetInfo().GetStatus().GetCode().String(),
+			Chart:      fmt.Sprintf("%s-%s", md.GetName(), md.GetVersion()),
+			AppVersion: md.GetAppVersion(),
+			Namespace:  r.GetNamespace(),
+		}
+		listReleases = append(listReleases, lr)
+	}
+
+	return listResult{
+		Releases: listReleases,
+		Next:     next,
 	}
-	return table.String()
+}
+
+func shortenListResult(result listResult) []string {
+	names := []string{}
+	for _, r := range result.Releases {
+		names = append(names, r.Name)
+	}
+
+	return names
+}
+
+func formatResult(format string, short bool, result listResult, colWidth uint) (string, error) {
+	var output string
+	var err error
+
+	var shortResult []string
+	var finalResult interface{}
+	if short {
+		shortResult = shortenListResult(result)
+		finalResult = shortResult
+	} else {
+		finalResult = result
+	}
+
+	switch format {
+	case "":
+		if short {
+			output = formatTextShort(shortResult)
+		} else {
+			output = formatText(result, colWidth)
+		}
+	case "json":
+		o, e := json.Marshal(finalResult)
+		if e != nil {
+			err = fmt.Errorf("Failed to Marshal JSON output: %s", e)
+		} else {
+			output = string(o)
+		}
+	case "yaml":
+		o, e := yaml.Marshal(finalResult)
+		if e != nil {
+			err = fmt.Errorf("Failed to Marshal YAML output: %s", e)
+		} else {
+			output = string(o)
+		}
+	default:
+		err = fmt.Errorf("Unknown output format \"%s\"", format)
+	}
+	return output, err
+}
+
+func formatText(result listResult, colWidth uint) string {
+	nextOutput := ""
+	if result.Next != "" {
+		nextOutput = fmt.Sprintf("\tnext: %s\n", result.Next)
+	}
+
+	table := uitable.New()
+	table.MaxColWidth = colWidth
+	table.AddRow("NAME", "REVISION", "UPDATED", "STATUS", "CHART", "APP VERSION", "NAMESPACE")
+	for _, lr := range result.Releases {
+		table.AddRow(lr.Name, lr.Revision, lr.Updated, lr.Status, lr.Chart, lr.AppVersion, lr.Namespace)
+	}
+
+	return fmt.Sprintf("%s%s", nextOutput, table.String())
+}
+
+func formatTextShort(shortResult []string) string {
+	return strings.Join(shortResult, "\n")
 }
diff --git a/cmd/helm/list_test.go b/cmd/helm/list_test.go
index e292b4b5a..e0faee935 100644
--- a/cmd/helm/list_test.go
+++ b/cmd/helm/list_test.go
@@ -18,16 +18,18 @@ package main
 
 import (
 	"io"
+	"regexp"
 	"testing"
 
 	"github.com/spf13/cobra"
 
 	"io/ioutil"
+	"os"
+
 	"k8s.io/helm/pkg/chartutil"
 	"k8s.io/helm/pkg/helm"
 	"k8s.io/helm/pkg/proto/hapi/chart"
 	"k8s.io/helm/pkg/proto/hapi/release"
-	"os"
 )
 
 func TestListCmd(t *testing.T) {
@@ -46,6 +48,11 @@ func TestListCmd(t *testing.T) {
 	ch, _ := chartutil.Load(chartPath)
 
 	tests := []releaseCase{
+		{
+			name:     "empty",
+			rels:     []*release.Release{},
+			expected: "",
+		},
 		{
 			name: "with a release",
 			rels: []*release.Release{
@@ -67,6 +74,77 @@ func TestListCmd(t *testing.T) {
 			},
 			expected: "NAME \tREVISION\tUPDATED                 \tSTATUS  \tCHART           \tAPP VERSION\tNAMESPACE\natlas\t1       \t(.*)\tDEPLOYED\tfoo-0.1.0-beta.1\t2.X.A      \tdefault  \n",
 		},
+		{
+			name:  "with json output",
+			flags: []string{"--max", "1", "--output", "json"},
+			rels: []*release.Release{
+				helm.ReleaseMock(&helm.MockReleaseOptions{Name: "thomas-guide"}),
+				helm.ReleaseMock(&helm.MockReleaseOptions{Name: "atlas-guide"}),
+			},
+			expected: regexp.QuoteMeta(`{"Next":"atlas-guide","Releases":[{"Name":"thomas-guide","Revision":1,"Updated":"`) + `([^"]*)` + regexp.QuoteMeta(`","Status":"DEPLOYED","Chart":"foo-0.1.0-beta.1","AppVersion":"","Namespace":"default"}]}
+`),
+		},
+		{
+			name:  "with yaml output",
+			flags: []string{"--max", "1", "--output", "yaml"},
+			rels: []*release.Release{
+				helm.ReleaseMock(&helm.MockReleaseOptions{Name: "thomas-guide"}),
+				helm.ReleaseMock(&helm.MockReleaseOptions{Name: "atlas-guide"}),
+			},
+			expected: regexp.QuoteMeta(`Next: atlas-guide
+Releases:
+- AppVersion: ""
+  Chart: foo-0.1.0-beta.1
+  Name: thomas-guide
+  Namespace: default
+  Revision: 1
+  Status: DEPLOYED
+  Updated: `) + `(.*)` + `
+
+`,
+		},
+		{
+			name:  "with short json output",
+			flags: []string{"-q", "--output", "json"},
+			rels: []*release.Release{
+				helm.ReleaseMock(&helm.MockReleaseOptions{Name: "atlas"}),
+			},
+			expected: regexp.QuoteMeta(`["atlas"]
+`),
+		},
+		{
+			name:  "with short yaml output",
+			flags: []string{"-q", "--output", "yaml"},
+			rels: []*release.Release{
+				helm.ReleaseMock(&helm.MockReleaseOptions{Name: "atlas"}),
+			},
+			expected: regexp.QuoteMeta(`- atlas
+
+`),
+		},
+		{
+			name:  "with json output without next",
+			flags: []string{"--output", "json"},
+			rels:  []*release.Release{},
+			expected: regexp.QuoteMeta(`{"Next":"","Releases":[]}
+`),
+		},
+		{
+			name:  "with yaml output without next",
+			flags: []string{"--output", "yaml"},
+			rels:  []*release.Release{},
+			expected: regexp.QuoteMeta(`Next: ""
+Releases: []
+
+`),
+		},
+		{
+			name:     "with unknown output format",
+			flags:    []string{"--output", "_unknown_"},
+			rels:     []*release.Release{},
+			err:      true,
+			expected: regexp.QuoteMeta(``),
+		},
 		{
 			name:  "list, one deployed, one failed",
 			flags: []string{"-q"},
diff --git a/docs/helm/helm_list.md b/docs/helm/helm_list.md
index 1d5bf7ea2..99872a413 100755
--- a/docs/helm/helm_list.md
+++ b/docs/helm/helm_list.md
@@ -49,6 +49,7 @@ helm list [flags] [FILTER]
   -m, --max int              maximum number of releases to fetch (default 256)
       --namespace string     show releases within a specific namespace
   -o, --offset string        next release name in the list, used to offset from start value
+      --output string        output the specified format (json or yaml)
       --pending              show pending releases
   -r, --reverse              reverse the sort order
   -q, --short                output short (quiet) listing format
@@ -73,4 +74,4 @@ helm list [flags] [FILTER]
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Apr-2018
diff --git a/pkg/helm/fake.go b/pkg/helm/fake.go
index 0a9e77c44..68d39a6ab 100644
--- a/pkg/helm/fake.go
+++ b/pkg/helm/fake.go
@@ -49,9 +49,28 @@ var _ Interface = (*FakeClient)(nil)
 
 // ListReleases lists the current releases
 func (c *FakeClient) ListReleases(opts ...ReleaseListOption) (*rls.ListReleasesResponse, error) {
+	reqOpts := c.Opts
+	for _, opt := range opts {
+		opt(&reqOpts)
+	}
+	req := &reqOpts.listReq
+	rels := c.Rels
+	count := int64(len(c.Rels))
+	var next string
+	limit := req.GetLimit()
+	// TODO: Handle all other options.
+	if limit != 0 && limit < count {
+		rels = rels[:limit]
+		count = limit
+		next = c.Rels[limit].GetName()
+	}
+
 	resp := &rls.ListReleasesResponse{
-		Count:    int64(len(c.Rels)),
-		Releases: c.Rels,
+		Count:    count,
+		Releases: rels,
+	}
+	if next != "" {
+		resp.Next = next
 	}
 	return resp, nil
 }

From b133da06e5767312273f4c9abc0b79d578d975fe Mon Sep 17 00:00:00 2001
From: Taylor Thomas <thomastaylor312@gmail.com>
Date: Thu, 10 May 2018 14:30:09 -0700
Subject: [PATCH 04/54] docs(release_checklist): Adds information about new
 release meetings

We have decided to start having release meetings to define clear objectives
for a release. This documents the process.
---
 docs/release_checklist.md | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/docs/release_checklist.md b/docs/release_checklist.md
index 26506985c..de047971e 100644
--- a/docs/release_checklist.md
+++ b/docs/release_checklist.md
@@ -2,9 +2,36 @@
 
 **IMPORTANT**: If your experience deviates from this document, please document the changes to keep it up-to-date.
 
+## Release Meetings
+As part of the release process, two of the weekly developer calls will be co-opted
+as "release meetings." 
+
+### Start of the Release Cycle
+The first developer call after a release will be used as the release meeting to
+start the next release cycle. During this meeting, the following items must be
+identified:
+
+- Release date
+- Goals/Objectives for this release
+- The release manager (basically whoever is going to cut the release)
+- Any other important details for the community
+
+All of this information should be added to the GitHub milestone for the given
+release. This should give the community and maintainers a clear set of guidelines
+to follow when choosing whether or not to add issues and PRs to a given release.
+
+### End (almost) of the Release Cycle
+The developer call closest to two weeks before the scheduled release date will
+be used to review any remaining PRs that should be pulled into the release. This
+is the place to debate whether or not we should wait before cutting a release and
+any other concerns. At the end of this meeting, if the release date has not been
+pushed out, the first RC should be cut. Subsequent developer calls in between this
+meeting and the release date should have some time set aside to see if any bugs
+were found. Once the release date is reached, the final release can be cut
+
 ## A Maintainer's Guide to Releasing Helm
 
-So you're in charge of a new release for helm? Cool. Here's what to do...
+So you're in charge of a new release for Helm? Cool. Here's what to do...
 
 ![TODO: Nothing](images/nothing.png)
 

From 1bb34bc255b5379a9af0b832599a472ceca2d7a1 Mon Sep 17 00:00:00 2001
From: Michelle Noorali <michellemolu@gmail.com>
Date: Fri, 11 May 2018 14:15:46 -0400
Subject: [PATCH 05/54] chore(docs): mv index.md to README.md

* Newcomers may not realize they have to look
for the index.md file when coming to the docs dir
* README.md makes the index easier to see
---
 docs/{index.md => README.md} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename docs/{index.md => README.md} (100%)

diff --git a/docs/index.md b/docs/README.md
similarity index 100%
rename from docs/index.md
rename to docs/README.md

From 4e08a023ddd71a211a774ffd2538b5701ba05ea9 Mon Sep 17 00:00:00 2001
From: Jonathan Hall <flimzy@flimzy.com>
Date: Mon, 14 May 2018 18:47:13 +0200
Subject: [PATCH 06/54] Suppress 'unauthenticated users' warning when
 --tiller-tls-verify present

And clarify the warning to indicate exactly how to correct the problem.
---
 cmd/helm/init.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/cmd/helm/init.go b/cmd/helm/init.go
index d368945ec..92f4c3794 100644
--- a/cmd/helm/init.go
+++ b/cmd/helm/init.go
@@ -312,9 +312,12 @@ func (i *initCmd) run() error {
 					"(Use --client-only to suppress this message, or --upgrade to upgrade Tiller to the current version.)")
 			}
 		} else {
-			fmt.Fprintln(i.out, "\nTiller (the Helm server-side component) has been installed into your Kubernetes Cluster.\n\n"+
-				"Please note: by default, Tiller is deployed with an insecure 'allow unauthenticated users' policy.\n"+
-				"For more information on securing your installation see: https://docs.helm.sh/using_helm/#securing-your-helm-installation")
+			fmt.Fprintln(i.out, "\nTiller (the Helm server-side component) has been installed into your Kubernetes Cluster.")
+			if !tlsVerify {
+				fmt.Fprintln(i.out, "\nPlease note: by default, Tiller is deployed with an insecure 'allow unauthenticated users' policy.\n"+
+					"To prevent this, run `helm init` with the --tiller-tls-verify flag.\n"+
+					"For more information on securing your installation see: https://docs.helm.sh/using_helm/#securing-your-helm-installation")
+			}
 		}
 		if err := i.ping(); err != nil {
 			return err

From 4fbc733ade47ed8eb35229783e8f53465e14ae27 Mon Sep 17 00:00:00 2001
From: Alejandro Vicente Grabovetsky <sasha@aid.technology>
Date: Sat, 19 May 2018 02:42:49 +0300
Subject: [PATCH 07/54] Migrate 'template' to 'include' in 'helm create' to
 conform to Helm best practices

Signed-off-by: Alejandro Vicente Grabovetsky <sasha@aid.technology>
---
 pkg/chartutil/create.go | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkg/chartutil/create.go b/pkg/chartutil/create.go
index 30c6310b2..fa6fb2783 100644
--- a/pkg/chartutil/create.go
+++ b/pkg/chartutil/create.go
@@ -129,8 +129,8 @@ kind: Ingress
 metadata:
   name: {{ $fullName }}
   labels:
-    app: {{ template "<CHARTNAME>.name" . }}
-    chart: {{ template "<CHARTNAME>.chart" . }}
+    app: {{ include "<CHARTNAME>.name" . }}
+    chart: {{ include "<CHARTNAME>.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 {{- with .Values.ingress.annotations }}
@@ -164,22 +164,22 @@ spec:
 const defaultDeployment = `apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
-  name: {{ template "<CHARTNAME>.fullname" . }}
+  name: {{ include "<CHARTNAME>.fullname" . }}
   labels:
-    app: {{ template "<CHARTNAME>.name" . }}
-    chart: {{ template "<CHARTNAME>.chart" . }}
+    app: {{ include "<CHARTNAME>.name" . }}
+    chart: {{ include "<CHARTNAME>.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app: {{ template "<CHARTNAME>.name" . }}
+      app: {{ include "<CHARTNAME>.name" . }}
       release: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        app: {{ template "<CHARTNAME>.name" . }}
+        app: {{ include "<CHARTNAME>.name" . }}
         release: {{ .Release.Name }}
     spec:
       containers:
@@ -217,10 +217,10 @@ spec:
 const defaultService = `apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "<CHARTNAME>.fullname" . }}
+  name: {{ include "<CHARTNAME>.fullname" . }}
   labels:
-    app: {{ template "<CHARTNAME>.name" . }}
-    chart: {{ template "<CHARTNAME>.chart" . }}
+    app: {{ include "<CHARTNAME>.name" . }}
+    chart: {{ include "<CHARTNAME>.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
@@ -231,7 +231,7 @@ spec:
       protocol: TCP
       name: http
   selector:
-    app: {{ template "<CHARTNAME>.name" . }}
+    app: {{ include "<CHARTNAME>.name" . }}
     release: {{ .Release.Name }}
 `
 
@@ -241,16 +241,16 @@ const defaultNotes = `1. Get the application URL by running these commands:
   http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
 {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "<CHARTNAME>.fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "<CHARTNAME>.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
 {{- 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 svc -w {{ template "<CHARTNAME>.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "<CHARTNAME>.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+           You can watch the status of by running 'kubectl get svc -w {{ include "<CHARTNAME>.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "<CHARTNAME>.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   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={{ template "<CHARTNAME>.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ include "<CHARTNAME>.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl port-forward $POD_NAME 8080:80
 {{- end }}

From 091dd84c71814fdeb8b67aaaf90179629f1f7f84 Mon Sep 17 00:00:00 2001
From: Eric Zhang <i@qinix.com>
Date: Mon, 21 May 2018 16:18:16 +0800
Subject: [PATCH 08/54] fix charts doc: extra space in requirement condition

---
 docs/charts.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/charts.md b/docs/charts.md
index a55038e3e..8f8a9856f 100644
--- a/docs/charts.md
+++ b/docs/charts.md
@@ -265,7 +265,7 @@ dependencies:
       - name: subchart1
         repository: http://localhost:10191
         version: 0.1.0
-        condition: subchart1.enabled, global.subchart1.enabled
+        condition: subchart1.enabled,global.subchart1.enabled
         tags:
           - front-end
           - subchart1

From 2b04523bafa1cc96eb92b64980f7672a399e3715 Mon Sep 17 00:00:00 2001
From: mattjmcnaughton <mattjmcnaughton@gmail.com>
Date: Sun, 27 May 2018 18:25:55 -0400
Subject: [PATCH 09/54] Fix inaccurate comment in `tiller`

When reading through `cmd/tiller/tiller.go`, I noticed a comment around
`rootServer` mentions the usage of an `init` function. However, there is
no `init` function in this package. Update the comment to be more
accurate.
---
 cmd/tiller/tiller.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/tiller/tiller.go b/cmd/tiller/tiller.go
index 5d2db3816..c97187b2a 100644
--- a/cmd/tiller/tiller.go
+++ b/cmd/tiller/tiller.go
@@ -85,7 +85,7 @@ var (
 
 	// rootServer is the root gRPC server.
 	//
-	// Each gRPC service registers itself to this server during init().
+	// Each gRPC service registers itself to this server during start().
 	rootServer *grpc.Server
 
 	// env is the default environment.

From 53c8e9b67ed9482edd1c03146a55b73b014134b5 Mon Sep 17 00:00:00 2001
From: mattjmcnaughton <mattjmcnaughton@gmail.com>
Date: Mon, 28 May 2018 10:07:33 -0400
Subject: [PATCH 10/54] Fix concurrency issues with helm install

Address a race condition that arises when running two `helm install`
commands, both of which specify a namespace that does not already exist.

In this specific instance, attempting to create a `namespace` which
already exists shouldn't be a failure which causes `helm install` to
terminate.
---
 pkg/kube/namespace.go                 | 11 ++++++++++-
 pkg/tiller/environment/environment.go |  2 --
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkg/kube/namespace.go b/pkg/kube/namespace.go
index 9d2793d87..6547e4abc 100644
--- a/pkg/kube/namespace.go
+++ b/pkg/kube/namespace.go
@@ -40,7 +40,16 @@ func getNamespace(client internalclientset.Interface, namespace string) (*core.N
 func ensureNamespace(client internalclientset.Interface, namespace string) error {
 	_, err := getNamespace(client, namespace)
 	if err != nil && errors.IsNotFound(err) {
-		return createNamespace(client, namespace)
+		err = createNamespace(client, namespace)
+
+		// If multiple commands which run `ensureNamespace` are run in
+		// parallel, then protect against the race condition in which
+		// the namespace did not exist when `getNamespace` was executed,
+		// but did exist when `createNamespace` was executed. If that
+		// happens, we can just proceed as normal.
+		if errors.IsAlreadyExists(err) {
+			return nil
+		}
 	}
 	return err
 }
diff --git a/pkg/tiller/environment/environment.go b/pkg/tiller/environment/environment.go
index 366fdf522..18518dfc1 100644
--- a/pkg/tiller/environment/environment.go
+++ b/pkg/tiller/environment/environment.go
@@ -98,8 +98,6 @@ type Engine interface {
 type KubeClient interface {
 	// Create creates one or more resources.
 	//
-	// namespace must contain a valid existing namespace.
-	//
 	// reader must contain a YAML stream (one or more YAML documents separated
 	// by "\n---\n").
 	Create(namespace string, reader io.Reader, timeout int64, shouldWait bool) error

From 4e29c7e2fd4ced670da320c7587cd8a9e7a895e2 Mon Sep 17 00:00:00 2001
From: radbaron <raddishbaron@gmail.com>
Date: Tue, 29 May 2018 15:28:04 +0100
Subject: [PATCH 11/54] Documentation: add syntax highlighting to code examples
 & fix spelling of kube primitives

---
 docs/examples/README.md |  3 +--
 docs/using_helm.md      | 14 +++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/docs/examples/README.md b/docs/examples/README.md
index 723040ca8..f936e1551 100644
--- a/docs/examples/README.md
+++ b/docs/examples/README.md
@@ -14,6 +14,5 @@ It simply deploys a single pod running Alpine Linux.
 The `nginx` chart shows how to compose several resources into one chart,
 and it illustrates more complex template usage.
 
-It deploys a `deployment` (which creates a `replica set`), a `config
-map`, and a `service`. The replica set starts an nginx pod. The config
+It deploys a `Deployment` (which creates a `ReplicaSet`), a `ConfigMap`, and a `Service`. The replica set starts an nginx pod. The config
 map stores the files that the nginx server can serve.
diff --git a/docs/using_helm.md b/docs/using_helm.md
index 0d15637d4..5490abbe1 100755
--- a/docs/using_helm.md
+++ b/docs/using_helm.md
@@ -43,7 +43,7 @@ carefully curated and maintained charts. This chart repository is named
 
 You can see which charts are available by running `helm search`:
 
-```
+```console
 $ helm search
 NAME                 	VERSION 	DESCRIPTION
 stable/drupal   	0.3.2   	One of the most versatile open source content m...
@@ -56,7 +56,7 @@ stable/mysql    	0.1.0   	Chart for MySQL
 With no filter, `helm search` shows you all of the available charts. You
 can narrow down your results by searching with a filter:
 
-```
+```console
 $ helm search mysql
 NAME               	VERSION	DESCRIPTION
 stable/mysql  	0.1.0  	Chart for MySQL
@@ -69,7 +69,7 @@ Why is
 `mariadb` in the list? Because its package description relates it to
 MySQL. We can use `helm inspect chart` to see this:
 
-```
+```console
 $ helm inspect stable/mariadb
 Fetched stable/mariadb to mariadb-0.5.1.tgz
 description: Chart for MariaDB
@@ -91,7 +91,7 @@ package you want to install, you can use `helm install` to install it.
 To install a new package, use the `helm install` command. At its
 simplest, it takes only one argument: The name of the chart.
 
-```
+```console
 $ helm install stable/mariadb
 Fetched stable/mariadb-0.3.0 to /Users/mattbutcher/Code/Go/src/k8s.io/helm/mariadb-0.3.0.tgz
 happy-panda
@@ -139,7 +139,7 @@ may take a long time to install into the cluster.
 To keep track of a release's state, or to re-read configuration
 information, you can use `helm status`:
 
-```
+```console
 $ helm status happy-panda
 Last Deployed: Wed Sep 28 12:32:28 2016
 Namespace: default
@@ -392,14 +392,14 @@ is not a full list of cli flags. To see a description of all flags, just run
 When it is time to uninstall or delete a release from the cluster, use
 the `helm delete` command:
 
-```
+```console
 $ helm delete happy-panda
 ```
 
 This will remove the release from the cluster. You can see all of your
 currently deployed releases with the `helm list` command:
 
-```
+```console
 $ helm list
 NAME           	VERSION	UPDATED                        	STATUS         	CHART
 inky-cat       	1      	Wed Sep 28 12:59:46 2016       	DEPLOYED       	alpine-0.1.0

From 272d9bc6efff112b578e48334054534290d3af95 Mon Sep 17 00:00:00 2001
From: Elmar Ritsch <elmar@ritsch.io>
Date: Tue, 29 May 2018 21:17:37 +0200
Subject: [PATCH 12/54] Parse booleans and null as string values with
 --set-string flag

---
 pkg/strvals/parser.go      | 9 +++++++--
 pkg/strvals/parser_test.go | 9 +++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkg/strvals/parser.go b/pkg/strvals/parser.go
index 90670a4dd..dae949d8e 100644
--- a/pkg/strvals/parser.go
+++ b/pkg/strvals/parser.go
@@ -325,6 +325,11 @@ func inMap(k rune, m map[rune]bool) bool {
 
 func typedVal(v []rune, st bool) interface{} {
 	val := string(v)
+
+	if st {
+		return val
+	}
+
 	if strings.EqualFold(val, "true") {
 		return true
 	}
@@ -337,8 +342,8 @@ func typedVal(v []rune, st bool) interface{} {
 		return nil
 	}
 
-	// If this value does not start with zero, and not returnString, try parsing it to an int
-	if !st && len(val) != 0 && val[0] != '0' {
+	// If this value does not start with zero, try parsing it to an int
+	if len(val) != 0 && val[0] != '0' {
 		if iv, err := strconv.ParseInt(val, 10, 64); err == nil {
 			return iv
 		}
diff --git a/pkg/strvals/parser_test.go b/pkg/strvals/parser_test.go
index c897cf0a7..54a95e6e0 100644
--- a/pkg/strvals/parser_test.go
+++ b/pkg/strvals/parser_test.go
@@ -75,6 +75,11 @@ func TestParseSet(t *testing.T) {
 			expect: map[string]interface{}{"long_int_string": "1234567890"},
 			err:    false,
 		},
+		{
+			str:    "boolean=true",
+			expect: map[string]interface{}{"boolean": "true"},
+			err:    false,
+		},
 	}
 	tests := []struct {
 		str    string
@@ -117,6 +122,10 @@ func TestParseSet(t *testing.T) {
 			str:    "long_int=1234567890",
 			expect: map[string]interface{}{"long_int": 1234567890},
 		},
+		{
+			str:    "boolean=true",
+			expect: map[string]interface{}{"boolean": true},
+		},
 		{
 			str: "name1,name2=",
 			err: true,

From 7308e766e2633bbe08f0c441e9a84a46acca38f9 Mon Sep 17 00:00:00 2001
From: Elmar Ritsch <elmar@ritsch.io>
Date: Tue, 29 May 2018 21:38:21 +0200
Subject: [PATCH 13/54] Add test to make sure --set-string flag takes `null` as
 string

---
 pkg/strvals/parser_test.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkg/strvals/parser_test.go b/pkg/strvals/parser_test.go
index 54a95e6e0..7ad31aa56 100644
--- a/pkg/strvals/parser_test.go
+++ b/pkg/strvals/parser_test.go
@@ -80,6 +80,11 @@ func TestParseSet(t *testing.T) {
 			expect: map[string]interface{}{"boolean": "true"},
 			err:    false,
 		},
+		{
+			str:    "is_null=null",
+			expect: map[string]interface{}{"is_null": "null"},
+			err:    false,
+		},
 	}
 	tests := []struct {
 		str    string

From a7362d76bc6002140a153daa4ab68b87b509af89 Mon Sep 17 00:00:00 2001
From: Elmar Ritsch <elmar@ritsch.io>
Date: Tue, 29 May 2018 22:06:00 +0200
Subject: [PATCH 14/54] Add test to make sure --set flag interprets `null` as
 `nil`

---
 pkg/strvals/parser_test.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkg/strvals/parser_test.go b/pkg/strvals/parser_test.go
index 7ad31aa56..f6e35c81b 100644
--- a/pkg/strvals/parser_test.go
+++ b/pkg/strvals/parser_test.go
@@ -131,6 +131,11 @@ func TestParseSet(t *testing.T) {
 			str:    "boolean=true",
 			expect: map[string]interface{}{"boolean": true},
 		},
+		{
+			str:    "is_null=null",
+			expect: map[string]interface{}{"is_null": nil},
+			err:    false,
+		},
 		{
 			str: "name1,name2=",
 			err: true,

From 4d22b104b72cc1b6b024d047c423ba496ec05e0c Mon Sep 17 00:00:00 2001
From: AdamDang <adam.dang@daocloud.io>
Date: Sat, 2 Jun 2018 18:57:31 +0800
Subject: [PATCH 15/54] Typo fix: retruns->returns

retruns->returns
---
 pkg/helm/portforwarder/pod.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/helm/portforwarder/pod.go b/pkg/helm/portforwarder/pod.go
index 7c2355204..5eae5b5e6 100644
--- a/pkg/helm/portforwarder/pod.go
+++ b/pkg/helm/portforwarder/pod.go
@@ -32,7 +32,7 @@ func isPodReady(pod *v1.Pod) bool {
 	return isPodReadyConditionTrue(pod.Status)
 }
 
-// isPodReady retruns true if a pod is ready; false otherwise.
+// isPodReadyConditionTrue returns true if a pod is ready; false otherwise.
 func isPodReadyConditionTrue(status v1.PodStatus) bool {
 	condition := getPodReadyCondition(status)
 	return condition != nil && condition.Status == v1.ConditionTrue

From 4d63e1f84f45fbd66cb70e7148a9021772b534bb Mon Sep 17 00:00:00 2001
From: Lukas Eichler <lukas@eichler.io>
Date: Sat, 2 Jun 2018 13:05:46 +0200
Subject: [PATCH 16/54] Added documentation for the tpl function

---
 docs/charts_tips_and_tricks.md | 37 ++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/docs/charts_tips_and_tricks.md b/docs/charts_tips_and_tricks.md
index 484d8b936..a83b44457 100644
--- a/docs/charts_tips_and_tricks.md
+++ b/docs/charts_tips_and_tricks.md
@@ -106,6 +106,43 @@ For example:
 The above will render the template when .Values.foo is defined, but will fail
 to render and exit when .Values.foo is undefined.
 
+## Using the 'tpl' Function
+
+The `tpl` function allows developers to evaluate strings as templates inside a template.
+This is useful to pass a template string as a value to a chart or render external configuration files.  
+Syntax: `{{ tpl TEMPLATE_STRING VALUES }}`
+
+Examples:
+```
+# values
+template: "{{ .Values.name }}"
+name: "Tom"
+
+# template
+{{ tpl .Values.template . }}
+
+# output
+Tom
+```
+
+Rendering a external configuration file:
+```
+# external configuration file conf/app.conf
+firstName={{ .Values.firstName }}
+lastName={{ .Values.lastName }}
+
+# values
+firstName: Peter
+lastName: Parker
+
+# template
+{{ tpl (.Files.Get "conf/app.conf") . }}
+
+# output
+firstName=Peter
+lastName=Parker
+```
+
 ## Creating Image Pull Secrets
 Image pull secrets are essentially a combination of _registry_, _username_, and _password_.  You may need them in an application you are deploying, but to create them requires running _base64_ a couple of times.  We can write a helper template to compose the Docker configuration file for use as the Secret's payload.  Here is an example:
 

From 3eaa1bfd3b040cb644c7974d32047dc70037cf95 Mon Sep 17 00:00:00 2001
From: tariq1890 <tariq181290@gmail.com>
Date: Sat, 2 Jun 2018 21:26:50 -0700
Subject: [PATCH 17/54] Setting DisableCompression to true to disable unwanted
 httpclient tranformations

---
 pkg/getter/httpgetter.go           |  14 ++++----
 pkg/getter/httpgetter_test.go      |  53 +++++++++++++++++++++++++++--
 pkg/getter/testdata/sssd-0.1.0.tgz | Bin 0 -> 2736 bytes
 3 files changed, 56 insertions(+), 11 deletions(-)
 create mode 100644 pkg/getter/testdata/sssd-0.1.0.tgz

diff --git a/pkg/getter/httpgetter.go b/pkg/getter/httpgetter.go
index 990cb8cc5..1df6b0f62 100644
--- a/pkg/getter/httpgetter.go
+++ b/pkg/getter/httpgetter.go
@@ -81,19 +81,17 @@ func newHTTPGetter(URL, CertFile, KeyFile, CAFile string) (Getter, error) {
 // NewHTTPGetter constructs a valid http/https client as HttpGetter
 func NewHTTPGetter(URL, CertFile, KeyFile, CAFile string) (*HttpGetter, error) {
 	var client HttpGetter
+	tr := &http.Transport{
+		DisableCompression: true,
+	}
 	if (CertFile != "" && KeyFile != "") || CAFile != "" {
 		tlsConf, err := tlsutil.NewTLSConfig(URL, CertFile, KeyFile, CAFile)
 		if err != nil {
 			return &client, fmt.Errorf("can't create TLS config: %s", err.Error())
 		}
-		client.client = &http.Client{
-			Transport: &http.Transport{
-				TLSClientConfig: tlsConf,
-				Proxy:           http.ProxyFromEnvironment,
-			},
-		}
-	} else {
-		client.client = http.DefaultClient
+		tr.TLSClientConfig = tlsConf
+		tr.Proxy = http.ProxyFromEnvironment
 	}
+	client.client = &http.Client{Transport: tr}
 	return &client, nil
 }
diff --git a/pkg/getter/httpgetter_test.go b/pkg/getter/httpgetter_test.go
index ec730f401..fa4863de8 100644
--- a/pkg/getter/httpgetter_test.go
+++ b/pkg/getter/httpgetter_test.go
@@ -16,21 +16,29 @@ limitations under the License.
 package getter
 
 import (
+	"io"
 	"net/http"
+	"net/http/httptest"
+	"os"
 	"path/filepath"
+	"strconv"
 	"testing"
 )
 
+type TestFileHandler struct{}
+
+func (h *TestFileHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	HandleClient(w, r)
+}
+
 func TestHTTPGetter(t *testing.T) {
 	g, err := newHTTPGetter("http://example.com", "", "", "")
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	if hg, ok := g.(*HttpGetter); !ok {
+	if _, ok := g.(*HttpGetter); !ok {
 		t.Fatal("Expected newHTTPGetter to produce an HttpGetter")
-	} else if hg.client != http.DefaultClient {
-		t.Fatal("Expected newHTTPGetter to return a default HTTP client.")
 	}
 
 	// Test with SSL:
@@ -58,3 +66,42 @@ func TestHTTPGetter(t *testing.T) {
 		t.Fatal("Expected newHTTPGetter to return a non-default HTTP client")
 	}
 }
+
+func HandleClient(writer http.ResponseWriter, request *http.Request) {
+	f, _ := os.Open("testdata/sssd-0.1.0.tgz")
+	defer f.Close()
+
+	b := make([]byte, 512)
+	f.Read(b)
+	//Get the file size
+	FileStat, _ := f.Stat()
+	FileSize := strconv.FormatInt(FileStat.Size(), 10)
+
+	//Simulating improper header values from bitbucket
+	writer.Header().Set("Content-Type", "application/x-tar")
+	writer.Header().Set("Content-Encoding", "gzip")
+	writer.Header().Set("Content-Length", FileSize)
+
+	f.Seek(0, 0)
+	io.Copy(writer, f)
+	return
+}
+
+func TestHTTPGetterTarDownload(t *testing.T) {
+	h := &TestFileHandler{}
+	server := httptest.NewServer(h)
+	defer server.Close()
+
+	g, err := newHTTPGetter(server.URL, "", "", "")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	data, _ := g.Get(server.URL)
+	mimeType := http.DetectContentType(data.Bytes())
+
+	expectedMimeType := "application/x-gzip"
+	if mimeType != expectedMimeType {
+		t.Fatalf("Expected response with MIME type %s, but got %s", expectedMimeType, mimeType)
+	}
+}
diff --git a/pkg/getter/testdata/sssd-0.1.0.tgz b/pkg/getter/testdata/sssd-0.1.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..2f34fece6a1fd4de1852a3057f7a373e3f3070ad
GIT binary patch
literal 2736
zcmV;h3QzSPiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PH&dZyUF-{aJqn=X9@0XP@oZ>6ZiYfFSA6Vr?4CZHJ*499hTn
zY0*iVq;un!=KbvtlFna~yriGC=?0iT*mn{|QlyR&Nm*;N_F+MdOQy6G555I-I-Snb
zy}j_?>2%irJKd-AzS!Q~?ezK&;F}1u4wZG(Jm_@(E}iws{Y!vq{sE2UN~SRB5~}t5
zwb4yF4U(Z{hHDp^4&Wt<5}02vkShbOKp0G|!x9F_D#P6r252Unp@k!grIJL_5>xOC
zjZ9{=J4rX`kncVD4Lk_n|AdMP?Kg7(w|xJ-C;i^~_rLpeZ}a`%2W-I+=Cl$H;vxuN
zwO<qo*@AZkx4<n>`2FC`>sGEzNu9$CaxTy#93d0bAWW#?bR^J%Q!ql%)LP7dOQ&F}
zDgzEnEvQ4A5ModZ&gh}4q)VYo2ruavQvzU6E6bfS(-d;dl%eh5HUJzQrw|A@0-!4)
zPL$wmn!>C6Sh*8}7NsM^qkBqB$()aeUe4j%>Fg4K3`f;?C~$%zh0b}m*X{ULRZ=c(
z3WqO#JthFQc3~+<Ynz~HNr<#Iy^%o9g+ntO8&zqWdI2pqg?E3=v7nM+lTFIpHvhu1
zYDzVsO>2v+Ni}5!HjQRYU1^Q3X_RscdX+`<_sJ1W%bP{lv>ftm=y-{$aw$CNbO@O#
zgg{V<{|BIqp|wM8)P!efQV<!{v8QsyQu~=1?S*#c<ry-A8A`{guqnJV6~?~8uafIV
zT`wm9&#vRm$5I)LsvnkEj)KbOY&_MWK`P2<-Q@7)qTSos6Juy(#uERRup;z(`ont0
z(Hbc{+WxQY&)c83BbT>%+D&$oXZ=pn?e_Neo+RC*pLC!1yXpSn@&1T9R<x8xL;dDy
zn{VImV=Jx@|NNUWXZ73B;l5`b{)?S2AwN+qnw4DI7MBhUWsXnq&YX63wtu)Ax7X(<
zqOz?clpM3xd%rC2&Sm?DZNHEY81tX}p_0xhaUHv7onE@XyR)<NXkmg}8HPi@n$3_=
zi!)o!4IHqd_0{N4WNyd=wKj#&wvJ+v8deNP)M5&6-|xSd{QUou{)X|EDUB&8xg-P6
z{P#Na`-vMmzt(@I!Y(67?jnzXSb7U`IUbry;E>B9D=3%iGc%Z@G4vX8mK9ji6b_D-
z+Lotx!$h30Lq-`ImvNIq8y#yajna3vV~1T}d&><ARpKz?23d5@mE`9yRf$KlrZxQf
z$anCjw)rtFaSdhFRvL{}at%crE*aNUq=4rRrT5|o&KW+c9QN0cuNZc=M&Ft-m7KwQ
z$=!{{T_$mzZ7aj0%Sqeq?z3k}_gO#bJxRK~=V|ZR^X6L5^JKTzyRO3z>341#vg<nn
z&yvd_&r;}iI^Xz|9L|69-MM}I_T7s?;?CXI<Z)a4cjdX;+uQAK&VTm-YxW-&DEzmW
zIQ{iPfm`gq+v)b#?BDNi?0-LSanXJZ6JDlZ(S>upn`+!Iy;@j-DLigpUJ{Q*UYu(x
zvk>xo{|+h-&mkF*kQ%QA8RlFfG(r&J5gX82bcIkOi3umaD?sug2A>}D?F5bC8Nz39
zrjiVv^ui-A2UVW)b7-^{#8778ISO}ZkU9i9=aE-JOyRGJ3Z8S!fNCAYPRMT<sRw-L
zdH5+<7$KvTMX;(w_@x@5k?7FI$>tnIX2AzLf|uL}K~9150n+wp8WeGKJn*<&j=^eV
zI|+G}gF%7R)*53<I)ALL6DXmLJNU$f@KICcV<zguEiZg6?e%)~2&=l~`COH=&bc~g
zI5#5PN#DXQC_N0ar~7v|>5`mtHAE`OuTe*F@LblF)-M*&pB-EdjUR36N84DV7Wsb3
zBD?8%W$`Up)qf~;-03YEEL$&=h$ZL<#ZA@?D2*HEvaIU(T<7fIvk##KWeAO*8qgRv
zzG#x)+ZS!%{$XwZk9m`l>aUp$yk-CI_WD=$|EIm)X8*qrSj+#PahauX7*@d>s!55C
zX4KJ?04(zOt+-4GL^o#Z^pMsmTwKg^eJe+R1THV@v=24zI=tHH%@OOJGoY@z?;4>%
z!yO&3Vbs+Jk2DiJl2<ZM;qy;n=ttl5M|kuO&`>!>czA}>COiyzP`|a!wlR-8<9Trr
z(BSeC_QOlWp7%y)TE9kC(%QRnlGgqWMw*s)Wu$5OpEJ6+m{IqpZNkHtEL^5vrw?bt
zKF0U9CoiJ~Z<BOJ^foC0mgHKI_2Odo_PxKce=@B3|16a3EPmB$@U8J*Z@vE8f7;*F
zf9?gA{Xf;(w&$BbtlkdLU9$;X_1=qsq;}x{=$*mGXJKbR5%QN&%#e_My(IVDB%k%w
zM3$5l(uXVb?y8F~(#M^2GMjSHkFxF<-6v(vQXd~+-ChS~XqMz{Elj=~cr397hy^@o
zc$|6%2u;bNpa++i>6LCr$8dSsSf_NdRNlKXW>NcFm4T_Uq<-CgY_uzD+IGZcs2)O#
zH~v^cwDmoOLnR%ayL71we5f_y0>_xGD8|D?iK@gms*=vG4r*O{G+Ktzk2;~QsMGDi
z>&}lQYsj`5Mbw)RN|j-((=AJOjm@qXh|NxSDXb8_I_7&jrwx2_2rDruP?WKb`Ym|e
zmjB=DUb+9Z+k3j%|L+5~;DkDdMuw{!aSgzy0ws(pE;261peZ|}W3=-dA-2+58E3&3
zC<Kg!8o{iX+4MURb$o)LsVkP+sm#b0NF0Z9IBaW!IX}k?K5<vT4?79Gm0}7?hLK(*
z&}cw#i3v%L2E&0<2FVs2s<KoPJ{%4p<HnL?%w0SDM)659`XAE{zq5v7-1a}SS38mI
z1)&jTXO#}QZ%ZC0_LC-$lMy{5j}upF^7wzr7JQ(FtIEQwqZgJW+NeK~Ig;=UX*=Q>
z_2<9QUxx4h*B1vzZ(by2_HB6FUjJFI|8;wNoBN;l0$VT`42}r-=>PuME}YXgZMQWY
zR|XTV+P*!WS9YMjePe-!YLUvJju*Y}D5<1ltS<=>r@&yT9K!6{0Qci$7VZk6beu&$
zP$Da+<hJyFg%v<8ygoWOX~HjPMrf1;WysG4@zu#eLdYw(B!z_I!5|PlId}u%224&F
zf>WQUiIplFFQ*2^phYzv(~-dN&7;gn-R+b=6-i_+%%l>IYvD!Db2KQOpOrtt%`b)}
zgluiWE9s2ND&{9bNbrp@yB~F7g9I6Bp{Av$qVjOO0wsaM$3=-L>OF0@&*n`DS387>
z$~rVqS?`BEv5zlNlnXQYeLJzm&df*Gj7=2p#Gt{yDsH($OGs<Es8y40&Z`vvz28lq
z*R!&Y3Nd3D4*i6@Q@~@#QWYb(?v)bPX*q4x4W}tNJv|*!TM#eje0ZznF|DQy_ZQf8
z^KwhL`*(VJN`6-rFe*XKib+wgq4H#-5L5!qGVU!wMSaAr;?1kz*}sM?(8{5lM%p1i
z5`^<AdoTG-N~>mF(1r{Jx|J32Xu;yqnus;>0wHpHr(lc@4A1;>nwi6(Rh40An^0K<
qU77LvlxupeR_I)(`@Q|p1~#yP4Q$|k;r{{v0RR8?Fq}33HUI!%P-8y;

literal 0
HcmV?d00001


From e4a80cdc3b12a7a31437a155bd00c7efab7130a8 Mon Sep 17 00:00:00 2001
From: andrzejwp <andrzej.wytyczak-partyka@pwr.wroc.pl>
Date: Tue, 5 Jun 2018 15:19:46 +0200
Subject: [PATCH 18/54] Add link to cdwv/awesome-helm

---
 docs/related.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/related.md b/docs/related.md
index 997e3f01d..bf55df549 100644
--- a/docs/related.md
+++ b/docs/related.md
@@ -16,6 +16,7 @@ or [pull request](https://github.com/kubernetes/helm/pulls).
 - [GitLab, Consumer Driven Contracts, Helm and Kubernetes](https://medium.com/@enxebre/gitlab-consumer-driven-contracts-helm-and-kubernetes-b7235a60a1cb#.xwp1y4tgi)
 - [Writing a Helm Chart](https://www.influxdata.com/packaged-kubernetes-deployments-writing-helm-chart/)
 - [Creating a Helm Plugin in 3 Steps](http://technosophos.com/2017/03/21/creating-a-helm-plugin.html)
+- [Awesome Helm](https://github.com/cdwv/awesome-helm) - List of awesome Helm resources
 
 ## Video, Audio, and Podcast
 

From ddd1f48c40e0afb7ec44ee08ca365d113b4d2d49 Mon Sep 17 00:00:00 2001
From: mattjmcnaughton <mattjmcnaughton@gmail.com>
Date: Tue, 5 Jun 2018 09:48:11 -0400
Subject: [PATCH 19/54] Increase error message specificity for name reuse

If `helm upgrade` fails because a reused name is still in use, the error
message does not specify which name is still in use. Update the error
message.
---
 pkg/tiller/release_server.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/tiller/release_server.go b/pkg/tiller/release_server.go
index 1a2b3c4da..a75b7fc86 100644
--- a/pkg/tiller/release_server.go
+++ b/pkg/tiller/release_server.go
@@ -190,7 +190,7 @@ func (s *ReleaseServer) uniqName(start string, reuse bool) (string, error) {
 			s.Log("name %s exists but is not in use, reusing name", start)
 			return start, nil
 		} else if reuse {
-			return "", errors.New("cannot re-use a name that is still in use")
+			return "", fmt.Errorf("a released named %s is in use, cannot re-use a name that is still in use", start)
 		}
 
 		return "", fmt.Errorf("a release named %s already exists.\nRun: helm ls --all %s; to check the status of the release\nOr run: helm del --purge %s; to delete it", start, start, start)

From 8389fe1d58a35757762acb194b4ecf878dcb0849 Mon Sep 17 00:00:00 2001
From: Arash Deshmeh <adeshmeh@ca.ibm.com>
Date: Tue, 3 Apr 2018 17:13:14 -0400
Subject: [PATCH 20/54] added description field to api types
 UpdateReleaseRequest, InstallReleaseRequest, UninstallReleaseRequest, and
 RollbackReleaseRequest

Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
---
 _proto/hapi/services/tiller.proto    |   9 ++
 pkg/proto/hapi/services/tiller.pb.go | 196 ++++++++++++++++-----------
 2 files changed, 126 insertions(+), 79 deletions(-)

diff --git a/_proto/hapi/services/tiller.proto b/_proto/hapi/services/tiller.proto
index 8daef0cb3..95391cb1a 100644
--- a/_proto/hapi/services/tiller.proto
+++ b/_proto/hapi/services/tiller.proto
@@ -209,6 +209,8 @@ message UpdateReleaseRequest {
 	bool reuse_values = 10;
 	// Force resource update through delete/recreate if needed.
 	bool force = 11;
+	// Description, if set, will set the description for the updated release
+	string description = 12;
 }
 
 // UpdateReleaseResponse is the response to an update request.
@@ -234,6 +236,8 @@ message RollbackReleaseRequest {
 	bool wait = 7;
 	// Force resource update through delete/recreate if needed.
 	bool force = 8;
+	// Description, if set, will set the description for the rollback
+	string description = 9;
 }
 
 // RollbackReleaseResponse is the response to an update request.
@@ -273,6 +277,9 @@ message InstallReleaseRequest {
 	bool wait = 9;
 
 	bool disable_crd_hook = 10;
+
+	// Description, if set, will set the description for the installed release
+	string description = 11;
 }
 
 // InstallReleaseResponse is the response from a release installation.
@@ -290,6 +297,8 @@ message UninstallReleaseRequest {
 	bool purge = 3;
 	// timeout specifies the max amount of time any kubernetes client command can run.
 	int64 timeout = 4;
+	// Description, if set, will set the description for the uninnstalled release
+	string description = 5;
 }
 
 // UninstallReleaseResponse represents a successful response to an uninstall request.
diff --git a/pkg/proto/hapi/services/tiller.pb.go b/pkg/proto/hapi/services/tiller.pb.go
index 4d23bcdad..c0b9ab7d3 100644
--- a/pkg/proto/hapi/services/tiller.pb.go
+++ b/pkg/proto/hapi/services/tiller.pb.go
@@ -376,6 +376,8 @@ type UpdateReleaseRequest struct {
 	ReuseValues bool `protobuf:"varint,10,opt,name=reuse_values,json=reuseValues" json:"reuse_values,omitempty"`
 	// Force resource update through delete/recreate if needed.
 	Force bool `protobuf:"varint,11,opt,name=force" json:"force,omitempty"`
+	// Description, if set, will set the description for the updated release
+	Description string `protobuf:"bytes,12,opt,name=description" json:"description,omitempty"`
 }
 
 func (m *UpdateReleaseRequest) Reset()                    { *m = UpdateReleaseRequest{} }
@@ -460,6 +462,13 @@ func (m *UpdateReleaseRequest) GetForce() bool {
 	return false
 }
 
+func (m *UpdateReleaseRequest) GetDescription() string {
+	if m != nil {
+		return m.Description
+	}
+	return ""
+}
+
 // UpdateReleaseResponse is the response to an update request.
 type UpdateReleaseResponse struct {
 	Release *hapi_release5.Release `protobuf:"bytes,1,opt,name=release" json:"release,omitempty"`
@@ -495,6 +504,8 @@ type RollbackReleaseRequest struct {
 	Wait bool `protobuf:"varint,7,opt,name=wait" json:"wait,omitempty"`
 	// Force resource update through delete/recreate if needed.
 	Force bool `protobuf:"varint,8,opt,name=force" json:"force,omitempty"`
+	// Description, if set, will set the description for the rollback
+	Description string `protobuf:"bytes,9,opt,name=description" json:"description,omitempty"`
 }
 
 func (m *RollbackReleaseRequest) Reset()                    { *m = RollbackReleaseRequest{} }
@@ -558,6 +569,13 @@ func (m *RollbackReleaseRequest) GetForce() bool {
 	return false
 }
 
+func (m *RollbackReleaseRequest) GetDescription() string {
+	if m != nil {
+		return m.Description
+	}
+	return ""
+}
+
 // RollbackReleaseResponse is the response to an update request.
 type RollbackReleaseResponse struct {
 	Release *hapi_release5.Release `protobuf:"bytes,1,opt,name=release" json:"release,omitempty"`
@@ -601,6 +619,8 @@ type InstallReleaseRequest struct {
 	// before marking the release as successful. It will wait for as long as timeout
 	Wait           bool `protobuf:"varint,9,opt,name=wait" json:"wait,omitempty"`
 	DisableCrdHook bool `protobuf:"varint,10,opt,name=disable_crd_hook,json=disableCrdHook" json:"disable_crd_hook,omitempty"`
+	// Description, if set, will set the description for the installed release
+	Description string `protobuf:"bytes,11,opt,name=description" json:"description,omitempty"`
 }
 
 func (m *InstallReleaseRequest) Reset()                    { *m = InstallReleaseRequest{} }
@@ -678,6 +698,13 @@ func (m *InstallReleaseRequest) GetDisableCrdHook() bool {
 	return false
 }
 
+func (m *InstallReleaseRequest) GetDescription() string {
+	if m != nil {
+		return m.Description
+	}
+	return ""
+}
+
 // InstallReleaseResponse is the response from a release installation.
 type InstallReleaseResponse struct {
 	Release *hapi_release5.Release `protobuf:"bytes,1,opt,name=release" json:"release,omitempty"`
@@ -705,6 +732,8 @@ type UninstallReleaseRequest struct {
 	Purge bool `protobuf:"varint,3,opt,name=purge" json:"purge,omitempty"`
 	// timeout specifies the max amount of time any kubernetes client command can run.
 	Timeout int64 `protobuf:"varint,4,opt,name=timeout" json:"timeout,omitempty"`
+	// Description, if set, will set the description for the uninnstalled release
+	Description string `protobuf:"bytes,5,opt,name=description" json:"description,omitempty"`
 }
 
 func (m *UninstallReleaseRequest) Reset()                    { *m = UninstallReleaseRequest{} }
@@ -740,6 +769,13 @@ func (m *UninstallReleaseRequest) GetTimeout() int64 {
 	return 0
 }
 
+func (m *UninstallReleaseRequest) GetDescription() string {
+	if m != nil {
+		return m.Description
+	}
+	return ""
+}
+
 // UninstallReleaseResponse represents a successful response to an uninstall request.
 type UninstallReleaseResponse struct {
 	// Release is the release that was marked deleted.
@@ -1376,83 +1412,85 @@ var _ReleaseService_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("hapi/services/tiller.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 1235 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0xdd, 0x6e, 0xe3, 0xc4,
-	0x17, 0xaf, 0xf3, 0x9d, 0x93, 0x6e, 0xfe, 0xd9, 0x69, 0xda, 0xba, 0xfe, 0x2f, 0xa8, 0x18, 0xc1,
-	0x66, 0x17, 0x36, 0x85, 0xc0, 0x0d, 0x12, 0x42, 0xea, 0x66, 0xa3, 0xb6, 0x50, 0xba, 0x92, 0xb3,
-	0x5d, 0x24, 0x04, 0x44, 0x6e, 0x32, 0x69, 0xcd, 0x3a, 0x76, 0xf0, 0x8c, 0xcb, 0xf6, 0x96, 0x3b,
-	0xde, 0x8a, 0x77, 0xe0, 0x92, 0x4b, 0x78, 0x10, 0x34, 0x5f, 0xae, 0x27, 0xb5, 0x5b, 0xd3, 0x9b,
-	0x78, 0x66, 0xce, 0xf7, 0xef, 0x9c, 0x39, 0x73, 0x02, 0xd6, 0x85, 0xbb, 0xf4, 0xf6, 0x08, 0x8e,
-	0x2e, 0xbd, 0x29, 0x26, 0x7b, 0xd4, 0xf3, 0x7d, 0x1c, 0xf5, 0x97, 0x51, 0x48, 0x43, 0xd4, 0x65,
-	0xb4, 0xbe, 0xa2, 0xf5, 0x05, 0xcd, 0xda, 0xe2, 0x12, 0xd3, 0x0b, 0x37, 0xa2, 0xe2, 0x57, 0x70,
-	0x5b, 0xdb, 0xe9, 0xf3, 0x30, 0x98, 0x7b, 0xe7, 0x92, 0x20, 0x4c, 0x44, 0xd8, 0xc7, 0x2e, 0xc1,
-	0xea, 0xab, 0x09, 0x29, 0x9a, 0x17, 0xcc, 0x43, 0x49, 0xf8, 0xbf, 0x46, 0xa0, 0x98, 0xd0, 0x49,
-	0x14, 0x07, 0x92, 0xb8, 0xa3, 0x11, 0x09, 0x75, 0x69, 0x4c, 0x34, 0x63, 0x97, 0x38, 0x22, 0x5e,
-	0x18, 0xa8, 0xaf, 0xa0, 0xd9, 0x7f, 0x94, 0x60, 0xe3, 0xd8, 0x23, 0xd4, 0x11, 0x82, 0xc4, 0xc1,
-	0xbf, 0xc4, 0x98, 0x50, 0xd4, 0x85, 0xaa, 0xef, 0x2d, 0x3c, 0x6a, 0x1a, 0xbb, 0x46, 0xaf, 0xec,
-	0x88, 0x0d, 0xda, 0x82, 0x5a, 0x38, 0x9f, 0x13, 0x4c, 0xcd, 0xd2, 0xae, 0xd1, 0x6b, 0x3a, 0x72,
-	0x87, 0xbe, 0x82, 0x3a, 0x09, 0x23, 0x3a, 0x39, 0xbb, 0x32, 0xcb, 0xbb, 0x46, 0xaf, 0x3d, 0xf8,
-	0xa0, 0x9f, 0x85, 0x53, 0x9f, 0x59, 0x1a, 0x87, 0x11, 0xed, 0xb3, 0x9f, 0xe7, 0x57, 0x4e, 0x8d,
-	0xf0, 0x2f, 0xd3, 0x3b, 0xf7, 0x7c, 0x8a, 0x23, 0xb3, 0x22, 0xf4, 0x8a, 0x1d, 0x3a, 0x00, 0xe0,
-	0x7a, 0xc3, 0x68, 0x86, 0x23, 0xb3, 0xca, 0x55, 0xf7, 0x0a, 0xa8, 0x7e, 0xc9, 0xf8, 0x9d, 0x26,
-	0x51, 0x4b, 0xf4, 0x25, 0xac, 0x0b, 0x48, 0x26, 0xd3, 0x70, 0x86, 0x89, 0x59, 0xdb, 0x2d, 0xf7,
-	0xda, 0x83, 0x1d, 0xa1, 0x4a, 0xc1, 0x3f, 0x16, 0xa0, 0x0d, 0xc3, 0x19, 0x76, 0x5a, 0x82, 0x9d,
-	0xad, 0x09, 0x7a, 0x04, 0xcd, 0xc0, 0x5d, 0x60, 0xb2, 0x74, 0xa7, 0xd8, 0xac, 0x73, 0x0f, 0xaf,
-	0x0f, 0xec, 0x9f, 0xa0, 0xa1, 0x8c, 0xdb, 0x03, 0xa8, 0x89, 0xd0, 0x50, 0x0b, 0xea, 0xa7, 0x27,
-	0xdf, 0x9c, 0xbc, 0xfc, 0xee, 0xa4, 0xb3, 0x86, 0x1a, 0x50, 0x39, 0xd9, 0xff, 0x76, 0xd4, 0x31,
-	0xd0, 0x43, 0x78, 0x70, 0xbc, 0x3f, 0x7e, 0x35, 0x71, 0x46, 0xc7, 0xa3, 0xfd, 0xf1, 0xe8, 0x45,
-	0xa7, 0x64, 0xbf, 0x0b, 0xcd, 0xc4, 0x67, 0x54, 0x87, 0xf2, 0xfe, 0x78, 0x28, 0x44, 0x5e, 0x8c,
-	0xc6, 0xc3, 0x8e, 0x61, 0xff, 0x6e, 0x40, 0x57, 0x4f, 0x11, 0x59, 0x86, 0x01, 0xc1, 0x2c, 0x47,
-	0xd3, 0x30, 0x0e, 0x92, 0x1c, 0xf1, 0x0d, 0x42, 0x50, 0x09, 0xf0, 0x5b, 0x95, 0x21, 0xbe, 0x66,
-	0x9c, 0x34, 0xa4, 0xae, 0xcf, 0xb3, 0x53, 0x76, 0xc4, 0x06, 0x7d, 0x0a, 0x0d, 0x19, 0x3a, 0x31,
-	0x2b, 0xbb, 0xe5, 0x5e, 0x6b, 0xb0, 0xa9, 0x03, 0x22, 0x2d, 0x3a, 0x09, 0x9b, 0x7d, 0x00, 0xdb,
-	0x07, 0x58, 0x79, 0x22, 0xf0, 0x52, 0x15, 0xc3, 0xec, 0xba, 0x0b, 0xcc, 0x9d, 0x61, 0x76, 0xdd,
-	0x05, 0x46, 0x26, 0xd4, 0x65, 0xb9, 0x71, 0x77, 0xaa, 0x8e, 0xda, 0xda, 0x14, 0xcc, 0x9b, 0x8a,
-	0x64, 0x5c, 0x59, 0x9a, 0x3e, 0x84, 0x0a, 0xbb, 0x09, 0x5c, 0x4d, 0x6b, 0x80, 0x74, 0x3f, 0x8f,
-	0x82, 0x79, 0xe8, 0x70, 0xba, 0x9e, 0xaa, 0xf2, 0x6a, 0xaa, 0x0e, 0xd3, 0x56, 0x87, 0x61, 0x40,
-	0x71, 0x40, 0xef, 0xe7, 0xff, 0x31, 0xec, 0x64, 0x68, 0x92, 0x01, 0xec, 0x41, 0x5d, 0xba, 0xc6,
-	0xb5, 0xe5, 0xe2, 0xaa, 0xb8, 0xec, 0xbf, 0x4b, 0xd0, 0x3d, 0x5d, 0xce, 0x5c, 0x8a, 0x15, 0xe9,
-	0x16, 0xa7, 0x1e, 0x43, 0x95, 0x77, 0x14, 0x89, 0xc5, 0x43, 0xa1, 0x5b, 0xb4, 0x9d, 0x21, 0xfb,
-	0x75, 0x04, 0x1d, 0x3d, 0x85, 0xda, 0xa5, 0xeb, 0xc7, 0x98, 0x70, 0x20, 0x12, 0xd4, 0x24, 0x27,
-	0x6f, 0x47, 0x8e, 0xe4, 0x40, 0xdb, 0x50, 0x9f, 0x45, 0x57, 0xac, 0x9f, 0xf0, 0x2b, 0xd8, 0x70,
-	0x6a, 0xb3, 0xe8, 0xca, 0x89, 0x03, 0xf4, 0x3e, 0x3c, 0x98, 0x79, 0xc4, 0x3d, 0xf3, 0xf1, 0xe4,
-	0x22, 0x0c, 0xdf, 0x10, 0x7e, 0x0b, 0x1b, 0xce, 0xba, 0x3c, 0x3c, 0x64, 0x67, 0xc8, 0x62, 0x95,
-	0x34, 0x8d, 0xb0, 0x4b, 0xb1, 0x59, 0xe3, 0xf4, 0x64, 0xcf, 0x30, 0xa4, 0xde, 0x02, 0x87, 0x31,
-	0xe5, 0x57, 0xa7, 0xec, 0xa8, 0x2d, 0x7a, 0x0f, 0xd6, 0x23, 0x4c, 0x30, 0x9d, 0x48, 0x2f, 0x1b,
-	0x5c, 0xb2, 0xc5, 0xcf, 0x5e, 0x0b, 0xb7, 0x10, 0x54, 0x7e, 0x75, 0x3d, 0x6a, 0x36, 0x39, 0x89,
-	0xaf, 0x85, 0x58, 0x4c, 0xb0, 0x12, 0x03, 0x25, 0x16, 0x13, 0x2c, 0xc5, 0xba, 0x50, 0x9d, 0x87,
-	0xd1, 0x14, 0x9b, 0x2d, 0x4e, 0x13, 0x1b, 0xfb, 0x10, 0x36, 0x57, 0x40, 0xbe, 0x6f, 0xbe, 0xfe,
-	0x31, 0x60, 0xcb, 0x09, 0x7d, 0xff, 0xcc, 0x9d, 0xbe, 0x29, 0x90, 0xb1, 0x14, 0xb8, 0xa5, 0xdb,
-	0xc1, 0x2d, 0x67, 0x80, 0x9b, 0x2a, 0xc2, 0x8a, 0x56, 0x84, 0x1a, 0xec, 0xd5, 0x7c, 0xd8, 0x6b,
-	0x3a, 0xec, 0x0a, 0xd3, 0x7a, 0x0a, 0xd3, 0x04, 0xb0, 0x46, 0x1a, 0xb0, 0xaf, 0x61, 0xfb, 0x46,
-	0x94, 0xf7, 0x85, 0xec, 0xcf, 0x12, 0x6c, 0x1e, 0x05, 0x84, 0xba, 0xbe, 0xbf, 0x82, 0x58, 0x52,
-	0xcf, 0x46, 0xe1, 0x7a, 0x2e, 0xfd, 0x97, 0x7a, 0x2e, 0x6b, 0x90, 0xab, 0xfc, 0x54, 0x52, 0xf9,
-	0x29, 0x54, 0xe3, 0x5a, 0x67, 0xa9, 0xad, 0x74, 0x16, 0xf4, 0x0e, 0x80, 0x28, 0x4a, 0xae, 0x5c,
-	0x40, 0xdb, 0xe4, 0x27, 0x27, 0xb2, 0x91, 0xa8, 0x6c, 0x34, 0xb2, 0xb3, 0x91, 0xae, 0xf0, 0x1e,
-	0x74, 0x94, 0x3f, 0xd3, 0x68, 0xc6, 0x7d, 0x92, 0x55, 0xde, 0x96, 0xe7, 0xc3, 0x68, 0xc6, 0xbc,
-	0xb2, 0x8f, 0x60, 0x6b, 0x15, 0xd4, 0xfb, 0x26, 0xe8, 0x37, 0x03, 0xb6, 0x4f, 0x03, 0x2f, 0x33,
-	0x45, 0x59, 0x45, 0x7d, 0x03, 0xb4, 0x52, 0x06, 0x68, 0x5d, 0xa8, 0x2e, 0xe3, 0xe8, 0x1c, 0xcb,
-	0x24, 0x88, 0x4d, 0x1a, 0x8d, 0x8a, 0x86, 0x86, 0x3d, 0x01, 0xf3, 0xa6, 0x0f, 0xf7, 0x8c, 0x88,
-	0x79, 0x9d, 0xbc, 0x19, 0x4d, 0xf1, 0x3e, 0xd8, 0x1b, 0xf0, 0xf0, 0x00, 0xd3, 0xd7, 0xe2, 0x02,
-	0xc9, 0xf0, 0xec, 0x11, 0xa0, 0xf4, 0xe1, 0xb5, 0x3d, 0x79, 0xa4, 0xdb, 0x53, 0x03, 0x94, 0xe2,
-	0x57, 0x5c, 0xf6, 0x17, 0x5c, 0xf7, 0xa1, 0x47, 0x68, 0x18, 0x5d, 0xdd, 0x06, 0x5d, 0x07, 0xca,
-	0x0b, 0xf7, 0xad, 0x7c, 0x52, 0xd8, 0xd2, 0x3e, 0xe0, 0x1e, 0x24, 0xa2, 0xd2, 0x83, 0xf4, 0x03,
-	0x6d, 0x14, 0x7b, 0xa0, 0x7f, 0x00, 0xf4, 0x0a, 0x27, 0xb3, 0xc2, 0x1d, 0x6f, 0x9b, 0x4a, 0x42,
-	0x49, 0x2f, 0x49, 0x13, 0xea, 0x53, 0x1f, 0xbb, 0x41, 0xbc, 0x94, 0x69, 0x53, 0x5b, 0xfb, 0x47,
-	0xd8, 0xd0, 0xb4, 0x4b, 0x3f, 0x59, 0x3c, 0xe4, 0x5c, 0x6a, 0x67, 0x4b, 0xf4, 0x39, 0xd4, 0xc4,
-	0x00, 0xc5, 0x75, 0xb7, 0x07, 0x8f, 0x74, 0xbf, 0xb9, 0x92, 0x38, 0x90, 0x13, 0x97, 0x23, 0x79,
-	0x07, 0x7f, 0x35, 0xa0, 0xad, 0x46, 0x02, 0x31, 0xde, 0x21, 0x0f, 0xd6, 0xd3, 0xb3, 0x0f, 0x7a,
-	0x92, 0x3f, 0xfd, 0xad, 0x8c, 0xb0, 0xd6, 0xd3, 0x22, 0xac, 0x22, 0x02, 0x7b, 0xed, 0x13, 0x03,
-	0x11, 0xe8, 0xac, 0x8e, 0x24, 0xe8, 0x59, 0xb6, 0x8e, 0x9c, 0x19, 0xc8, 0xea, 0x17, 0x65, 0x57,
-	0x66, 0xd1, 0x25, 0xaf, 0x19, 0x7d, 0x8e, 0x40, 0x77, 0xaa, 0xd1, 0x47, 0x17, 0x6b, 0xaf, 0x30,
-	0x7f, 0x62, 0xf7, 0x67, 0x78, 0xa0, 0xbd, 0x85, 0x28, 0x07, 0xad, 0xac, 0xa9, 0xc4, 0xfa, 0xa8,
-	0x10, 0x6f, 0x62, 0x6b, 0x01, 0x6d, 0xbd, 0x49, 0xa1, 0x1c, 0x05, 0x99, 0xef, 0x83, 0xf5, 0x71,
-	0x31, 0xe6, 0xc4, 0x1c, 0x81, 0xce, 0x6a, 0x0f, 0xc9, 0xcb, 0x63, 0x4e, 0xbf, 0xcb, 0xcb, 0x63,
-	0x5e, 0x6b, 0xb2, 0xd7, 0x90, 0x0b, 0x70, 0xdd, 0x42, 0xd0, 0xe3, 0xdc, 0x84, 0xe8, 0x9d, 0xc7,
-	0xea, 0xdd, 0xcd, 0x98, 0x98, 0x58, 0xc2, 0xff, 0x56, 0x5e, 0x63, 0x94, 0x03, 0x4d, 0xf6, 0x68,
-	0x62, 0x3d, 0x2b, 0xc8, 0xbd, 0x12, 0x94, 0xec, 0x4a, 0xb7, 0x04, 0xa5, 0xb7, 0xbc, 0x5b, 0x82,
-	0x5a, 0x69, 0x70, 0xf6, 0x1a, 0xf2, 0xa0, 0xed, 0xc4, 0x81, 0x34, 0xcd, 0xda, 0x02, 0xca, 0x91,
-	0xbe, 0xd9, 0xd5, 0xac, 0x27, 0x05, 0x38, 0xaf, 0xef, 0xf7, 0x73, 0xf8, 0xbe, 0xa1, 0x58, 0xcf,
-	0x6a, 0xfc, 0xdf, 0xef, 0x67, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x5d, 0xc3, 0xd5, 0x55, 0xeb,
-	0x0f, 0x00, 0x00,
+	// 1267 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0xed, 0x6e, 0xe3, 0x44,
+	0x17, 0x6e, 0xe2, 0x7c, 0x9e, 0x74, 0xf3, 0x66, 0x67, 0xb3, 0xad, 0xeb, 0x77, 0x41, 0xc1, 0x08,
+	0x36, 0xbb, 0xb0, 0x29, 0x04, 0xfe, 0x20, 0x21, 0xa4, 0x6e, 0x36, 0x6a, 0x0b, 0xa5, 0x2b, 0x39,
+	0xdb, 0x45, 0x42, 0x40, 0xe4, 0x26, 0x93, 0xd6, 0xac, 0x63, 0x07, 0xcf, 0xb8, 0x6c, 0x2f, 0x00,
+	0x24, 0xee, 0x83, 0x0b, 0xe1, 0x3e, 0xb8, 0x0e, 0xfe, 0x23, 0xcf, 0x87, 0xeb, 0x71, 0xec, 0xd4,
+	0xf4, 0x4f, 0xe3, 0x99, 0x73, 0xe6, 0x7c, 0x3c, 0xcf, 0x9c, 0x33, 0xa7, 0x60, 0x5c, 0xda, 0x2b,
+	0x67, 0x9f, 0xe0, 0xe0, 0xca, 0x99, 0x61, 0xb2, 0x4f, 0x1d, 0xd7, 0xc5, 0xc1, 0x60, 0x15, 0xf8,
+	0xd4, 0x47, 0xdd, 0x48, 0x36, 0x90, 0xb2, 0x01, 0x97, 0x19, 0x3b, 0xec, 0xc4, 0xec, 0xd2, 0x0e,
+	0x28, 0xff, 0xcb, 0xb5, 0x8d, 0xdd, 0xe4, 0xbe, 0xef, 0x2d, 0x9c, 0x0b, 0x21, 0xe0, 0x2e, 0x02,
+	0xec, 0x62, 0x9b, 0x60, 0xf9, 0xab, 0x1c, 0x92, 0x32, 0xc7, 0x5b, 0xf8, 0x42, 0xf0, 0x7f, 0x45,
+	0x40, 0x31, 0xa1, 0xd3, 0x20, 0xf4, 0x84, 0x70, 0x4f, 0x11, 0x12, 0x6a, 0xd3, 0x90, 0x28, 0xce,
+	0xae, 0x70, 0x40, 0x1c, 0xdf, 0x93, 0xbf, 0x5c, 0x66, 0xfe, 0x55, 0x86, 0x07, 0x27, 0x0e, 0xa1,
+	0x16, 0x3f, 0x48, 0x2c, 0xfc, 0x4b, 0x88, 0x09, 0x45, 0x5d, 0xa8, 0xba, 0xce, 0xd2, 0xa1, 0x7a,
+	0xa9, 0x57, 0xea, 0x6b, 0x16, 0x5f, 0xa0, 0x1d, 0xa8, 0xf9, 0x8b, 0x05, 0xc1, 0x54, 0x2f, 0xf7,
+	0x4a, 0xfd, 0xa6, 0x25, 0x56, 0xe8, 0x2b, 0xa8, 0x13, 0x3f, 0xa0, 0xd3, 0xf3, 0x6b, 0x5d, 0xeb,
+	0x95, 0xfa, 0xed, 0xe1, 0x07, 0x83, 0x2c, 0x9c, 0x06, 0x91, 0xa7, 0x89, 0x1f, 0xd0, 0x41, 0xf4,
+	0xe7, 0xf9, 0xb5, 0x55, 0x23, 0xec, 0x37, 0xb2, 0xbb, 0x70, 0x5c, 0x8a, 0x03, 0xbd, 0xc2, 0xed,
+	0xf2, 0x15, 0x3a, 0x04, 0x60, 0x76, 0xfd, 0x60, 0x8e, 0x03, 0xbd, 0xca, 0x4c, 0xf7, 0x0b, 0x98,
+	0x7e, 0x19, 0xe9, 0x5b, 0x4d, 0x22, 0x3f, 0xd1, 0x97, 0xb0, 0xcd, 0x21, 0x99, 0xce, 0xfc, 0x39,
+	0x26, 0x7a, 0xad, 0xa7, 0xf5, 0xdb, 0xc3, 0x3d, 0x6e, 0x4a, 0xc2, 0x3f, 0xe1, 0xa0, 0x8d, 0xfc,
+	0x39, 0xb6, 0x5a, 0x5c, 0x3d, 0xfa, 0x26, 0xe8, 0x11, 0x34, 0x3d, 0x7b, 0x89, 0xc9, 0xca, 0x9e,
+	0x61, 0xbd, 0xce, 0x22, 0xbc, 0xd9, 0x30, 0x7f, 0x82, 0x86, 0x74, 0x6e, 0x0e, 0xa1, 0xc6, 0x53,
+	0x43, 0x2d, 0xa8, 0x9f, 0x9d, 0x7e, 0x73, 0xfa, 0xf2, 0xbb, 0xd3, 0xce, 0x16, 0x6a, 0x40, 0xe5,
+	0xf4, 0xe0, 0xdb, 0x71, 0xa7, 0x84, 0xee, 0xc3, 0xbd, 0x93, 0x83, 0xc9, 0xab, 0xa9, 0x35, 0x3e,
+	0x19, 0x1f, 0x4c, 0xc6, 0x2f, 0x3a, 0x65, 0xf3, 0x5d, 0x68, 0xc6, 0x31, 0xa3, 0x3a, 0x68, 0x07,
+	0x93, 0x11, 0x3f, 0xf2, 0x62, 0x3c, 0x19, 0x75, 0x4a, 0xe6, 0x1f, 0x25, 0xe8, 0xaa, 0x14, 0x91,
+	0x95, 0xef, 0x11, 0x1c, 0x71, 0x34, 0xf3, 0x43, 0x2f, 0xe6, 0x88, 0x2d, 0x10, 0x82, 0x8a, 0x87,
+	0xdf, 0x4a, 0x86, 0xd8, 0x77, 0xa4, 0x49, 0x7d, 0x6a, 0xbb, 0x8c, 0x1d, 0xcd, 0xe2, 0x0b, 0xf4,
+	0x29, 0x34, 0x44, 0xea, 0x44, 0xaf, 0xf4, 0xb4, 0x7e, 0x6b, 0xf8, 0x50, 0x05, 0x44, 0x78, 0xb4,
+	0x62, 0x35, 0xf3, 0x10, 0x76, 0x0f, 0xb1, 0x8c, 0x84, 0xe3, 0x25, 0x6f, 0x4c, 0xe4, 0xd7, 0x5e,
+	0x62, 0x16, 0x4c, 0xe4, 0xd7, 0x5e, 0x62, 0xa4, 0x43, 0x5d, 0x5c, 0x37, 0x16, 0x4e, 0xd5, 0x92,
+	0x4b, 0x93, 0x82, 0xbe, 0x6e, 0x48, 0xe4, 0x95, 0x65, 0xe9, 0x43, 0xa8, 0x44, 0x95, 0xc0, 0xcc,
+	0xb4, 0x86, 0x48, 0x8d, 0xf3, 0xd8, 0x5b, 0xf8, 0x16, 0x93, 0xab, 0x54, 0x69, 0x69, 0xaa, 0x8e,
+	0x92, 0x5e, 0x47, 0xbe, 0x47, 0xb1, 0x47, 0xef, 0x16, 0xff, 0x09, 0xec, 0x65, 0x58, 0x12, 0x09,
+	0xec, 0x43, 0x5d, 0x84, 0xc6, 0xac, 0xe5, 0xe2, 0x2a, 0xb5, 0xcc, 0xdf, 0x34, 0xe8, 0x9e, 0xad,
+	0xe6, 0x36, 0xc5, 0x52, 0xb4, 0x21, 0xa8, 0xc7, 0x50, 0x65, 0x1d, 0x45, 0x60, 0x71, 0x9f, 0xdb,
+	0xe6, 0x6d, 0x67, 0x14, 0xfd, 0xb5, 0xb8, 0x1c, 0x3d, 0x85, 0xda, 0x95, 0xed, 0x86, 0x98, 0x30,
+	0x20, 0x62, 0xd4, 0x84, 0x26, 0x6b, 0x47, 0x96, 0xd0, 0x40, 0xbb, 0x50, 0x9f, 0x07, 0xd7, 0x51,
+	0x3f, 0x61, 0x25, 0xd8, 0xb0, 0x6a, 0xf3, 0xe0, 0xda, 0x0a, 0x3d, 0xf4, 0x3e, 0xdc, 0x9b, 0x3b,
+	0xc4, 0x3e, 0x77, 0xf1, 0xf4, 0xd2, 0xf7, 0xdf, 0x10, 0x56, 0x85, 0x0d, 0x6b, 0x5b, 0x6c, 0x1e,
+	0x45, 0x7b, 0xc8, 0x88, 0x6e, 0xd2, 0x2c, 0xc0, 0x36, 0xc5, 0x7a, 0x8d, 0xc9, 0xe3, 0x75, 0x84,
+	0x21, 0x75, 0x96, 0xd8, 0x0f, 0x29, 0x2b, 0x1d, 0xcd, 0x92, 0x4b, 0xf4, 0x1e, 0x6c, 0x07, 0x98,
+	0x60, 0x3a, 0x15, 0x51, 0x36, 0xd8, 0xc9, 0x16, 0xdb, 0x7b, 0xcd, 0xc3, 0x42, 0x50, 0xf9, 0xd5,
+	0x76, 0xa8, 0xde, 0x64, 0x22, 0xf6, 0xcd, 0x8f, 0x85, 0x04, 0xcb, 0x63, 0x20, 0x8f, 0x85, 0x04,
+	0x8b, 0x63, 0x5d, 0xa8, 0x2e, 0xfc, 0x60, 0x86, 0xf5, 0x16, 0x93, 0xf1, 0x05, 0xea, 0x41, 0x6b,
+	0x8e, 0xc9, 0x2c, 0x70, 0x56, 0x34, 0x62, 0x74, 0x9b, 0x61, 0x9a, 0xdc, 0x32, 0x8f, 0xe0, 0x61,
+	0x8a, 0x86, 0xbb, 0x32, 0xfa, 0x7b, 0x19, 0x76, 0x2c, 0xdf, 0x75, 0xcf, 0xed, 0xd9, 0x9b, 0x02,
+	0x9c, 0x26, 0xe0, 0x2f, 0x6f, 0x86, 0x5f, 0xcb, 0x80, 0x3f, 0x71, 0x4d, 0x2b, 0xca, 0x35, 0x55,
+	0x88, 0xa9, 0xe6, 0x13, 0x53, 0x53, 0x89, 0x91, 0xa8, 0xd7, 0x13, 0xa8, 0xc7, 0x90, 0x36, 0x36,
+	0x40, 0xda, 0x5c, 0x87, 0xf4, 0x6b, 0xd8, 0x5d, 0xc3, 0xe1, 0xae, 0xa0, 0xfe, 0x53, 0x86, 0x87,
+	0xc7, 0x1e, 0xa1, 0xb6, 0xeb, 0xa6, 0x30, 0x8d, 0x6b, 0xa2, 0x54, 0xb8, 0x26, 0xca, 0xff, 0xa5,
+	0x26, 0x34, 0x85, 0x14, 0xc9, 0x60, 0x25, 0xc1, 0x60, 0xa1, 0x3a, 0x51, 0xba, 0x53, 0x2d, 0xd5,
+	0x9d, 0xd0, 0x3b, 0x00, 0xfc, 0x62, 0x33, 0xe3, 0x1c, 0xfc, 0x26, 0xdb, 0x39, 0x15, 0xcd, 0x48,
+	0xf2, 0xd5, 0xc8, 0xe6, 0x2b, 0x59, 0x25, 0x7d, 0xe8, 0xc8, 0x78, 0x66, 0xc1, 0x9c, 0xc5, 0x24,
+	0x2a, 0xa5, 0x2d, 0xf6, 0x47, 0xc1, 0x3c, 0x8a, 0x2a, 0xcd, 0x61, 0x6b, 0x9d, 0xc3, 0x63, 0xd8,
+	0x49, 0xc3, 0x7e, 0x57, 0x0a, 0xff, 0x2c, 0xc1, 0xee, 0x99, 0xe7, 0x64, 0x92, 0x98, 0x55, 0x18,
+	0x6b, 0xb0, 0x96, 0x33, 0x60, 0xed, 0x42, 0x75, 0x15, 0x06, 0x17, 0x58, 0xd0, 0xc4, 0x17, 0x49,
+	0xbc, 0x2a, 0x2a, 0x5e, 0xa9, 0x8c, 0xab, 0xeb, 0x19, 0x4f, 0x41, 0x5f, 0x8f, 0xf2, 0x8e, 0x39,
+	0x47, 0x79, 0xc5, 0x6f, 0x57, 0x93, 0xbf, 0x53, 0xe6, 0x03, 0xb8, 0x7f, 0x88, 0xe9, 0x6b, 0x5e,
+	0xa6, 0x02, 0x00, 0x73, 0x0c, 0x28, 0xb9, 0x79, 0xe3, 0x4f, 0x6c, 0xa9, 0xfe, 0xe4, 0x20, 0x27,
+	0xf5, 0xa5, 0x96, 0xf9, 0x05, 0xb3, 0x7d, 0xe4, 0x10, 0xea, 0x07, 0xd7, 0x9b, 0xc0, 0xed, 0x80,
+	0xb6, 0xb4, 0xdf, 0x8a, 0xa7, 0x2d, 0xfa, 0x34, 0x0f, 0x59, 0x04, 0xf1, 0x51, 0x11, 0x41, 0x72,
+	0x50, 0x28, 0x15, 0x1b, 0x14, 0x7e, 0x00, 0xf4, 0x0a, 0xc7, 0x33, 0xcb, 0x2d, 0x6f, 0xac, 0xa4,
+	0xa9, 0xac, 0xd2, 0xa4, 0x43, 0x7d, 0xe6, 0x62, 0xdb, 0x0b, 0x57, 0x82, 0x58, 0xb9, 0x34, 0x7f,
+	0x84, 0x07, 0x8a, 0x75, 0x11, 0x67, 0x94, 0x0f, 0xb9, 0x10, 0xd6, 0xa3, 0x4f, 0xf4, 0x39, 0xd4,
+	0xf8, 0x20, 0xc7, 0x6c, 0xb7, 0x87, 0x8f, 0xd4, 0xb8, 0x99, 0x91, 0xd0, 0x13, 0x93, 0x9f, 0x25,
+	0x74, 0x87, 0x7f, 0x37, 0xa0, 0x2d, 0x47, 0x13, 0x3e, 0x66, 0x22, 0x07, 0xb6, 0x93, 0x33, 0x18,
+	0x7a, 0x92, 0x3f, 0x85, 0xa6, 0x46, 0x69, 0xe3, 0x69, 0x11, 0x55, 0x9e, 0x81, 0xb9, 0xf5, 0x49,
+	0x09, 0x11, 0xe8, 0xa4, 0x47, 0x23, 0xf4, 0x2c, 0xdb, 0x46, 0xce, 0x2c, 0x66, 0x0c, 0x8a, 0xaa,
+	0x4b, 0xb7, 0xe8, 0x8a, 0xdd, 0x19, 0x75, 0x9e, 0x41, 0xb7, 0x9a, 0x51, 0x47, 0x28, 0x63, 0xbf,
+	0xb0, 0x7e, 0xec, 0xf7, 0x67, 0xb8, 0xa7, 0xbc, 0xb8, 0x28, 0x07, 0xad, 0xac, 0xe9, 0xc8, 0xf8,
+	0xa8, 0x90, 0x6e, 0xec, 0x6b, 0x09, 0x6d, 0xb5, 0x8d, 0xa1, 0x1c, 0x03, 0x99, 0x6f, 0x8c, 0xf1,
+	0x71, 0x31, 0xe5, 0xd8, 0x1d, 0x81, 0x4e, 0xba, 0x87, 0xe4, 0xf1, 0x98, 0xd3, 0x11, 0xf3, 0x78,
+	0xcc, 0x6b, 0x4d, 0xe6, 0x16, 0xb2, 0x01, 0x6e, 0x5a, 0x08, 0x7a, 0x9c, 0x4b, 0x88, 0xda, 0x79,
+	0x8c, 0xfe, 0xed, 0x8a, 0xb1, 0x8b, 0x15, 0xfc, 0x2f, 0xf5, 0xa2, 0xa3, 0x1c, 0x68, 0xb2, 0x07,
+	0x20, 0xe3, 0x59, 0x41, 0xed, 0x54, 0x52, 0xa2, 0x2b, 0x6d, 0x48, 0x4a, 0x6d, 0x79, 0x1b, 0x92,
+	0x4a, 0x35, 0x38, 0x73, 0x0b, 0x39, 0xd0, 0xb6, 0x42, 0x4f, 0xb8, 0x8e, 0xda, 0x02, 0xca, 0x39,
+	0xbd, 0xde, 0xd5, 0x8c, 0x27, 0x05, 0x34, 0x6f, 0xea, 0xfb, 0x39, 0x7c, 0xdf, 0x90, 0xaa, 0xe7,
+	0x35, 0xf6, 0x5f, 0xf8, 0x67, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x9d, 0x73, 0x4f, 0x4d, 0x73,
+	0x10, 0x00, 0x00,
 }

From a32868e48b82c97dba246b5ed4003bf8966a7725 Mon Sep 17 00:00:00 2001
From: Arash Deshmeh <adeshmeh@ca.ibm.com>
Date: Tue, 3 Apr 2018 17:29:21 -0400
Subject: [PATCH 21/54] added ability to handle custom release descriptions to
 tiller

Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
---
 pkg/tiller/release_install.go        |  6 +++-
 pkg/tiller/release_install_test.go   | 20 ++++++++++++
 pkg/tiller/release_rollback.go       |  7 +++-
 pkg/tiller/release_rollback_test.go  | 32 ++++++++++++++++++
 pkg/tiller/release_uninstall.go      |  6 +++-
 pkg/tiller/release_uninstall_test.go | 21 ++++++++++++
 pkg/tiller/release_update.go         | 12 +++++--
 pkg/tiller/release_update_test.go    | 49 ++++++++++++++++++++++++++++
 8 files changed, 148 insertions(+), 5 deletions(-)

diff --git a/pkg/tiller/release_install.go b/pkg/tiller/release_install.go
index 0b8f4da5b..01ef88c98 100644
--- a/pkg/tiller/release_install.go
+++ b/pkg/tiller/release_install.go
@@ -250,7 +250,11 @@ func (s *ReleaseServer) performRelease(r *release.Release, req *services.Install
 	}
 
 	r.Info.Status.Code = release.Status_DEPLOYED
-	r.Info.Description = "Install complete"
+	if req.Description == "" {
+		r.Info.Description = "Install complete"
+	} else {
+		r.Info.Description = req.Description
+	}
 	// This is a tricky case. The release has been created, but the result
 	// cannot be recorded. The truest thing to tell the user is that the
 	// release was created. However, the user will not be able to do anything
diff --git a/pkg/tiller/release_install_test.go b/pkg/tiller/release_install_test.go
index a244e4b72..bbea3b9dd 100644
--- a/pkg/tiller/release_install_test.go
+++ b/pkg/tiller/release_install_test.go
@@ -495,3 +495,23 @@ func TestInstallRelease_WrongKubeVersion(t *testing.T) {
 		t.Errorf("Expected %q to contain %q", err.Error(), expect)
 	}
 }
+
+func TestInstallRelease_Description(t *testing.T) {
+	c := helm.NewContext()
+	rs := rsFixture()
+	rs.env.Releases.Create(releaseStub())
+
+	customDescription := "foo"
+	req := &services.InstallReleaseRequest{
+		Chart:       chartStub(),
+		Description: customDescription,
+	}
+	res, err := rs.InstallRelease(c, req)
+	if err != nil {
+		t.Errorf("Failed install: %s", err)
+	}
+
+	if desc := res.Release.Info.Description; desc != customDescription {
+		t.Errorf("Expected description %q. Got %q", customDescription, desc)
+	}
+}
diff --git a/pkg/tiller/release_rollback.go b/pkg/tiller/release_rollback.go
index fa3d943f4..ab6462db9 100644
--- a/pkg/tiller/release_rollback.go
+++ b/pkg/tiller/release_rollback.go
@@ -86,6 +86,11 @@ func (s *ReleaseServer) prepareRollback(req *services.RollbackReleaseRequest) (*
 		return nil, nil, err
 	}
 
+	description := req.Description
+	if req.Description == "" {
+		description = fmt.Sprintf("Rollback to %d", previousVersion)
+	}
+
 	// Store a new release object with previous release's configuration
 	targetRelease := &release.Release{
 		Name:      req.Name,
@@ -101,7 +106,7 @@ func (s *ReleaseServer) prepareRollback(req *services.RollbackReleaseRequest) (*
 			},
 			// Because we lose the reference to previous version elsewhere, we set the
 			// message here, and only override it later if we experience failure.
-			Description: fmt.Sprintf("Rollback to %d", previousVersion),
+			Description: description,
 		},
 		Version:  currentRelease.Version + 1,
 		Manifest: previousRelease.Manifest,
diff --git a/pkg/tiller/release_rollback_test.go b/pkg/tiller/release_rollback_test.go
index b73501a36..710f0ebbe 100644
--- a/pkg/tiller/release_rollback_test.go
+++ b/pkg/tiller/release_rollback_test.go
@@ -252,3 +252,35 @@ func TestRollbackReleaseFailure(t *testing.T) {
 		t.Errorf("Expected SUPERSEDED status on previous Release version. Got %v", oldStatus)
 	}
 }
+
+func TestRollbackReleaseWithCustomDescription(t *testing.T) {
+	c := helm.NewContext()
+	rs := rsFixture()
+	rel := releaseStub()
+	rs.env.Releases.Create(rel)
+	upgradedRel := upgradeReleaseVersion(rel)
+	rs.env.Releases.Update(rel)
+	rs.env.Releases.Create(upgradedRel)
+
+	customDescription := "foo"
+	req := &services.RollbackReleaseRequest{
+		Name:        rel.Name,
+		Description: customDescription,
+	}
+	res, err := rs.RollbackRelease(c, req)
+	if err != nil {
+		t.Fatalf("Failed rollback: %s", err)
+	}
+
+	if res.Release.Name == "" {
+		t.Errorf("Expected release name.")
+	}
+
+	if res.Release.Name != rel.Name {
+		t.Errorf("Updated release name does not match previous release name. Expected %s, got %s", rel.Name, res.Release.Name)
+	}
+
+	if res.Release.Info.Description != customDescription {
+		t.Errorf("Expected Description to be %q, got %q", customDescription, res.Release.Info.Description)
+	}
+}
diff --git a/pkg/tiller/release_uninstall.go b/pkg/tiller/release_uninstall.go
index 423b6e7ef..294645ae7 100644
--- a/pkg/tiller/release_uninstall.go
+++ b/pkg/tiller/release_uninstall.go
@@ -97,7 +97,11 @@ func (s *ReleaseServer) UninstallRelease(c ctx.Context, req *services.UninstallR
 	}
 
 	rel.Info.Status.Code = release.Status_DELETED
-	rel.Info.Description = "Deletion complete"
+	if req.Description == "" {
+		rel.Info.Description = "Deletion complete"
+	} else {
+		rel.Info.Description = req.Description
+	}
 
 	if req.Purge {
 		s.Log("purge requested for %s", req.Name)
diff --git a/pkg/tiller/release_uninstall_test.go b/pkg/tiller/release_uninstall_test.go
index 20bfd2486..a68ac55f7 100644
--- a/pkg/tiller/release_uninstall_test.go
+++ b/pkg/tiller/release_uninstall_test.go
@@ -176,3 +176,24 @@ func TestUninstallReleaseNoHooks(t *testing.T) {
 		t.Errorf("Expected LastRun to be zero, got %d.", res.Release.Hooks[0].LastRun.Seconds)
 	}
 }
+
+func TestUninstallReleaseCustomDescription(t *testing.T) {
+	c := helm.NewContext()
+	rs := rsFixture()
+	rs.env.Releases.Create(releaseStub())
+
+	customDescription := "foo"
+	req := &services.UninstallReleaseRequest{
+		Name:        "angry-panda",
+		Description: "foo",
+	}
+
+	res, err := rs.UninstallRelease(c, req)
+	if err != nil {
+		t.Errorf("Failed uninstall: %s", err)
+	}
+
+	if res.Release.Info.Description != customDescription {
+		t.Errorf("Expected description to be %q, got %q", customDescription, res.Release.Info.Description)
+	}
+}
diff --git a/pkg/tiller/release_update.go b/pkg/tiller/release_update.go
index 6f5d37331..e94de705d 100644
--- a/pkg/tiller/release_update.go
+++ b/pkg/tiller/release_update.go
@@ -243,7 +243,11 @@ func (s *ReleaseServer) performUpdateForce(req *services.UpdateReleaseRequest) (
 	}
 
 	newRelease.Info.Status.Code = release.Status_DEPLOYED
-	newRelease.Info.Description = "Upgrade complete"
+	if req.Description == "" {
+		newRelease.Info.Description = "Upgrade complete"
+	} else {
+		newRelease.Info.Description = req.Description
+	}
 	s.recordRelease(newRelease, true)
 
 	return res, nil
@@ -287,7 +291,11 @@ func (s *ReleaseServer) performUpdate(originalRelease, updatedRelease *release.R
 	s.recordRelease(originalRelease, true)
 
 	updatedRelease.Info.Status.Code = release.Status_DEPLOYED
-	updatedRelease.Info.Description = "Upgrade complete"
+	if req.Description == "" {
+		updatedRelease.Info.Description = "Upgrade complete"
+	} else {
+		updatedRelease.Info.Description = req.Description
+	}
 
 	return res, nil
 }
diff --git a/pkg/tiller/release_update_test.go b/pkg/tiller/release_update_test.go
index a1b9a4bff..56dcca874 100644
--- a/pkg/tiller/release_update_test.go
+++ b/pkg/tiller/release_update_test.go
@@ -432,6 +432,55 @@ func TestUpdateReleaseNoChanges(t *testing.T) {
 	}
 }
 
+func TestUpdateReleaseCustomDescription(t *testing.T) {
+	c := helm.NewContext()
+	rs := rsFixture()
+	rel := releaseStub()
+	rs.env.Releases.Create(rel)
+
+	customDescription := "foo"
+
+	req := &services.UpdateReleaseRequest{
+		Name:        rel.Name,
+		Chart:       rel.GetChart(),
+		Description: customDescription,
+	}
+
+	res, err := rs.UpdateRelease(c, req)
+	if err != nil {
+		t.Fatalf("Failed updated: %s", err)
+	}
+	if res.Release.Info.Description != customDescription {
+		t.Errorf("Expected release description to be %q, got %q", customDescription, res.Release.Info.Description)
+	}
+	compareStoredAndReturnedRelease(t, *rs, *res)
+}
+
+func TestUpdateReleaseCustomDescription_Force(t *testing.T) {
+	c := helm.NewContext()
+	rs := rsFixture()
+	rel := releaseStub()
+	rs.env.Releases.Create(rel)
+
+	customDescription := "foo"
+
+	req := &services.UpdateReleaseRequest{
+		Name:        rel.Name,
+		Chart:       rel.GetChart(),
+		Force:       true,
+		Description: customDescription,
+	}
+
+	res, err := rs.UpdateRelease(c, req)
+	if err != nil {
+		t.Fatalf("Failed updated: %s", err)
+	}
+	if res.Release.Info.Description != customDescription {
+		t.Errorf("Expected release description to be %q, got %q", customDescription, res.Release.Info.Description)
+	}
+	compareStoredAndReturnedRelease(t, *rs, *res)
+}
+
 func compareStoredAndReturnedRelease(t *testing.T, rs ReleaseServer, res services.UpdateReleaseResponse) *release.Release {
 	storedRelease, err := rs.env.Releases.Get(res.Release.Name, res.Release.Version)
 	if err != nil {

From d8c4cbb0e0e31276241d87d6386aad8d90011117 Mon Sep 17 00:00:00 2001
From: Arash Deshmeh <adeshmeh@ca.ibm.com>
Date: Tue, 3 Apr 2018 17:35:07 -0400
Subject: [PATCH 22/54] feat(helm): Added the ability to handle custom
 description to client side for install, upgrade, rollback, and delete
 commands. Updated the documentation according to the changes.

Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
---
 cmd/helm/delete.go         |  3 +++
 cmd/helm/delete_test.go    |  8 ++++++++
 cmd/helm/install.go        |  5 ++++-
 cmd/helm/install_test.go   |  7 +++++++
 cmd/helm/rollback.go       |  5 ++++-
 cmd/helm/rollback_test.go  |  6 ++++++
 cmd/helm/upgrade.go        |  6 +++++-
 cmd/helm/upgrade_test.go   | 16 ++++++++++++++++
 docs/helm/helm_delete.md   |  3 ++-
 docs/helm/helm_install.md  |  3 ++-
 docs/helm/helm_rollback.md |  3 ++-
 docs/helm/helm_upgrade.md  |  1 +
 pkg/helm/fake.go           | 21 ++++++++++++++-------
 pkg/helm/fake_test.go      | 17 +++++++++++++++++
 pkg/helm/option.go         | 28 ++++++++++++++++++++++++++++
 15 files changed, 119 insertions(+), 13 deletions(-)

diff --git a/cmd/helm/delete.go b/cmd/helm/delete.go
index e0ac8c4f6..46c7abcb1 100755
--- a/cmd/helm/delete.go
+++ b/cmd/helm/delete.go
@@ -40,6 +40,7 @@ type deleteCmd struct {
 	disableHooks bool
 	purge        bool
 	timeout      int64
+	description  string
 
 	out    io.Writer
 	client helm.Interface
@@ -81,6 +82,7 @@ func newDeleteCmd(c helm.Interface, out io.Writer) *cobra.Command {
 	f.BoolVar(&del.disableHooks, "no-hooks", false, "prevent hooks from running during deletion")
 	f.BoolVar(&del.purge, "purge", false, "remove the release from the store and make its name free for later use")
 	f.Int64Var(&del.timeout, "timeout", 300, "time in seconds to wait for any individual Kubernetes operation (like Jobs for hooks)")
+	f.StringVar(&del.description, "description", "", "specify a description for the release")
 
 	return cmd
 }
@@ -91,6 +93,7 @@ func (d *deleteCmd) run() error {
 		helm.DeleteDisableHooks(d.disableHooks),
 		helm.DeletePurge(d.purge),
 		helm.DeleteTimeout(d.timeout),
+		helm.DeleteDescription(d.description),
 	}
 	res, err := d.client.DeleteRelease(d.name, opts...)
 	if res != nil && res.Info != "" {
diff --git a/cmd/helm/delete_test.go b/cmd/helm/delete_test.go
index 829d17906..6b5c444b1 100644
--- a/cmd/helm/delete_test.go
+++ b/cmd/helm/delete_test.go
@@ -61,6 +61,14 @@ func TestDelete(t *testing.T) {
 			resp:     helm.ReleaseMock(&helm.MockReleaseOptions{Name: "aeneas"}),
 			rels:     []*release.Release{helm.ReleaseMock(&helm.MockReleaseOptions{Name: "aeneas"})},
 		},
+		{
+			name:     "delete with description",
+			args:     []string{"aeneas"},
+			flags:    []string{"--description", "foo"},
+			expected: "",
+			resp:     helm.ReleaseMock(&helm.MockReleaseOptions{Name: "aeneas"}),
+			rels:     []*release.Release{helm.ReleaseMock(&helm.MockReleaseOptions{Name: "aeneas"})},
+		},
 		{
 			name: "delete without release",
 			args: []string{},
diff --git a/cmd/helm/install.go b/cmd/helm/install.go
index d1c24c213..6a2107b92 100644
--- a/cmd/helm/install.go
+++ b/cmd/helm/install.go
@@ -129,6 +129,7 @@ type installCmd struct {
 	password       string
 	devel          bool
 	depUp          bool
+	description    string
 
 	certFile string
 	keyFile  string
@@ -209,6 +210,7 @@ func newInstallCmd(c helm.Interface, out io.Writer) *cobra.Command {
 	f.StringVar(&inst.caFile, "ca-file", "", "verify certificates of HTTPS-enabled servers using this CA bundle")
 	f.BoolVar(&inst.devel, "devel", false, "use development versions, too. Equivalent to version '>0.0.0-0'. If --version is set, this is ignored.")
 	f.BoolVar(&inst.depUp, "dep-up", false, "run helm dependency update before installing the chart")
+	f.StringVar(&inst.description, "description", "", "specify a description for the release")
 
 	return cmd
 }
@@ -277,7 +279,8 @@ func (i *installCmd) run() error {
 		helm.InstallDisableHooks(i.disableHooks),
 		helm.InstallDisableCRDHook(i.disableCRDHook),
 		helm.InstallTimeout(i.timeout),
-		helm.InstallWait(i.wait))
+		helm.InstallWait(i.wait),
+		helm.InstallDescription(i.description))
 	if err != nil {
 		return prettyError(err)
 	}
diff --git a/cmd/helm/install_test.go b/cmd/helm/install_test.go
index aa828c6ce..236174bec 100644
--- a/cmd/helm/install_test.go
+++ b/cmd/helm/install_test.go
@@ -115,6 +115,13 @@ func TestInstall(t *testing.T) {
 			expected: "FOOBAR",
 			resp:     helm.ReleaseMock(&helm.MockReleaseOptions{Name: "FOOBAR"}),
 		},
+		{
+			name:     "install with custom description",
+			args:     []string{"testdata/testcharts/alpine"},
+			flags:    []string{"--name", "virgil", "--description", "foobar"},
+			expected: "virgil",
+			resp:     helm.ReleaseMock(&helm.MockReleaseOptions{Name: "virgil", Description: "foobar"}),
+		},
 		// Install, perform chart verification along the way.
 		{
 			name:  "install with verification, missing provenance",
diff --git a/cmd/helm/rollback.go b/cmd/helm/rollback.go
index 889b6ae28..370807cb4 100644
--- a/cmd/helm/rollback.go
+++ b/cmd/helm/rollback.go
@@ -45,6 +45,7 @@ type rollbackCmd struct {
 	client       helm.Interface
 	timeout      int64
 	wait         bool
+	description  string
 }
 
 func newRollbackCmd(c helm.Interface, out io.Writer) *cobra.Command {
@@ -83,6 +84,7 @@ func newRollbackCmd(c helm.Interface, out io.Writer) *cobra.Command {
 	f.BoolVar(&rollback.disableHooks, "no-hooks", false, "prevent hooks from running during rollback")
 	f.Int64Var(&rollback.timeout, "timeout", 300, "time in seconds to wait for any individual Kubernetes operation (like Jobs for hooks)")
 	f.BoolVar(&rollback.wait, "wait", false, "if set, will wait until all Pods, PVCs, Services, and minimum number of Pods of a Deployment are in a ready state before marking the release as successful. It will wait for as long as --timeout")
+	f.StringVar(&rollback.description, "description", "", "specify a description for the release")
 
 	return cmd
 }
@@ -96,7 +98,8 @@ func (r *rollbackCmd) run() error {
 		helm.RollbackDisableHooks(r.disableHooks),
 		helm.RollbackVersion(r.revision),
 		helm.RollbackTimeout(r.timeout),
-		helm.RollbackWait(r.wait))
+		helm.RollbackWait(r.wait),
+		helm.RollbackDescription(r.description))
 	if err != nil {
 		return prettyError(err)
 	}
diff --git a/cmd/helm/rollback_test.go b/cmd/helm/rollback_test.go
index f1479b2eb..62bfd6477 100644
--- a/cmd/helm/rollback_test.go
+++ b/cmd/helm/rollback_test.go
@@ -45,6 +45,12 @@ func TestRollbackCmd(t *testing.T) {
 			flags:    []string{"--wait"},
 			expected: "Rollback was a success! Happy Helming!",
 		},
+		{
+			name:     "rollback a release with description",
+			args:     []string{"funny-honey", "1"},
+			flags:    []string{"--description", "foo"},
+			expected: "Rollback was a success! Happy Helming!",
+		},
 		{
 			name: "rollback a release without revision",
 			args: []string{"funny-honey"},
diff --git a/cmd/helm/upgrade.go b/cmd/helm/upgrade.go
index 4dd433a39..aaf87b7d0 100644
--- a/cmd/helm/upgrade.go
+++ b/cmd/helm/upgrade.go
@@ -78,6 +78,7 @@ type upgradeCmd struct {
 	username     string
 	password     string
 	devel        bool
+	description  string
 
 	certFile string
 	keyFile  string
@@ -139,6 +140,7 @@ func newUpgradeCmd(client helm.Interface, out io.Writer) *cobra.Command {
 	f.StringVar(&upgrade.keyFile, "key-file", "", "identify HTTPS client using this SSL key file")
 	f.StringVar(&upgrade.caFile, "ca-file", "", "verify certificates of HTTPS-enabled servers using this CA bundle")
 	f.BoolVar(&upgrade.devel, "devel", false, "use development versions, too. Equivalent to version '>0.0.0-0'. If --version is set, this is ignored.")
+	f.StringVar(&upgrade.description, "description", "", "specify the description to use for the upgrade, rather than the default")
 
 	f.MarkDeprecated("disable-hooks", "use --no-hooks instead")
 
@@ -190,6 +192,7 @@ func (u *upgradeCmd) run() error {
 				namespace:    u.namespace,
 				timeout:      u.timeout,
 				wait:         u.wait,
+				description:  u.description,
 			}
 			return ic.run()
 		}
@@ -224,7 +227,8 @@ func (u *upgradeCmd) run() error {
 		helm.UpgradeTimeout(u.timeout),
 		helm.ResetValues(u.resetValues),
 		helm.ReuseValues(u.reuseValues),
-		helm.UpgradeWait(u.wait))
+		helm.UpgradeWait(u.wait),
+		helm.UpgradeDescription(u.description))
 	if err != nil {
 		return fmt.Errorf("UPGRADE FAILED: %v", prettyError(err))
 	}
diff --git a/cmd/helm/upgrade_test.go b/cmd/helm/upgrade_test.go
index 187d3593e..032df2f32 100644
--- a/cmd/helm/upgrade_test.go
+++ b/cmd/helm/upgrade_test.go
@@ -139,6 +139,14 @@ func TestUpgradeCmd(t *testing.T) {
 			expected: "Release \"crazy-bunny\" has been upgraded. Happy Helming!\n",
 			rels:     []*release.Release{helm.ReleaseMock(&helm.MockReleaseOptions{Name: "crazy-bunny", Version: 1, Chart: ch})},
 		},
+		{
+			name:     "install a release with 'upgrade --install' and custom description",
+			args:     []string{"crazy-bunny", chartPath},
+			flags:    []string{"-i", "--description", "foo"},
+			resp:     helm.ReleaseMock(&helm.MockReleaseOptions{Name: "crazy-bunny", Version: 1, Chart: ch, Description: "foo"}),
+			expected: "Release \"crazy-bunny\" has been upgraded. Happy Helming!\n",
+			rels:     []*release.Release{helm.ReleaseMock(&helm.MockReleaseOptions{Name: "crazy-bunny", Version: 1, Chart: ch, Description: "foo"})},
+		},
 		{
 			name:     "upgrade a release with wait",
 			args:     []string{"crazy-bunny", chartPath},
@@ -147,6 +155,14 @@ func TestUpgradeCmd(t *testing.T) {
 			expected: "Release \"crazy-bunny\" has been upgraded. Happy Helming!\n",
 			rels:     []*release.Release{helm.ReleaseMock(&helm.MockReleaseOptions{Name: "crazy-bunny", Version: 2, Chart: ch2})},
 		},
+		{
+			name:     "upgrade a release with description",
+			args:     []string{"crazy-bunny", chartPath},
+			flags:    []string{"--description", "foo"},
+			resp:     helm.ReleaseMock(&helm.MockReleaseOptions{Name: "crazy-bunny", Version: 2, Chart: ch2}),
+			expected: "Release \"crazy-bunny\" has been upgraded. Happy Helming!\n",
+			rels:     []*release.Release{helm.ReleaseMock(&helm.MockReleaseOptions{Name: "crazy-bunny", Version: 2, Chart: ch2, Description: "foo"})},
+		},
 		{
 			name: "upgrade a release with missing dependencies",
 			args: []string{"bonkers-bunny", missingDepsPath},
diff --git a/docs/helm/helm_delete.md b/docs/helm/helm_delete.md
index 5d41cd7ea..9eee6e8ec 100644
--- a/docs/helm/helm_delete.md
+++ b/docs/helm/helm_delete.md
@@ -20,6 +20,7 @@ helm delete [flags] RELEASE_NAME [...]
 ### Options
 
 ```
+      --description string   specify a description for the release
       --dry-run              simulate a delete
       --no-hooks             prevent hooks from running during deletion
       --purge                remove the release from the store and make its name free for later use
@@ -45,4 +46,4 @@ helm delete [flags] RELEASE_NAME [...]
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 13-Apr-2018
diff --git a/docs/helm/helm_install.md b/docs/helm/helm_install.md
index 9f1ad86b0..62d02cc38 100644
--- a/docs/helm/helm_install.md
+++ b/docs/helm/helm_install.md
@@ -77,6 +77,7 @@ helm install [CHART]
       --ca-file string           verify certificates of HTTPS-enabled servers using this CA bundle
       --cert-file string         identify HTTPS client using this SSL certificate file
       --dep-up                   run helm dependency update before installing the chart
+      --description string       specify a description for the release
       --devel                    use development versions, too. Equivalent to version '>0.0.0-0'. If --version is set, this is ignored.
       --dry-run                  simulate an install
       --key-file string          identify HTTPS client using this SSL key file
@@ -118,4 +119,4 @@ helm install [CHART]
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 27-Apr-2018
+###### Auto generated by spf13/cobra on 5-Jun-2018
diff --git a/docs/helm/helm_rollback.md b/docs/helm/helm_rollback.md
index 4b6dcbbb2..ae64a0a26 100644
--- a/docs/helm/helm_rollback.md
+++ b/docs/helm/helm_rollback.md
@@ -20,6 +20,7 @@ helm rollback [flags] [RELEASE] [REVISION]
 ### Options
 
 ```
+      --description string   specify a description for the release
       --dry-run              simulate a rollback
       --force                force resource update through delete/recreate if needed
       --no-hooks             prevent hooks from running during rollback
@@ -47,4 +48,4 @@ helm rollback [flags] [RELEASE] [REVISION]
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 13-Apr-2018
diff --git a/docs/helm/helm_upgrade.md b/docs/helm/helm_upgrade.md
index c2882265e..b952624a5 100644
--- a/docs/helm/helm_upgrade.md
+++ b/docs/helm/helm_upgrade.md
@@ -39,6 +39,7 @@ helm upgrade [RELEASE] [CHART]
 ```
       --ca-file string           verify certificates of HTTPS-enabled servers using this CA bundle
       --cert-file string         identify HTTPS client using this SSL certificate file
+      --description string       specify the description to use for the upgrade, rather than the default
       --devel                    use development versions, too. Equivalent to version '>0.0.0-0'. If --version is set, this is ignored.
       --dry-run                  simulate an upgrade
       --force                    force resource update through delete/recreate if needed
diff --git a/pkg/helm/fake.go b/pkg/helm/fake.go
index 0a9e77c44..aa2bbb4e9 100644
--- a/pkg/helm/fake.go
+++ b/pkg/helm/fake.go
@@ -69,6 +69,7 @@ func (c *FakeClient) InstallReleaseFromChart(chart *chart.Chart, ns string, opts
 	}
 
 	releaseName := c.Opts.instReq.Name
+	releaseDescription := c.Opts.instReq.Description
 
 	// Check to see if the release already exists.
 	rel, err := c.ReleaseStatus(releaseName, nil)
@@ -76,7 +77,7 @@ func (c *FakeClient) InstallReleaseFromChart(chart *chart.Chart, ns string, opts
 		return nil, errors.New("cannot re-use a name that is still in use")
 	}
 
-	release := ReleaseMock(&MockReleaseOptions{Name: releaseName, Namespace: ns})
+	release := ReleaseMock(&MockReleaseOptions{Name: releaseName, Namespace: ns, Description: releaseDescription})
 	c.Rels = append(c.Rels, release)
 
 	return &rls.InstallReleaseResponse{
@@ -206,11 +207,12 @@ metadata:
 
 // MockReleaseOptions allows for user-configurable options on mock release objects.
 type MockReleaseOptions struct {
-	Name       string
-	Version    int32
-	Chart      *chart.Chart
-	StatusCode release.Status_Code
-	Namespace  string
+	Name        string
+	Version     int32
+	Chart       *chart.Chart
+	StatusCode  release.Status_Code
+	Namespace   string
+	Description string
 }
 
 // ReleaseMock creates a mock release object based on options set by MockReleaseOptions. This function should typically not be used outside of testing.
@@ -232,6 +234,11 @@ func ReleaseMock(opts *MockReleaseOptions) *release.Release {
 		namespace = "default"
 	}
 
+	description := opts.Description
+	if description == "" {
+		description = "Release mock"
+	}
+
 	ch := opts.Chart
 	if opts.Chart == nil {
 		ch = &chart.Chart{
@@ -256,7 +263,7 @@ func ReleaseMock(opts *MockReleaseOptions) *release.Release {
 			FirstDeployed: &date,
 			LastDeployed:  &date,
 			Status:        &release.Status{Code: scode},
-			Description:   "Release mock",
+			Description:   description,
 		},
 		Chart:     ch,
 		Config:    &chart.Config{Raw: `name: "value"`},
diff --git a/pkg/helm/fake_test.go b/pkg/helm/fake_test.go
index 9c0a53759..f6de572b5 100644
--- a/pkg/helm/fake_test.go
+++ b/pkg/helm/fake_test.go
@@ -150,6 +150,23 @@ func TestFakeClient_InstallReleaseFromChart(t *testing.T) {
 			},
 			wantErr: false,
 		},
+		{
+			name: "Add release with description.",
+			fields: fields{
+				Rels: []*release.Release{},
+			},
+			args: args{
+				ns:   "default",
+				opts: []InstallOption{ReleaseName("new-release"), InstallDescription("foo-bar")},
+			},
+			want: &rls.InstallReleaseResponse{
+				Release: ReleaseMock(&MockReleaseOptions{Name: "new-release", Description: "foo-bar"}),
+			},
+			relsAfter: []*release.Release{
+				ReleaseMock(&MockReleaseOptions{Name: "new-release", Description: "foo-bar"}),
+			},
+			wantErr: false,
+		},
 		{
 			name: "Try to add a release where the name already exists.",
 			fields: fields{
diff --git a/pkg/helm/option.go b/pkg/helm/option.go
index 602e1e3a3..4babec073 100644
--- a/pkg/helm/option.go
+++ b/pkg/helm/option.go
@@ -262,6 +262,34 @@ func UpdateValueOverrides(raw []byte) UpdateOption {
 	}
 }
 
+// InstallDescription specifies the description for the release
+func InstallDescription(description string) InstallOption {
+	return func(opts *options) {
+		opts.instReq.Description = description
+	}
+}
+
+// UpgradeDescription specifies the description for the update
+func UpgradeDescription(description string) UpdateOption {
+	return func(opts *options) {
+		opts.updateReq.Description = description
+	}
+}
+
+// RollbackDescription specifies the description for the release
+func RollbackDescription(description string) RollbackOption {
+	return func(opts *options) {
+		opts.rollbackReq.Description = description
+	}
+}
+
+// DeleteDescription specifies the description for the release
+func DeleteDescription(description string) DeleteOption {
+	return func(opts *options) {
+		opts.uninstallReq.Description = description
+	}
+}
+
 // DeleteDisableHooks will disable hooks for a deletion operation.
 func DeleteDisableHooks(disable bool) DeleteOption {
 	return func(opts *options) {

From b4cfb5f2f3efe957b1cb1b671ee33cfe18aeaf93 Mon Sep 17 00:00:00 2001
From: ruicao <ruicao@alauda.io>
Date: Wed, 6 Jun 2018 10:48:33 +0800
Subject: [PATCH 23/54] Typo fix: indentifies -> identifies

---
 cmd/helm/installer/options.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/helm/installer/options.go b/cmd/helm/installer/options.go
index 13cf43dcc..3769d12e1 100644
--- a/cmd/helm/installer/options.go
+++ b/cmd/helm/installer/options.go
@@ -50,7 +50,7 @@ type Options struct {
 	// Force allows to force upgrading tiller if deployed version is greater than current version
 	ForceUpgrade bool
 
-	// ImageSpec indentifies the image Tiller will use when deployed.
+	// ImageSpec identifies the image Tiller will use when deployed.
 	//
 	// Valid if and only if UseCanary is false.
 	ImageSpec string

From 8817f7baa714161b0c3fa7299f0e0b0160cba96a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herbert=20M=C3=BChlburger?=
 <herbert.muehlburger@bearingpoint.com>
Date: Thu, 7 Jun 2018 10:30:17 +0200
Subject: [PATCH 24/54] test: add test for 'ParseIntoString' and update test
 for 'ParseInto'

---
 pkg/strvals/parser_test.go | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/pkg/strvals/parser_test.go b/pkg/strvals/parser_test.go
index c897cf0a7..257bc5f29 100644
--- a/pkg/strvals/parser_test.go
+++ b/pkg/strvals/parser_test.go
@@ -336,12 +336,13 @@ func TestParseInto(t *testing.T) {
 			"inner2": "value2",
 		},
 	}
-	input := "outer.inner1=value1,outer.inner3=value3"
+	input := "outer.inner1=value1,outer.inner3=value3,outer.inner4=4"
 	expect := map[string]interface{}{
 		"outer": map[string]interface{}{
 			"inner1": "value1",
 			"inner2": "value2",
 			"inner3": "value3",
+			"inner4": 4,
 		},
 	}
 
@@ -362,6 +363,39 @@ func TestParseInto(t *testing.T) {
 		t.Errorf("%s: Expected:\n%s\nGot:\n%s", input, y1, y2)
 	}
 }
+func TestParseIntoString(t *testing.T) {
+	got := map[string]interface{}{
+		"outer": map[string]interface{}{
+			"inner1": "overwrite",
+			"inner2": "value2",
+		},
+	}
+	input := "outer.inner1=1,outer.inner3=3"
+	expect := map[string]interface{}{
+		"outer": map[string]interface{}{
+			"inner1": "1",
+			"inner2": "value2",
+			"inner3": "3",
+		},
+	}
+
+	if err := ParseIntoString(input, got); err != nil {
+		t.Fatal(err)
+	}
+
+	y1, err := yaml.Marshal(expect)
+	if err != nil {
+		t.Fatal(err)
+	}
+	y2, err := yaml.Marshal(got)
+	if err != nil {
+		t.Fatalf("Error serializing parsed value: %s", err)
+	}
+
+	if string(y1) != string(y2) {
+		t.Errorf("%s: Expected:\n%s\nGot:\n%s", input, y1, y2)
+	}
+}
 
 func TestToYAML(t *testing.T) {
 	// The TestParse does the hard part. We just verify that YAML formatting is

From c19dea18b0f93a710a8cd6c33a30456bce0c61aa Mon Sep 17 00:00:00 2001
From: Alice Frosi <alice@linux.vnet.ibm.com>
Date: Thu, 7 Jun 2018 07:24:45 -0500
Subject: [PATCH 25/54] Add s390 architecture in TARGETS

Signed-off-by: Alice Frosi <alice@linux.vnet.ibm.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 54cc1ff18..77d7c8ff7 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ DOCKER_REGISTRY   ?= gcr.io
 IMAGE_PREFIX      ?= kubernetes-helm
 SHORT_NAME        ?= tiller
 SHORT_NAME_RUDDER ?= rudder
-TARGETS           ?= darwin/amd64 linux/amd64 linux/386 linux/arm linux/arm64 linux/ppc64le windows/amd64
+TARGETS           ?= darwin/amd64 linux/amd64 linux/386 linux/arm linux/arm64 linux/ppc64le linux/s390x windows/amd64
 DIST_DIRS         = find * -type d -exec
 APP               = helm
 

From 0ddbcc1fe9a920c1d4146b008b08579752a0567a Mon Sep 17 00:00:00 2001
From: Dean Coakley <dean.s.coakley@gmail.com>
Date: Thu, 7 Jun 2018 15:12:31 +0100
Subject: [PATCH 26/54] Remove trailing whitespace

---
 docs/charts.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/charts.md b/docs/charts.md
index a55038e3e..bdcbe9b61 100644
--- a/docs/charts.md
+++ b/docs/charts.md
@@ -303,7 +303,6 @@ The `--set` parameter can be used as usual to alter tag and condition values.
 
 ````
 helm install --set tags.front-end=true --set subchart2.enabled=false
-
 ````
 
 ##### Tags and Condition Resolution

From 63760b29377fde5e3d2ac9f3a3df97d133161858 Mon Sep 17 00:00:00 2001
From: liyongxin <yxli@alauda.io>
Date: Fri, 8 Jun 2018 10:09:07 +0800
Subject: [PATCH 27/54] typo fix for lengh to length

---
 pkg/storage/storage.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go
index 4b39e0bb2..d308cef1b 100644
--- a/pkg/storage/storage.go
+++ b/pkg/storage/storage.go
@@ -163,7 +163,7 @@ func (s *Storage) History(name string) ([]*rspb.Release, error) {
 	return s.Driver.Query(map[string]string{"NAME": name, "OWNER": "TILLER"})
 }
 
-// removeLeastRecent removes items from history until the lengh number of releases
+// removeLeastRecent removes items from history until the length number of releases
 // does not exceed max.
 //
 // We allow max to be set explicitly so that calling functions can "make space"

From 5d2140be384eaba7ed8bb0ff1bc2fb9be6284b4d Mon Sep 17 00:00:00 2001
From: liyongxin <yxli@alauda.io>
Date: Tue, 12 Jun 2018 11:05:02 +0800
Subject: [PATCH 28/54] typo fix for template test

---
 cmd/helm/template_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmd/helm/template_test.go b/cmd/helm/template_test.go
index d15dc5666..263b6bb35 100644
--- a/cmd/helm/template_test.go
+++ b/cmd/helm/template_test.go
@@ -68,8 +68,8 @@ func TestTemplateCmd(t *testing.T) {
 		},
 		{
 			name:        "check_execute_non_existent",
-			desc:        "verify --execute fails on a template that doesnt exist",
-			args:        []string{subchart1ChartPath, "-x", "templates/thisdoesntexist.yaml"},
+			desc:        "verify --execute fails on a template that doesn't exist",
+			args:        []string{subchart1ChartPath, "-x", "templates/thisdoesn'texist.yaml"},
 			expectError: "could not find template",
 		},
 		{

From 4d579bbbdff7d9b7c6b380d256f29a5732147d22 Mon Sep 17 00:00:00 2001
From: rocky <rocky0722@163.com>
Date: Thu, 17 May 2018 09:24:25 +0800
Subject: [PATCH 29/54] Fix(helm): fix the bug of the charts not deployed after
 downloaded in helm install --dep-up

helm install --dep-up does not deploy the charts downloaded by itself.
I reload the charts path after downloading the missing charts.

Closes #3423
---
 cmd/helm/install.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cmd/helm/install.go b/cmd/helm/install.go
index d1c24c213..ae50684e8 100644
--- a/cmd/helm/install.go
+++ b/cmd/helm/install.go
@@ -258,6 +258,12 @@ func (i *installCmd) run() error {
 				if err := man.Update(); err != nil {
 					return prettyError(err)
 				}
+
+				// Update all dependencies which are present in /charts.
+				chartRequested, err = chartutil.Load(i.chartPath)
+				if err != nil {
+					return prettyError(err)
+				}
 			} else {
 				return prettyError(err)
 			}

From f89a5a729913bb3ebfca1218432c0acbdb84c47e Mon Sep 17 00:00:00 2001
From: Michelle Noorali <michellemolu@gmail.com>
Date: Thu, 24 May 2018 11:53:46 -0700
Subject: [PATCH 30/54] add SECURITY_CONTACTS

---
 SECURITY_CONTACTS | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 SECURITY_CONTACTS

diff --git a/SECURITY_CONTACTS b/SECURITY_CONTACTS
new file mode 100644
index 000000000..7298ea2d2
--- /dev/null
+++ b/SECURITY_CONTACTS
@@ -0,0 +1,20 @@
+# Defined below are the security contacts for this repo.
+#
+# They are the contact point for the Product Security Team to reach out
+# to for triaging and handling of incoming issues.
+#
+# The below names agree to abide by the
+# [Embargo Policy](https://github.com/kubernetes/sig-release/blob/master/security-release-process-documentation/security-release-process.md#embargo-policy)
+# and will be removed and replaced if they violate that agreement.
+#
+# DO NOT REPORT SECURITY VULNERABILITIES DIRECTLY TO THESE NAMES, FOLLOW THE
+# INSTRUCTIONS AT https://github.com/kubernetes/helm/blob/master/CONTRIBUTING.md#reporting-a-security-issue
+
+adamreese
+bacongobbler
+mattfarina
+michelleN
+prydonius
+SlickNik
+technosophos
+thomastaylor312

From 5041d741878820c000546b5ed87d5938aa6c4996 Mon Sep 17 00:00:00 2001
From: James Munnelly <munnerz@users.noreply.github.com>
Date: Sat, 16 Jun 2018 18:07:08 +0100
Subject: [PATCH 31/54] Add 'name' label to created namespaces

---
 pkg/kube/namespace.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg/kube/namespace.go b/pkg/kube/namespace.go
index 6547e4abc..c6878bd0f 100644
--- a/pkg/kube/namespace.go
+++ b/pkg/kube/namespace.go
@@ -27,6 +27,9 @@ func createNamespace(client internalclientset.Interface, namespace string) error
 	ns := &core.Namespace{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: namespace,
+			Labels: map[string]string{
+				"name": namespace,
+			},
 		},
 	}
 	_, err := client.Core().Namespaces().Create(ns)

From aae233e7629e87ed391321df8e7bc0bf66c89371 Mon Sep 17 00:00:00 2001
From: Gage Hugo <gagehugo@gmail.com>
Date: Tue, 19 Jun 2018 10:58:02 -0500
Subject: [PATCH 32/54] chore(sprig): bump sprig to 2.15.0

This change updates sprig to 2.15, which has support for generating
SSL certificates in charts from user defined CA certificates.
---
 glide.lock | 21 ++++++++++-----------
 glide.yaml |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/glide.lock b/glide.lock
index a91c31b7b..eef256fd1 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 4023a1644d60060fbf2fdbbe5b73cbb4b957eb686ce925640d102db2d1858676
-updated: 2018-04-14T11:27:34.604716498-04:00
+hash: 41304a2eabc68608507c034304ce87cbf76924c90caaafbe42a9be16e6265868
+updated: 2018-06-19T14:50:56.238468981-05:00
 imports:
 - name: cloud.google.com/go
   version: 3b1ae45394a234c385be014e9a488f2bb6eef821
@@ -89,7 +89,7 @@ imports:
   subpackages:
   - spdy
 - name: github.com/evanphx/json-patch
-  version: 944e07253867aacae43c04b2e6a239005443f33a
+  version: 94e38aa1586e8a6c8a75770bddf5ff84c48a106b
 - name: github.com/exponent-io/jsonpath
   version: d6023ce2651d8eafb5c75bb0c7167536102ec9f5
 - name: github.com/fatih/camelcase
@@ -250,7 +250,7 @@ imports:
 - name: github.com/spf13/pflag
   version: 9ff6c6923cfffbcd502984b8e0c80539a94968b7
 - name: github.com/technosophos/moniker
-  version: ab470f5e105a44d0c87ea21bacd6a335c4816d83
+  version: a5dbd03a2245d554160e3ae6bfdcf969fe58b431
 - name: golang.org/x/crypto
   version: 81e90905daefcd6fd217b62423c0908922eadb30
   subpackages:
@@ -359,9 +359,9 @@ imports:
   - json
   - jwt
 - name: gopkg.in/yaml.v2
-  version: 53feefa2559fb8dfa8d81baad31be332c97d6c77
+  version: 670d4cfef0544295bc27a114dbac37980d83185a
 - name: k8s.io/api
-  version: c699ec51538f0cfd4afa8bfcfe1e0779cafbe666
+  version: 8b7507fac302640dd5f1efbf9643199952cc58db
   subpackages:
   - admission/v1beta1
   - admissionregistration/v1alpha1
@@ -398,7 +398,7 @@ imports:
   subpackages:
   - pkg/features
 - name: k8s.io/apimachinery
-  version: 54101a56dda9a0962bc48751c058eb4c546dcbb9
+  version: f6313580a4d36c7c74a3d845dda6e116642c4f90
   subpackages:
   - pkg/api/equality
   - pkg/api/errors
@@ -455,7 +455,7 @@ imports:
   - third_party/forked/golang/netutil
   - third_party/forked/golang/reflect
 - name: k8s.io/apiserver
-  version: ea53f8588c655568158b4ff53f5ec6fa4ebfc332
+  version: f7914ed3085badf66a1b6f3a5218ada28f7bd084
   subpackages:
   - pkg/apis/audit
   - pkg/authentication/authenticator
@@ -640,12 +640,12 @@ imports:
   - util/retry
   - util/workqueue
 - name: k8s.io/kube-openapi
-  version: 50ae88d24ede7b8bad68e23c805b5d3da5c8abaf
+  version: 39cb288412c48cb533ba4be5d6c28620b9a0c1b4
   subpackages:
   - pkg/util/proto
   - pkg/util/proto/validation
 - name: k8s.io/kubernetes
-  version: baab3992147260d47cb59b9c485a24fdeff2e457
+  version: 32ac1c9073b132b8ba18aa830f46b77dcceb0723
   subpackages:
   - pkg/api/events
   - pkg/api/legacyscheme
@@ -767,7 +767,6 @@ imports:
   - pkg/client/clientset_generated/internalclientset/typed/settings/internalversion/fake
   - pkg/client/clientset_generated/internalclientset/typed/storage/internalversion
   - pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake
-  - pkg/client/conditions
   - pkg/cloudprovider
   - pkg/controller
   - pkg/controller/daemon
diff --git a/glide.yaml b/glide.yaml
index fc3dcc37d..a101a11ee 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -13,7 +13,7 @@ import:
 - package: github.com/imdario/mergo
   version: 6633656539c1639d9d78127b7d47c622b5d7b6dc
 - package: github.com/Masterminds/sprig
-  version: ^2.14.1
+  version: ^2.15.0
 - package: github.com/ghodss/yaml
 - package: github.com/Masterminds/semver
   version: ~1.3.1

From b3c583b855f0c10bc3adb2a4f019e0e752643d83 Mon Sep 17 00:00:00 2001
From: Jon Kalfayan <jonkalfayan@gmail.com>
Date: Wed, 27 Jun 2018 21:31:40 -0700
Subject: [PATCH 33/54] add nil check in if statement configmap example, also
 note why

---
 docs/chart_template_guide/control_structures.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/chart_template_guide/control_structures.md b/docs/chart_template_guide/control_structures.md
index 7575ebc35..1844bd393 100644
--- a/docs/chart_template_guide/control_structures.md
+++ b/docs/chart_template_guide/control_structures.md
@@ -53,10 +53,10 @@ data:
   myvalue: "Hello World"
   drink: {{ .Values.favorite.drink | default "tea" | quote }}
   food: {{ .Values.favorite.food | upper | quote }}
-  {{ if eq .Values.favorite.drink "coffee" }}mug: true{{ end }}
+  {{ if (.Values.favorite.drink) and eq .Values.favorite.drink "coffee" }}mug: true{{ end }}
 ```
 
-Since we commented out `drink: coffee` in our last example, the output should not include a `mug: true` flag. But if we add that line back into our `values.yaml` file, the output should look like this:
+Note that `.Values.favorite.drink` must be defined or else it will throw an error when comparing it to "coffee". Since we commented out `drink: coffee` in our last example, the output should not include a `mug: true` flag. But if we add that line back into our `values.yaml` file, the output should look like this:
 
 ```yaml
 # Source: mychart/templates/configmap.yaml

From 81994381c1e940d8938766293c36fa03db0026d8 Mon Sep 17 00:00:00 2001
From: roc <roc@imroc.io>
Date: Thu, 5 Jul 2018 11:50:03 +0800
Subject: [PATCH 34/54] Support Stdin when using downloaders of plugin

Inject os.Stdin into the command of helm plugin's downloaders
---
 pkg/getter/plugingetter.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/getter/plugingetter.go b/pkg/getter/plugingetter.go
index c747eef7f..a73ccc853 100644
--- a/pkg/getter/plugingetter.go
+++ b/pkg/getter/plugingetter.go
@@ -69,6 +69,7 @@ func (p *pluginGetter) Get(href string) (*bytes.Buffer, error) {
 	buf := bytes.NewBuffer(nil)
 	prog.Stdout = buf
 	prog.Stderr = os.Stderr
+	prog.Stdin = os.Stdin
 	if err := prog.Run(); err != nil {
 		if eerr, ok := err.(*exec.ExitError); ok {
 			os.Stderr.Write(eerr.Stderr)

From 69f10ca73be76e2fc2567b97f8a8bb142e38a49d Mon Sep 17 00:00:00 2001
From: AdamDang <adam.dang@daocloud.io>
Date: Fri, 6 Jul 2018 15:46:20 +0800
Subject: [PATCH 35/54] Some small typos:

Some small typos:
Line 92: stategies->strategies
Line 263: namepace->namespace
Line 266: ReuseName->Reuse_name
---
 _proto/hapi/services/tiller.proto | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/_proto/hapi/services/tiller.proto b/_proto/hapi/services/tiller.proto
index 8daef0cb3..f1f3ab27a 100644
--- a/_proto/hapi/services/tiller.proto
+++ b/_proto/hapi/services/tiller.proto
@@ -89,7 +89,7 @@ service ReleaseService {
 //
 // Releases can be retrieved in chunks by setting limit and offset.
 //
-// Releases can be sorted according to a few pre-determined sort stategies.
+// Releases can be sorted according to a few pre-determined sort strategies.
 message ListReleasesRequest {
 	// Limit is the maximum number of releases to be returned.
 	int64 limit  = 1;
@@ -260,10 +260,10 @@ message InstallReleaseRequest {
 	// DisableHooks causes the server to skip running any hooks for the install.
 	bool disable_hooks = 5;
 
-	// Namepace is the kubernetes namespace of the release.
+	// Namespace is the kubernetes namespace of the release.
 	string namespace = 6;
 
-	// ReuseName requests that Tiller re-uses a name, instead of erroring out.
+	// Reuse_name requests that Tiller re-uses a name, instead of erroring out.
 	bool reuse_name = 7;
 
 	// timeout specifies the max amount of time any kubernetes client command can run.

From c551fb7ef6e51e149a77d650440f8a61c7d493d5 Mon Sep 17 00:00:00 2001
From: roc <roc@imroc.io>
Date: Sun, 8 Jul 2018 17:08:48 +0800
Subject: [PATCH 36/54] docs(helm): add helm-cos to related helm plugins

---
 docs/related.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/related.md b/docs/related.md
index bf55df549..bac9e899b 100644
--- a/docs/related.md
+++ b/docs/related.md
@@ -39,6 +39,7 @@ or [pull request](https://github.com/kubernetes/helm/pulls).
 - [helm-secrets](https://github.com/futuresimple/helm-secrets) - Plugin to manage and store secrets safely
 - [helm-edit](https://github.com/mstrzele/helm-edit) - Plugin for editing release's values
 - [helm-gcs](https://github.com/nouney/helm-gcs) - Plugin to manage repositories on Google Cloud Storage
+- [helm-cos](https://github.com/imroc/helm-cos) - Plugin to manage repositories on Tencent Cloud Object Storage
 - [helm-github](https://github.com/sagansystems/helm-github) - Plugin to install Helm Charts from Github repositories
 - [helm-monitor](https://github.com/ContainerSolutions/helm-monitor) - Plugin to monitor a release and rollback based on Prometheus/ElasticSearch query
 - [helm-k8comp](https://github.com/cststack/k8comp) - Plugin to create Helm Charts from hiera using k8comp

From 5a43a80e95e9155a2880cf12119822e33734c127 Mon Sep 17 00:00:00 2001
From: Michelle Noorali <michellemolu@gmail.com>
Date: Tue, 10 Jul 2018 18:18:41 -0400
Subject: [PATCH 37/54] chore(docs): lowercase `Kind` for clarity

`Kind` being upper case makes it seem like we're referrring to
the Kind field of a Kubernetes resource but we're really talking
about the kind of helm hook in this case.
resolves #4302
---
 docs/charts_hooks.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/charts_hooks.md b/docs/charts_hooks.md
index f51749f57..b6c276bba 100644
--- a/docs/charts_hooks.md
+++ b/docs/charts_hooks.md
@@ -183,8 +183,7 @@ deterministic executing order. Weights are defined using the following annotatio
 ```
 
 Hook weights can be positive or negative numbers but must be represented as
-strings. When Tiller starts the execution cycle of hooks of a particular Kind it
-will sort those hooks in ascending order. 
+strings. When Tiller starts the execution cycle of hooks of a particular kind (ex. the `pre-install` hooks or `post-install` hooks, etc.) it will sort those hooks in ascending order.
 
 It is also possible to define policies that determine when to delete corresponding hook resources. Hook deletion policies are defined using the following annotation:
 

From 6767f3cf08b30fda5f031cda7e2d0cb9d66a7bd8 Mon Sep 17 00:00:00 2001
From: fibonacci1729 <brian@deis.com>
Date: Tue, 10 Jul 2018 17:51:03 -0600
Subject: [PATCH 38/54] fix(helm): return when listing with no releases or nil

---
 cmd/helm/list.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cmd/helm/list.go b/cmd/helm/list.go
index 4614c7f67..47417749f 100644
--- a/cmd/helm/list.go
+++ b/cmd/helm/list.go
@@ -166,8 +166,11 @@ func (l *listCmd) run() error {
 	if err != nil {
 		return prettyError(err)
 	}
+	if res == nil {
+		return nil
+	}
 
-	rels := filterList(res.Releases)
+	rels := filterList(res.GetReleases())
 
 	result := getListResult(rels, res.Next)
 

From aaf1c6a35218c40d9facc7b8fe1060226cae5fc6 Mon Sep 17 00:00:00 2001
From: fibonacci1729 <brian@deis.com>
Date: Thu, 12 Jul 2018 13:26:07 -0600
Subject: [PATCH 39/54] docs(*): update tiller_ssl docs to reflect IP SAN
 usage.

When using helm/tiller in tls-verify mode, 127.0.0.1 should
be listed as an IP SAN in the tiller certificate to pass
hostname verficiation of the TLS handshake.

Closes #4149
---
 docs/tiller_ssl.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/tiller_ssl.md b/docs/tiller_ssl.md
index 6db195507..963e36e40 100644
--- a/docs/tiller_ssl.md
+++ b/docs/tiller_ssl.md
@@ -284,6 +284,21 @@ the host name that Helm connects to matches the host name on the certificate. In
 some cases this is awkward, since Helm will connect over localhost, or the FQDN is
 not available for public resolution.
 
+*If I use `--tls-verify` on the client, I get `Error: x509: cannot validate certificate for 127.0.0.1 because it doesn't contain any IP SANs`*
+
+By default, the Helm client connects to Tiller via tunnel (i.e. kube proxy) at 127.0.0.1. During the TLS handshake,
+a target, usually provided as a hostname (e.g. example.com), is checked against the subject and subject alternative
+names of the certificate (i.e. hostname verficiation). However, because of the tunnel, the target is an IP address.
+Therefore, to validate the certificate, the IP address 127.0.0.1 must be listed as an IP subject alternative name
+(IP SAN) in the Tiller certificate.
+
+For example, to list 127.0.0.1 as an IP SAN when generating the Tiller certificate:
+
+```console
+$ echo subjectAltName=IP:127.0.0.1 > extfile.cnf
+$ openssl x509 -req -CA ca.cert.pem -CAkey ca.key.pem -CAcreateserial -in tiller.csr.pem -out tiller.cert.pem -days 365 -extfile extfile.cnf
+```
+
 *If I use `--tls-verify` on the client, I get `Error: x509: certificate has expired or is not yet valid`*
 
 Your helm certificate has expired, you need to sign a new certificate using your private key and the CA (and consider increasing the number of days)

From 7faf62a209e91bfae17522e4a63c750a3482f6f3 Mon Sep 17 00:00:00 2001
From: fibonacci1729 <brian@deis.com>
Date: Mon, 16 Jul 2018 13:40:42 -0600
Subject: [PATCH 40/54] fix(helm): add --tls-hostname flag to tls-flags

---
 cmd/helm/helm.go   | 11 +++++++++--
 pkg/tlsutil/cfg.go | 11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/cmd/helm/helm.go b/cmd/helm/helm.go
index 4c7ca9290..99075b8ab 100644
--- a/cmd/helm/helm.go
+++ b/cmd/helm/helm.go
@@ -40,6 +40,7 @@ import (
 )
 
 var (
+	tlsServerName string // overrides the server name used to verify the hostname on the returned certificates from the server.
 	tlsCaCertFile string // path to TLS CA certificate file
 	tlsCertFile   string // path to TLS certificate file
 	tlsKeyFile    string // path to TLS key file
@@ -280,8 +281,13 @@ func newClient() helm.Interface {
 		if tlsKeyFile == "" {
 			tlsKeyFile = settings.Home.TLSKey()
 		}
-		debug("Key=%q, Cert=%q, CA=%q\n", tlsKeyFile, tlsCertFile, tlsCaCertFile)
-		tlsopts := tlsutil.Options{KeyFile: tlsKeyFile, CertFile: tlsCertFile, InsecureSkipVerify: true}
+		debug("Host=%q, Key=%q, Cert=%q, CA=%q\n", tlsKeyFile, tlsCertFile, tlsCaCertFile)
+		tlsopts := tlsutil.Options{
+			ServerName:         tlsServerName,
+			KeyFile:            tlsKeyFile,
+			CertFile:           tlsCertFile,
+			InsecureSkipVerify: true,
+		}
 		if tlsVerify {
 			tlsopts.CaCertFile = tlsCaCertFile
 			tlsopts.InsecureSkipVerify = false
@@ -301,6 +307,7 @@ func newClient() helm.Interface {
 func addFlagsTLS(cmd *cobra.Command) *cobra.Command {
 
 	// add flags
+	cmd.Flags().StringVar(&tlsServerName, "tls-hostname", settings.TillerHost, "the server name used to verify the hostname on the returned certificates from the server")
 	cmd.Flags().StringVar(&tlsCaCertFile, "tls-ca-cert", tlsCaCertDefault, "path to TLS CA certificate file")
 	cmd.Flags().StringVar(&tlsCertFile, "tls-cert", tlsCertDefault, "path to TLS certificate file")
 	cmd.Flags().StringVar(&tlsKeyFile, "tls-key", tlsKeyDefault, "path to TLS key file")
diff --git a/pkg/tlsutil/cfg.go b/pkg/tlsutil/cfg.go
index 9ce3109e1..3cc18d3d2 100644
--- a/pkg/tlsutil/cfg.go
+++ b/pkg/tlsutil/cfg.go
@@ -33,6 +33,9 @@ type Options struct {
 	CertFile string
 	// Client-only options
 	InsecureSkipVerify bool
+	// Overrides the server name used to verify the hostname on the returned
+	// certificates from the server.
+	ServerName string
 	// Server-only options
 	ClientAuth tls.ClientAuthType
 }
@@ -55,8 +58,12 @@ func ClientConfig(opts Options) (cfg *tls.Config, err error) {
 			return nil, err
 		}
 	}
-
-	cfg = &tls.Config{InsecureSkipVerify: opts.InsecureSkipVerify, Certificates: []tls.Certificate{*cert}, RootCAs: pool}
+	cfg = &tls.Config{
+		InsecureSkipVerify: opts.InsecureSkipVerify,
+		Certificates:       []tls.Certificate{*cert},
+		ServerName:         opts.ServerName,
+		RootCAs:            pool,
+	}
 	return cfg, nil
 }
 

From aedd306e83fa8319ddaaa9df0a9e5111c3538e37 Mon Sep 17 00:00:00 2001
From: Brian <fibonacci1729@users.noreply.github.com>
Date: Mon, 16 Jul 2018 13:46:50 -0600
Subject: [PATCH 41/54] Revert "fix(helm): add `--tls-hostname` flag to tls
 flags."

---
 cmd/helm/helm.go   | 11 ++---------
 docs/tiller_ssl.md | 15 ---------------
 pkg/tlsutil/cfg.go | 11 ++---------
 3 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/cmd/helm/helm.go b/cmd/helm/helm.go
index 99075b8ab..4c7ca9290 100644
--- a/cmd/helm/helm.go
+++ b/cmd/helm/helm.go
@@ -40,7 +40,6 @@ import (
 )
 
 var (
-	tlsServerName string // overrides the server name used to verify the hostname on the returned certificates from the server.
 	tlsCaCertFile string // path to TLS CA certificate file
 	tlsCertFile   string // path to TLS certificate file
 	tlsKeyFile    string // path to TLS key file
@@ -281,13 +280,8 @@ func newClient() helm.Interface {
 		if tlsKeyFile == "" {
 			tlsKeyFile = settings.Home.TLSKey()
 		}
-		debug("Host=%q, Key=%q, Cert=%q, CA=%q\n", tlsKeyFile, tlsCertFile, tlsCaCertFile)
-		tlsopts := tlsutil.Options{
-			ServerName:         tlsServerName,
-			KeyFile:            tlsKeyFile,
-			CertFile:           tlsCertFile,
-			InsecureSkipVerify: true,
-		}
+		debug("Key=%q, Cert=%q, CA=%q\n", tlsKeyFile, tlsCertFile, tlsCaCertFile)
+		tlsopts := tlsutil.Options{KeyFile: tlsKeyFile, CertFile: tlsCertFile, InsecureSkipVerify: true}
 		if tlsVerify {
 			tlsopts.CaCertFile = tlsCaCertFile
 			tlsopts.InsecureSkipVerify = false
@@ -307,7 +301,6 @@ func newClient() helm.Interface {
 func addFlagsTLS(cmd *cobra.Command) *cobra.Command {
 
 	// add flags
-	cmd.Flags().StringVar(&tlsServerName, "tls-hostname", settings.TillerHost, "the server name used to verify the hostname on the returned certificates from the server")
 	cmd.Flags().StringVar(&tlsCaCertFile, "tls-ca-cert", tlsCaCertDefault, "path to TLS CA certificate file")
 	cmd.Flags().StringVar(&tlsCertFile, "tls-cert", tlsCertDefault, "path to TLS certificate file")
 	cmd.Flags().StringVar(&tlsKeyFile, "tls-key", tlsKeyDefault, "path to TLS key file")
diff --git a/docs/tiller_ssl.md b/docs/tiller_ssl.md
index 963e36e40..6db195507 100644
--- a/docs/tiller_ssl.md
+++ b/docs/tiller_ssl.md
@@ -284,21 +284,6 @@ the host name that Helm connects to matches the host name on the certificate. In
 some cases this is awkward, since Helm will connect over localhost, or the FQDN is
 not available for public resolution.
 
-*If I use `--tls-verify` on the client, I get `Error: x509: cannot validate certificate for 127.0.0.1 because it doesn't contain any IP SANs`*
-
-By default, the Helm client connects to Tiller via tunnel (i.e. kube proxy) at 127.0.0.1. During the TLS handshake,
-a target, usually provided as a hostname (e.g. example.com), is checked against the subject and subject alternative
-names of the certificate (i.e. hostname verficiation). However, because of the tunnel, the target is an IP address.
-Therefore, to validate the certificate, the IP address 127.0.0.1 must be listed as an IP subject alternative name
-(IP SAN) in the Tiller certificate.
-
-For example, to list 127.0.0.1 as an IP SAN when generating the Tiller certificate:
-
-```console
-$ echo subjectAltName=IP:127.0.0.1 > extfile.cnf
-$ openssl x509 -req -CA ca.cert.pem -CAkey ca.key.pem -CAcreateserial -in tiller.csr.pem -out tiller.cert.pem -days 365 -extfile extfile.cnf
-```
-
 *If I use `--tls-verify` on the client, I get `Error: x509: certificate has expired or is not yet valid`*
 
 Your helm certificate has expired, you need to sign a new certificate using your private key and the CA (and consider increasing the number of days)
diff --git a/pkg/tlsutil/cfg.go b/pkg/tlsutil/cfg.go
index 3cc18d3d2..9ce3109e1 100644
--- a/pkg/tlsutil/cfg.go
+++ b/pkg/tlsutil/cfg.go
@@ -33,9 +33,6 @@ type Options struct {
 	CertFile string
 	// Client-only options
 	InsecureSkipVerify bool
-	// Overrides the server name used to verify the hostname on the returned
-	// certificates from the server.
-	ServerName string
 	// Server-only options
 	ClientAuth tls.ClientAuthType
 }
@@ -58,12 +55,8 @@ func ClientConfig(opts Options) (cfg *tls.Config, err error) {
 			return nil, err
 		}
 	}
-	cfg = &tls.Config{
-		InsecureSkipVerify: opts.InsecureSkipVerify,
-		Certificates:       []tls.Certificate{*cert},
-		ServerName:         opts.ServerName,
-		RootCAs:            pool,
-	}
+
+	cfg = &tls.Config{InsecureSkipVerify: opts.InsecureSkipVerify, Certificates: []tls.Certificate{*cert}, RootCAs: pool}
 	return cfg, nil
 }
 

From 327080161dce6921ec5ca085d404b7cadbdc3ae7 Mon Sep 17 00:00:00 2001
From: Mike Lundy <mike@fluffypenguin.org>
Date: Mon, 16 Jul 2018 17:10:16 -0700
Subject: [PATCH 42/54] [fake] make InstallReleaseFromChart obey DryRun

---
 pkg/helm/fake.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg/helm/fake.go b/pkg/helm/fake.go
index 2f0ad90b8..39909cfcd 100644
--- a/pkg/helm/fake.go
+++ b/pkg/helm/fake.go
@@ -97,7 +97,9 @@ func (c *FakeClient) InstallReleaseFromChart(chart *chart.Chart, ns string, opts
 	}
 
 	release := ReleaseMock(&MockReleaseOptions{Name: releaseName, Namespace: ns, Description: releaseDescription})
-	c.Rels = append(c.Rels, release)
+	if !c.Opts.dryRun {
+		c.Rels = append(c.Rels, release)
+	}
 
 	return &rls.InstallReleaseResponse{
 		Release: release,

From a6ab04be4d6f214e664a388101cdd8ace56015ab Mon Sep 17 00:00:00 2001
From: Mike Lundy <mike@fluffypenguin.org>
Date: Mon, 16 Jul 2018 17:15:56 -0700
Subject: [PATCH 43/54] [fake] return the correct error message for missing
 releases

---
 pkg/helm/fake.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/helm/fake.go b/pkg/helm/fake.go
index 39909cfcd..05235c92a 100644
--- a/pkg/helm/fake.go
+++ b/pkg/helm/fake.go
@@ -18,7 +18,6 @@ package helm // import "k8s.io/helm/pkg/helm"
 
 import (
 	"errors"
-	"fmt"
 	"math/rand"
 	"sync"
 
@@ -27,6 +26,7 @@ import (
 	"k8s.io/helm/pkg/proto/hapi/release"
 	rls "k8s.io/helm/pkg/proto/hapi/services"
 	"k8s.io/helm/pkg/proto/hapi/version"
+	storage "k8s.io/helm/pkg/storage/driver"
 )
 
 // FakeClient implements Interface
@@ -117,7 +117,7 @@ func (c *FakeClient) DeleteRelease(rlsName string, opts ...DeleteOption) (*rls.U
 		}
 	}
 
-	return nil, fmt.Errorf("No such release: %s", rlsName)
+	return nil, storage.ErrReleaseNotFound(rlsName)
 }
 
 // GetVersion returns a fake version
@@ -161,7 +161,7 @@ func (c *FakeClient) ReleaseStatus(rlsName string, opts ...StatusOption) (*rls.G
 			}, nil
 		}
 	}
-	return nil, fmt.Errorf("No such release: %s", rlsName)
+	return nil, storage.ErrReleaseNotFound(rlsName)
 }
 
 // ReleaseContent returns the configuration for the matching release name in the fake release client.
@@ -173,7 +173,7 @@ func (c *FakeClient) ReleaseContent(rlsName string, opts ...ContentOption) (resp
 			}, nil
 		}
 	}
-	return resp, fmt.Errorf("No such release: %s", rlsName)
+	return resp, storage.ErrReleaseNotFound(rlsName)
 }
 
 // ReleaseHistory returns a release's revision history.

From 01da56f956329bbfcef14ac164f9ab49081ad108 Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik.i.sundell@gmail.com>
Date: Wed, 18 Jul 2018 16:01:11 -0400
Subject: [PATCH 44/54] helm template cmd - conformity of output (#3811)

By changing a string from `##---` to `---` the output written to files matches the output generated to stdout.
---
 cmd/helm/template.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/helm/template.go b/cmd/helm/template.go
index 7e3eb48a7..9ba217871 100644
--- a/cmd/helm/template.go
+++ b/cmd/helm/template.go
@@ -309,7 +309,7 @@ func writeToFile(outputDir string, name string, data string) error {
 
 	defer f.Close()
 
-	_, err = f.WriteString(fmt.Sprintf("##---\n# Source: %s\n%s", name, data))
+	_, err = f.WriteString(fmt.Sprintf("---\n# Source: %s\n%s", name, data))
 
 	if err != nil {
 		return err

From 57e7b07c3e9fedd46cd81db4e9315f7edca3dd6e Mon Sep 17 00:00:00 2001
From: Michelle Noorali <michellemolu@gmail.com>
Date: Fri, 20 Jul 2018 12:12:08 -0400
Subject: [PATCH 45/54] ref(docs): add more links to tiller rbac info

---
 docs/install.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/install.md b/docs/install.md
index 17905a805..cc7f75a3a 100755
--- a/docs/install.md
+++ b/docs/install.md
@@ -122,6 +122,7 @@ You can explicitly tell `helm init` to...
 - Install a particular image (version) with `--tiller-image`
 - Install to a particular cluster with `--kube-context`
 - Install into a particular namespace with `--tiller-namespace`
+- Install Tiller with a Service Account with `--service-account` (for [RBAC enabled clusters](securing_installation.md#rbac))
 
 Once Tiller is installed, running `helm version` should show you both
 the client and server version. (If it shows only the client version,

From 30f245c0d3178cb185c0a72e0c79369626e221ce Mon Sep 17 00:00:00 2001
From: Michelle Noorali <michellemolu@gmail.com>
Date: Fri, 20 Jul 2018 13:23:43 -0400
Subject: [PATCH 46/54] docs(rbac.md): delete redundant step

---
 docs/rbac.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/docs/rbac.md b/docs/rbac.md
index 36d06e62a..4af36203c 100644
--- a/docs/rbac.md
+++ b/docs/rbac.md
@@ -14,11 +14,6 @@ Once you have satisfied the pre-requisite and have a service account with the co
 
 ### Example: Service account with cluster-admin role
 
-```console
-$ kubectl create serviceaccount tiller --namespace kube-system
-serviceaccount "tiller" created
-```
-
 In `rbac-config.yaml`:
 
 ```yaml

From 02f8130dbe1d46e5c8c47c8db9f2420c69e4aeb0 Mon Sep 17 00:00:00 2001
From: Dan Clarke <dan@dracan.co.uk>
Date: Fri, 20 Jul 2018 18:42:17 +0100
Subject: [PATCH 47/54] Add missing space
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Yeah, I know - very trivial, but ¯\_(ツ)_/¯ :)
---
 docs/quickstart.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/quickstart.md b/docs/quickstart.md
index 52a7c800f..8622137b2 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -65,7 +65,7 @@ This will install Tiller into the Kubernetes cluster you saw with
 
 **TIP:** When you want to upgrade Tiller, just run `helm init --upgrade`.
 
-By default, when Tiller is installed,it does not have authentication enabled.
+By default, when Tiller is installed, it does not have authentication enabled.
 To learn more about configuring strong TLS authentication for Tiller, consult
 [the Tiller TLS guide](tiller_ssl.md).
 

From 4efa18a5ec135229e36d3aeaca0f3cfa5a0fdb38 Mon Sep 17 00:00:00 2001
From: Rohan Chakravarthy <rohan.c219@gmail.com>
Date: Mon, 23 Jul 2018 12:40:54 -0700
Subject: [PATCH 48/54] feat(helm): Add the --kubeconfig flag (#4235)

Adds the ability to specify a kubeconfig file that overrides $KUBECONFIG
---
 cmd/helm/helm.go                         | 14 +++++++-------
 cmd/helm/init.go                         |  4 ++--
 cmd/helm/install.go                      |  2 +-
 cmd/helm/reset.go                        |  2 +-
 cmd/helm/version.go                      |  8 +++++---
 docs/helm/helm.md                        |  3 ++-
 docs/helm/helm_completion.md             |  3 ++-
 docs/helm/helm_create.md                 |  3 ++-
 docs/helm/helm_delete.md                 |  3 ++-
 docs/helm/helm_dependency.md             |  3 ++-
 docs/helm/helm_dependency_build.md       |  3 ++-
 docs/helm/helm_dependency_list.md        |  3 ++-
 docs/helm/helm_dependency_update.md      |  3 ++-
 docs/helm/helm_fetch.md                  |  3 +++
 docs/helm/helm_get.md                    |  3 ++-
 docs/helm/helm_get_hooks.md              |  3 ++-
 docs/helm/helm_get_manifest.md           |  3 ++-
 docs/helm/helm_get_values.md             |  3 ++-
 docs/helm/helm_history.md                |  3 ++-
 docs/helm/helm_home.md                   |  3 ++-
 docs/helm/helm_init.md                   |  3 ++-
 docs/helm/helm_inspect.md                |  3 ++-
 docs/helm/helm_inspect_chart.md          |  3 ++-
 docs/helm/helm_inspect_readme.md         |  3 ++-
 docs/helm/helm_inspect_values.md         |  3 ++-
 docs/helm/helm_install.md                |  3 ++-
 docs/helm/helm_lint.md                   |  3 ++-
 docs/helm/helm_list.md                   |  3 ++-
 docs/helm/helm_package.md                |  3 ++-
 docs/helm/helm_plugin.md                 |  3 ++-
 docs/helm/helm_plugin_install.md         |  3 ++-
 docs/helm/helm_plugin_list.md            |  3 ++-
 docs/helm/helm_plugin_remove.md          |  3 ++-
 docs/helm/helm_plugin_update.md          |  3 ++-
 docs/helm/helm_repo.md                   |  3 ++-
 docs/helm/helm_repo_add.md               |  3 ++-
 docs/helm/helm_repo_index.md             |  3 ++-
 docs/helm/helm_repo_list.md              |  3 ++-
 docs/helm/helm_repo_remove.md            |  3 ++-
 docs/helm/helm_repo_update.md            |  3 ++-
 docs/helm/helm_reset.md                  |  3 ++-
 docs/helm/helm_rollback.md               |  3 ++-
 docs/helm/helm_search.md                 |  3 ++-
 docs/helm/helm_serve.md                  |  3 ++-
 docs/helm/helm_status.md                 |  3 ++-
 docs/helm/helm_template.md               |  3 ++-
 docs/helm/helm_test.md                   |  3 ++-
 docs/helm/helm_upgrade.md                |  3 ++-
 docs/helm/helm_verify.md                 |  3 ++-
 docs/helm/helm_version.md                |  3 ++-
 pkg/helm/environment/environment.go      |  3 +++
 pkg/helm/environment/environment_test.go | 10 +++++++---
 pkg/kube/config.go                       | 11 +++++++++--
 53 files changed, 126 insertions(+), 63 deletions(-)

diff --git a/cmd/helm/helm.go b/cmd/helm/helm.go
index 4c7ca9290..be3ced376 100644
--- a/cmd/helm/helm.go
+++ b/cmd/helm/helm.go
@@ -169,7 +169,7 @@ func markDeprecated(cmd *cobra.Command, notice string) *cobra.Command {
 
 func setupConnection() error {
 	if settings.TillerHost == "" {
-		config, client, err := getKubeClient(settings.KubeContext)
+		config, client, err := getKubeClient(settings.KubeContext, settings.KubeConfig)
 		if err != nil {
 			return err
 		}
@@ -223,8 +223,8 @@ func prettyError(err error) error {
 }
 
 // configForContext creates a Kubernetes REST client configuration for a given kubeconfig context.
-func configForContext(context string) (*rest.Config, error) {
-	config, err := kube.GetConfig(context).ClientConfig()
+func configForContext(context string, kubeconfig string) (*rest.Config, error) {
+	config, err := kube.GetConfig(context, kubeconfig).ClientConfig()
 	if err != nil {
 		return nil, fmt.Errorf("could not get Kubernetes config for context %q: %s", context, err)
 	}
@@ -232,8 +232,8 @@ func configForContext(context string) (*rest.Config, error) {
 }
 
 // getKubeClient creates a Kubernetes config and client for a given kubeconfig context.
-func getKubeClient(context string) (*rest.Config, kubernetes.Interface, error) {
-	config, err := configForContext(context)
+func getKubeClient(context string, kubeconfig string) (*rest.Config, kubernetes.Interface, error) {
+	config, err := configForContext(context, kubeconfig)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -247,8 +247,8 @@ func getKubeClient(context string) (*rest.Config, kubernetes.Interface, error) {
 // getInternalKubeClient creates a Kubernetes config and an "internal" client for a given kubeconfig context.
 //
 // Prefer the similar getKubeClient if you don't need to use such an internal client.
-func getInternalKubeClient(context string) (internalclientset.Interface, error) {
-	config, err := configForContext(context)
+func getInternalKubeClient(context string, kubeconfig string) (internalclientset.Interface, error) {
+	config, err := configForContext(context, kubeconfig)
 	if err != nil {
 		return nil, err
 	}
diff --git a/cmd/helm/init.go b/cmd/helm/init.go
index 92f4c3794..93073b9c1 100644
--- a/cmd/helm/init.go
+++ b/cmd/helm/init.go
@@ -289,7 +289,7 @@ func (i *initCmd) run() error {
 
 	if !i.clientOnly {
 		if i.kubeClient == nil {
-			_, c, err := getKubeClient(settings.KubeContext)
+			_, c, err := getKubeClient(settings.KubeContext, settings.KubeConfig)
 			if err != nil {
 				return fmt.Errorf("could not get kubernetes client: %s", err)
 			}
@@ -332,7 +332,7 @@ func (i *initCmd) run() error {
 
 func (i *initCmd) ping() error {
 	if i.wait {
-		_, kubeClient, err := getKubeClient(settings.KubeContext)
+		_, kubeClient, err := getKubeClient(settings.KubeContext, settings.KubeConfig)
 		if err != nil {
 			return err
 		}
diff --git a/cmd/helm/install.go b/cmd/helm/install.go
index ee4e76a2b..a6a8758ed 100644
--- a/cmd/helm/install.go
+++ b/cmd/helm/install.go
@@ -491,7 +491,7 @@ func generateName(nameTemplate string) (string, error) {
 }
 
 func defaultNamespace() string {
-	if ns, _, err := kube.GetConfig(settings.KubeContext).Namespace(); err == nil {
+	if ns, _, err := kube.GetConfig(settings.KubeContext, settings.KubeConfig).Namespace(); err == nil {
 		return ns
 	}
 	return "default"
diff --git a/cmd/helm/reset.go b/cmd/helm/reset.go
index 9d3e17e03..1fe0ce39f 100644
--- a/cmd/helm/reset.go
+++ b/cmd/helm/reset.go
@@ -86,7 +86,7 @@ func newResetCmd(client helm.Interface, out io.Writer) *cobra.Command {
 // runReset uninstalls tiller from Kubernetes Cluster and deletes local config
 func (d *resetCmd) run() error {
 	if d.kubeClient == nil {
-		c, err := getInternalKubeClient(settings.KubeContext)
+		c, err := getInternalKubeClient(settings.KubeContext, settings.KubeConfig)
 		if err != nil {
 			return fmt.Errorf("could not get kubernetes client: %s", err)
 		}
diff --git a/cmd/helm/version.go b/cmd/helm/version.go
index d541067a0..407c2bf43 100644
--- a/cmd/helm/version.go
+++ b/cmd/helm/version.go
@@ -76,7 +76,10 @@ func newVersionCmd(c helm.Interface, out io.Writer) *cobra.Command {
 			if version.showServer {
 				// We do this manually instead of in PreRun because we only
 				// need a tunnel if server version is requested.
-				setupConnection()
+				err := setupConnection()
+				if err != nil {
+					return err
+				}
 			}
 			version.client = ensureHelmClient(version.client)
 			return version.run()
@@ -115,7 +118,6 @@ func (v *versionCmd) run() error {
 		}
 		fmt.Fprintf(v.out, "Kubernetes: %#v\n", k8sVersion)
 	}
-
 	resp, err := v.client.GetVersion()
 	if err != nil {
 		if grpc.Code(err) == codes.Unimplemented {
@@ -135,7 +137,7 @@ func (v *versionCmd) run() error {
 
 func getK8sVersion() (*apiVersion.Info, error) {
 	var v *apiVersion.Info
-	_, client, err := getKubeClient(settings.KubeContext)
+	_, client, err := getKubeClient(settings.KubeContext, settings.KubeConfig)
 	if err != nil {
 		return v, err
 	}
diff --git a/docs/helm/helm.md b/docs/helm/helm.md
index 8592cad7c..ae27de401 100644
--- a/docs/helm/helm.md
+++ b/docs/helm/helm.md
@@ -36,6 +36,7 @@ Environment:
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -68,4 +69,4 @@ Environment:
 * [helm verify](helm_verify.md)	 - verify that a chart at the given path has been signed and is valid
 * [helm version](helm_version.md)	 - print the client/server version information
 
-###### Auto generated by spf13/cobra on 14-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_completion.md b/docs/helm/helm_completion.md
index 994205d88..64a6056f8 100644
--- a/docs/helm/helm_completion.md
+++ b/docs/helm/helm_completion.md
@@ -28,6 +28,7 @@ helm completion SHELL
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -35,4 +36,4 @@ helm completion SHELL
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_create.md b/docs/helm/helm_create.md
index 6e0f3de78..7ae947ed7 100644
--- a/docs/helm/helm_create.md
+++ b/docs/helm/helm_create.md
@@ -47,6 +47,7 @@ helm create NAME
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -54,4 +55,4 @@ helm create NAME
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_delete.md b/docs/helm/helm_delete.md
index 9eee6e8ec..e181f439e 100644
--- a/docs/helm/helm_delete.md
+++ b/docs/helm/helm_delete.md
@@ -39,6 +39,7 @@ helm delete [flags] RELEASE_NAME [...]
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -46,4 +47,4 @@ helm delete [flags] RELEASE_NAME [...]
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 13-Apr-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_dependency.md b/docs/helm/helm_dependency.md
index 34d49e20a..b0085c6c7 100644
--- a/docs/helm/helm_dependency.md
+++ b/docs/helm/helm_dependency.md
@@ -61,6 +61,7 @@ for this case.
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -71,4 +72,4 @@ for this case.
 * [helm dependency list](helm_dependency_list.md)	 - list the dependencies for the given chart
 * [helm dependency update](helm_dependency_update.md)	 - update charts/ based on the contents of requirements.yaml
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_dependency_build.md b/docs/helm/helm_dependency_build.md
index 0413a9a85..eea2fa02c 100644
--- a/docs/helm/helm_dependency_build.md
+++ b/docs/helm/helm_dependency_build.md
@@ -34,6 +34,7 @@ helm dependency build [flags] CHART
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -41,4 +42,4 @@ helm dependency build [flags] CHART
 ### SEE ALSO
 * [helm dependency](helm_dependency.md)	 - manage a chart's dependencies
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_dependency_list.md b/docs/helm/helm_dependency_list.md
index b4343081c..d6bc0175a 100644
--- a/docs/helm/helm_dependency_list.md
+++ b/docs/helm/helm_dependency_list.md
@@ -26,6 +26,7 @@ helm dependency list [flags] CHART
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -33,4 +34,4 @@ helm dependency list [flags] CHART
 ### SEE ALSO
 * [helm dependency](helm_dependency.md)	 - manage a chart's dependencies
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_dependency_update.md b/docs/helm/helm_dependency_update.md
index 3c90ff779..90b81ecea 100644
--- a/docs/helm/helm_dependency_update.md
+++ b/docs/helm/helm_dependency_update.md
@@ -39,6 +39,7 @@ helm dependency update [flags] CHART
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -46,4 +47,4 @@ helm dependency update [flags] CHART
 ### SEE ALSO
 * [helm dependency](helm_dependency.md)	 - manage a chart's dependencies
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_fetch.md b/docs/helm/helm_fetch.md
index 1ddef65fa..c347d1620 100644
--- a/docs/helm/helm_fetch.md
+++ b/docs/helm/helm_fetch.md
@@ -50,9 +50,12 @@ helm fetch [flags] [chart URL | repo/chartname] [...]
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
+
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_get.md b/docs/helm/helm_get.md
index 9cd70e520..f233cd2a7 100644
--- a/docs/helm/helm_get.md
+++ b/docs/helm/helm_get.md
@@ -40,6 +40,7 @@ helm get [flags] RELEASE_NAME
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -50,4 +51,4 @@ helm get [flags] RELEASE_NAME
 * [helm get manifest](helm_get_manifest.md)	 - download the manifest for a named release
 * [helm get values](helm_get_values.md)	 - download the values file for a named release
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_get_hooks.md b/docs/helm/helm_get_hooks.md
index 85fa5d04b..4f9fa1887 100644
--- a/docs/helm/helm_get_hooks.md
+++ b/docs/helm/helm_get_hooks.md
@@ -33,6 +33,7 @@ helm get hooks [flags] RELEASE_NAME
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -40,4 +41,4 @@ helm get hooks [flags] RELEASE_NAME
 ### SEE ALSO
 * [helm get](helm_get.md)	 - download a named release
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_get_manifest.md b/docs/helm/helm_get_manifest.md
index a00c1be56..3ae55ef3e 100644
--- a/docs/helm/helm_get_manifest.md
+++ b/docs/helm/helm_get_manifest.md
@@ -35,6 +35,7 @@ helm get manifest [flags] RELEASE_NAME
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -42,4 +43,4 @@ helm get manifest [flags] RELEASE_NAME
 ### SEE ALSO
 * [helm get](helm_get.md)	 - download a named release
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_get_values.md b/docs/helm/helm_get_values.md
index d8944b475..12d973122 100644
--- a/docs/helm/helm_get_values.md
+++ b/docs/helm/helm_get_values.md
@@ -32,6 +32,7 @@ helm get values [flags] RELEASE_NAME
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -39,4 +40,4 @@ helm get values [flags] RELEASE_NAME
 ### SEE ALSO
 * [helm get](helm_get.md)	 - download a named release
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_history.md b/docs/helm/helm_history.md
index ac51a8994..437e70f03 100755
--- a/docs/helm/helm_history.md
+++ b/docs/helm/helm_history.md
@@ -45,6 +45,7 @@ helm history [flags] RELEASE_NAME
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -52,4 +53,4 @@ helm history [flags] RELEASE_NAME
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 14-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_home.md b/docs/helm/helm_home.md
index bdccd756f..9af12c91a 100644
--- a/docs/helm/helm_home.md
+++ b/docs/helm/helm_home.md
@@ -21,6 +21,7 @@ helm home
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -28,4 +29,4 @@ helm home
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_init.md b/docs/helm/helm_init.md
index 5374488af..ec775520a 100644
--- a/docs/helm/helm_init.md
+++ b/docs/helm/helm_init.md
@@ -64,6 +64,7 @@ helm init
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -71,4 +72,4 @@ helm init
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_inspect.md b/docs/helm/helm_inspect.md
index e46b3dbf4..4bc904f63 100644
--- a/docs/helm/helm_inspect.md
+++ b/docs/helm/helm_inspect.md
@@ -37,6 +37,7 @@ helm inspect [CHART]
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -47,4 +48,4 @@ helm inspect [CHART]
 * [helm inspect readme](helm_inspect_readme.md)	 - shows inspect readme
 * [helm inspect values](helm_inspect_values.md)	 - shows inspect values
 
-###### Auto generated by spf13/cobra on 14-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_inspect_chart.md b/docs/helm/helm_inspect_chart.md
index cd1328b59..257f26051 100644
--- a/docs/helm/helm_inspect_chart.md
+++ b/docs/helm/helm_inspect_chart.md
@@ -35,6 +35,7 @@ helm inspect chart [CHART]
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -42,4 +43,4 @@ helm inspect chart [CHART]
 ### SEE ALSO
 * [helm inspect](helm_inspect.md)	 - inspect a chart
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_inspect_readme.md b/docs/helm/helm_inspect_readme.md
index 9dd9ebd43..8ff7d892e 100644
--- a/docs/helm/helm_inspect_readme.md
+++ b/docs/helm/helm_inspect_readme.md
@@ -33,6 +33,7 @@ helm inspect readme [CHART]
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -40,4 +41,4 @@ helm inspect readme [CHART]
 ### SEE ALSO
 * [helm inspect](helm_inspect.md)	 - inspect a chart
 
-###### Auto generated by spf13/cobra on 14-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_inspect_values.md b/docs/helm/helm_inspect_values.md
index 6a907cc7d..50ff6ac24 100644
--- a/docs/helm/helm_inspect_values.md
+++ b/docs/helm/helm_inspect_values.md
@@ -35,6 +35,7 @@ helm inspect values [CHART]
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -42,4 +43,4 @@ helm inspect values [CHART]
 ### SEE ALSO
 * [helm inspect](helm_inspect.md)	 - inspect a chart
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_install.md b/docs/helm/helm_install.md
index 62d02cc38..dbb087964 100644
--- a/docs/helm/helm_install.md
+++ b/docs/helm/helm_install.md
@@ -112,6 +112,7 @@ helm install [CHART]
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -119,4 +120,4 @@ helm install [CHART]
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 5-Jun-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_lint.md b/docs/helm/helm_lint.md
index c10322efd..319939bcf 100644
--- a/docs/helm/helm_lint.md
+++ b/docs/helm/helm_lint.md
@@ -35,6 +35,7 @@ helm lint [flags] PATH
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -42,4 +43,4 @@ helm lint [flags] PATH
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 20-May-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_list.md b/docs/helm/helm_list.md
index 99872a413..c7e99e403 100755
--- a/docs/helm/helm_list.md
+++ b/docs/helm/helm_list.md
@@ -67,6 +67,7 @@ helm list [flags] [FILTER]
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -74,4 +75,4 @@ helm list [flags] [FILTER]
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 17-Apr-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_package.md b/docs/helm/helm_package.md
index 21090fa45..30d06fcf0 100644
--- a/docs/helm/helm_package.md
+++ b/docs/helm/helm_package.md
@@ -40,6 +40,7 @@ helm package [flags] [CHART_PATH] [...]
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -47,4 +48,4 @@ helm package [flags] [CHART_PATH] [...]
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_plugin.md b/docs/helm/helm_plugin.md
index cc42aa4dc..bb0498d87 100644
--- a/docs/helm/helm_plugin.md
+++ b/docs/helm/helm_plugin.md
@@ -16,6 +16,7 @@ Manage client-side Helm plugins.
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -27,4 +28,4 @@ Manage client-side Helm plugins.
 * [helm plugin remove](helm_plugin_remove.md)	 - remove one or more Helm plugins
 * [helm plugin update](helm_plugin_update.md)	 - update one or more Helm plugins
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_plugin_install.md b/docs/helm/helm_plugin_install.md
index 196ca97dd..ab45850bf 100644
--- a/docs/helm/helm_plugin_install.md
+++ b/docs/helm/helm_plugin_install.md
@@ -29,6 +29,7 @@ helm plugin install [options] <path|url>...
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -36,4 +37,4 @@ helm plugin install [options] <path|url>...
 ### SEE ALSO
 * [helm plugin](helm_plugin.md)	 - add, list, or remove Helm plugins
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_plugin_list.md b/docs/helm/helm_plugin_list.md
index ddfd04ee6..dc13cdf7a 100644
--- a/docs/helm/helm_plugin_list.md
+++ b/docs/helm/helm_plugin_list.md
@@ -18,6 +18,7 @@ helm plugin list
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -25,4 +26,4 @@ helm plugin list
 ### SEE ALSO
 * [helm plugin](helm_plugin.md)	 - add, list, or remove Helm plugins
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_plugin_remove.md b/docs/helm/helm_plugin_remove.md
index 8543a367a..2ef833217 100644
--- a/docs/helm/helm_plugin_remove.md
+++ b/docs/helm/helm_plugin_remove.md
@@ -18,6 +18,7 @@ helm plugin remove <plugin>...
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -25,4 +26,4 @@ helm plugin remove <plugin>...
 ### SEE ALSO
 * [helm plugin](helm_plugin.md)	 - add, list, or remove Helm plugins
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_plugin_update.md b/docs/helm/helm_plugin_update.md
index 9e5e205f0..93bc3e764 100644
--- a/docs/helm/helm_plugin_update.md
+++ b/docs/helm/helm_plugin_update.md
@@ -18,6 +18,7 @@ helm plugin update <plugin>...
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -25,4 +26,4 @@ helm plugin update <plugin>...
 ### SEE ALSO
 * [helm plugin](helm_plugin.md)	 - add, list, or remove Helm plugins
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_repo.md b/docs/helm/helm_repo.md
index 4109ceca4..32e9d02b2 100644
--- a/docs/helm/helm_repo.md
+++ b/docs/helm/helm_repo.md
@@ -20,6 +20,7 @@ Example usage:
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -32,4 +33,4 @@ Example usage:
 * [helm repo remove](helm_repo_remove.md)	 - remove a chart repository
 * [helm repo update](helm_repo_update.md)	 - update information of available charts locally from chart repositories
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_repo_add.md b/docs/helm/helm_repo_add.md
index 456ffa27e..1deb0cb5c 100644
--- a/docs/helm/helm_repo_add.md
+++ b/docs/helm/helm_repo_add.md
@@ -29,6 +29,7 @@ helm repo add [flags] [NAME] [URL]
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -36,4 +37,4 @@ helm repo add [flags] [NAME] [URL]
 ### SEE ALSO
 * [helm repo](helm_repo.md)	 - add, list, remove, update, and index chart repositories
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_repo_index.md b/docs/helm/helm_repo_index.md
index 14b412b29..baa1291de 100644
--- a/docs/helm/helm_repo_index.md
+++ b/docs/helm/helm_repo_index.md
@@ -34,6 +34,7 @@ helm repo index [flags] [DIR]
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -41,4 +42,4 @@ helm repo index [flags] [DIR]
 ### SEE ALSO
 * [helm repo](helm_repo.md)	 - add, list, remove, update, and index chart repositories
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_repo_list.md b/docs/helm/helm_repo_list.md
index 858ef957f..00221ed24 100644
--- a/docs/helm/helm_repo_list.md
+++ b/docs/helm/helm_repo_list.md
@@ -18,6 +18,7 @@ helm repo list [flags]
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -25,4 +26,4 @@ helm repo list [flags]
 ### SEE ALSO
 * [helm repo](helm_repo.md)	 - add, list, remove, update, and index chart repositories
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_repo_remove.md b/docs/helm/helm_repo_remove.md
index 801bc3c3f..272ecea47 100644
--- a/docs/helm/helm_repo_remove.md
+++ b/docs/helm/helm_repo_remove.md
@@ -18,6 +18,7 @@ helm repo remove [flags] [NAME]
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -25,4 +26,4 @@ helm repo remove [flags] [NAME]
 ### SEE ALSO
 * [helm repo](helm_repo.md)	 - add, list, remove, update, and index chart repositories
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_repo_update.md b/docs/helm/helm_repo_update.md
index 897ed24b7..f0215da48 100644
--- a/docs/helm/helm_repo_update.md
+++ b/docs/helm/helm_repo_update.md
@@ -24,6 +24,7 @@ helm repo update
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -31,4 +32,4 @@ helm repo update
 ### SEE ALSO
 * [helm repo](helm_repo.md)	 - add, list, remove, update, and index chart repositories
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_reset.md b/docs/helm/helm_reset.md
index ed68b1b84..507a94bfd 100644
--- a/docs/helm/helm_reset.md
+++ b/docs/helm/helm_reset.md
@@ -34,6 +34,7 @@ helm reset
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -41,4 +42,4 @@ helm reset
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_rollback.md b/docs/helm/helm_rollback.md
index ae64a0a26..b40fb883a 100644
--- a/docs/helm/helm_rollback.md
+++ b/docs/helm/helm_rollback.md
@@ -41,6 +41,7 @@ helm rollback [flags] [RELEASE] [REVISION]
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -48,4 +49,4 @@ helm rollback [flags] [RELEASE] [REVISION]
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 13-Apr-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_search.md b/docs/helm/helm_search.md
index 1ed04e880..ffee22ce4 100644
--- a/docs/helm/helm_search.md
+++ b/docs/helm/helm_search.md
@@ -32,6 +32,7 @@ helm search [keyword]
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -39,4 +40,4 @@ helm search [keyword]
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 23-Apr-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_serve.md b/docs/helm/helm_serve.md
index 90ebb6da9..e300ee633 100644
--- a/docs/helm/helm_serve.md
+++ b/docs/helm/helm_serve.md
@@ -39,6 +39,7 @@ helm serve
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -46,4 +47,4 @@ helm serve
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_status.md b/docs/helm/helm_status.md
index 02ec0ad66..5317875e6 100644
--- a/docs/helm/helm_status.md
+++ b/docs/helm/helm_status.md
@@ -39,6 +39,7 @@ helm status [flags] RELEASE_NAME
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -46,4 +47,4 @@ helm status [flags] RELEASE_NAME
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_template.md b/docs/helm/helm_template.md
index cdc8a84a6..81c7fa00e 100644
--- a/docs/helm/helm_template.md
+++ b/docs/helm/helm_template.md
@@ -45,6 +45,7 @@ helm template [flags] CHART
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -52,4 +53,4 @@ helm template [flags] CHART
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 22-May-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_test.md b/docs/helm/helm_test.md
index 062244e73..688b67a34 100644
--- a/docs/helm/helm_test.md
+++ b/docs/helm/helm_test.md
@@ -35,6 +35,7 @@ helm test [RELEASE]
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -42,4 +43,4 @@ helm test [RELEASE]
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_upgrade.md b/docs/helm/helm_upgrade.md
index b952624a5..d83231fcb 100644
--- a/docs/helm/helm_upgrade.md
+++ b/docs/helm/helm_upgrade.md
@@ -75,6 +75,7 @@ helm upgrade [RELEASE] [CHART]
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -82,4 +83,4 @@ helm upgrade [RELEASE] [CHART]
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 4-Apr-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_verify.md b/docs/helm/helm_verify.md
index bc5343937..866b3fbd8 100644
--- a/docs/helm/helm_verify.md
+++ b/docs/helm/helm_verify.md
@@ -33,6 +33,7 @@ helm verify [flags] PATH
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -40,4 +41,4 @@ helm verify [flags] PATH
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_version.md b/docs/helm/helm_version.md
index 1f48cceba..61636c404 100644
--- a/docs/helm/helm_version.md
+++ b/docs/helm/helm_version.md
@@ -48,6 +48,7 @@ helm version
       --home string                     location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
       --host string                     address of Tiller. Overrides $HELM_HOST
       --kube-context string             name of the kubeconfig context to use
+      --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
 ```
@@ -55,4 +56,4 @@ helm version
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/pkg/helm/environment/environment.go b/pkg/helm/environment/environment.go
index 2980e6dc9..9b0acce4c 100644
--- a/pkg/helm/environment/environment.go
+++ b/pkg/helm/environment/environment.go
@@ -49,6 +49,8 @@ type EnvSettings struct {
 	Debug bool
 	// KubeContext is the name of the kubeconfig context.
 	KubeContext string
+	// KubeConfig is the path to an explicit kubeconfig file. This overwrites the value in $KUBECONFIG
+	KubeConfig string
 }
 
 // AddFlags binds flags to the given flagset.
@@ -56,6 +58,7 @@ func (s *EnvSettings) AddFlags(fs *pflag.FlagSet) {
 	fs.StringVar((*string)(&s.Home), "home", DefaultHelmHome, "location of your Helm config. Overrides $HELM_HOME")
 	fs.StringVar(&s.TillerHost, "host", "", "address of Tiller. Overrides $HELM_HOST")
 	fs.StringVar(&s.KubeContext, "kube-context", "", "name of the kubeconfig context to use")
+	fs.StringVar(&s.KubeConfig, "kubeconfig", "", "absolute path to the kubeconfig file to use")
 	fs.BoolVar(&s.Debug, "debug", false, "enable verbose output")
 	fs.StringVar(&s.TillerNamespace, "tiller-namespace", "kube-system", "namespace of Tiller")
 	fs.Int64Var(&s.TillerConnectionTimeout, "tiller-connection-timeout", int64(300), "the duration (in seconds) Helm will wait to establish a connection to tiller")
diff --git a/pkg/helm/environment/environment_test.go b/pkg/helm/environment/environment_test.go
index 8f0caa388..c7d65cd5a 100644
--- a/pkg/helm/environment/environment_test.go
+++ b/pkg/helm/environment/environment_test.go
@@ -35,8 +35,8 @@ func TestEnvSettings(t *testing.T) {
 		envars map[string]string
 
 		// expected values
-		home, host, ns, kcontext, plugins string
-		debug                             bool
+		home, host, ns, kcontext, kconfig, plugins string
+		debug                                      bool
 	}{
 		{
 			name:    "defaults",
@@ -47,11 +47,12 @@ func TestEnvSettings(t *testing.T) {
 		},
 		{
 			name:    "with flags set",
-			args:    []string{"--home", "/foo", "--host=here", "--debug", "--tiller-namespace=myns"},
+			args:    []string{"--home", "/foo", "--host=here", "--debug", "--tiller-namespace=myns", "--kubeconfig", "/bar"},
 			home:    "/foo",
 			plugins: helmpath.Home("/foo").Plugins(),
 			host:    "here",
 			ns:      "myns",
+			kconfig: "/bar",
 			debug:   true,
 		},
 		{
@@ -111,6 +112,9 @@ func TestEnvSettings(t *testing.T) {
 			if settings.KubeContext != tt.kcontext {
 				t.Errorf("expected kube-context %q, got %q", tt.kcontext, settings.KubeContext)
 			}
+			if settings.KubeConfig != tt.kconfig {
+				t.Errorf("expected kubeconfig %q, got %q", tt.kconfig, settings.KubeConfig)
+			}
 
 			cleanup()
 		})
diff --git a/pkg/kube/config.go b/pkg/kube/config.go
index b6560486e..ac0a9015d 100644
--- a/pkg/kube/config.go
+++ b/pkg/kube/config.go
@@ -16,10 +16,12 @@ limitations under the License.
 
 package kube // import "k8s.io/helm/pkg/kube"
 
-import "k8s.io/client-go/tools/clientcmd"
+import (
+	"k8s.io/client-go/tools/clientcmd"
+)
 
 // GetConfig returns a Kubernetes client config for a given context.
-func GetConfig(context string) clientcmd.ClientConfig {
+func GetConfig(context string, kubeconfig string) clientcmd.ClientConfig {
 	rules := clientcmd.NewDefaultClientConfigLoadingRules()
 	rules.DefaultClientConfig = &clientcmd.DefaultClientConfig
 
@@ -28,5 +30,10 @@ func GetConfig(context string) clientcmd.ClientConfig {
 	if context != "" {
 		overrides.CurrentContext = context
 	}
+
+	if kubeconfig != "" {
+		rules.ExplicitPath = kubeconfig
+	}
+
 	return clientcmd.NewNonInteractiveDeferredLoadingClientConfig(rules, overrides)
 }

From 3e5b4066d2a067ef49f6ca39b3f84d2ebcad25ba Mon Sep 17 00:00:00 2001
From: KUOKA Yusuke <ykuoka@gmail.com>
Date: Tue, 24 Jul 2018 04:49:42 +0900
Subject: [PATCH 49/54] feat(helm): Detailed exit code for helm plugins (#4367)

Resolves #4170
---
 cmd/helm/helm.go         |  7 ++++++-
 cmd/helm/load_plugins.go | 12 +++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/cmd/helm/helm.go b/cmd/helm/helm.go
index be3ced376..3f859392d 100644
--- a/cmd/helm/helm.go
+++ b/cmd/helm/helm.go
@@ -158,7 +158,12 @@ func init() {
 func main() {
 	cmd := newRootCmd(os.Args[1:])
 	if err := cmd.Execute(); err != nil {
-		os.Exit(1)
+		switch e := err.(type) {
+		case pluginError:
+			os.Exit(e.code)
+		default:
+			os.Exit(1)
+		}
 	}
 }
 
diff --git a/cmd/helm/load_plugins.go b/cmd/helm/load_plugins.go
index f4c97bde7..67de8bae5 100644
--- a/cmd/helm/load_plugins.go
+++ b/cmd/helm/load_plugins.go
@@ -22,12 +22,18 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strings"
+	"syscall"
 
 	"github.com/spf13/cobra"
 
 	"k8s.io/helm/pkg/plugin"
 )
 
+type pluginError struct {
+	error
+	code int
+}
+
 // loadPlugins loads plugins into the command list.
 //
 // This follows a different pattern than the other commands because it has
@@ -87,7 +93,11 @@ func loadPlugins(baseCmd *cobra.Command, out io.Writer) {
 				if err := prog.Run(); err != nil {
 					if eerr, ok := err.(*exec.ExitError); ok {
 						os.Stderr.Write(eerr.Stderr)
-						return fmt.Errorf("plugin %q exited with error", md.Name)
+						status := eerr.Sys().(syscall.WaitStatus)
+						return pluginError{
+							error: fmt.Errorf("plugin %q exited with error", md.Name),
+							code:  status.ExitStatus(),
+						}
 					}
 					return err
 				}

From 84856089c687e4b715631bb2380efbb561c30626 Mon Sep 17 00:00:00 2001
From: Ihor Dvoretskyi <ihor@linux.com>
Date: Mon, 23 Jul 2018 22:51:24 +0300
Subject: [PATCH 50/54] Snap installation information added (#4366)

* Snap installation information added

Signed-off-by: Ihor Dvoretskyi <ihor@linux.com>

* Moved Snap instructions to the different section

Signed-off-by: Ihor Dvoretskyi <ihor@linux.com>
---
 docs/install.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/install.md b/docs/install.md
index 17905a805..5aa4233c1 100755
--- a/docs/install.md
+++ b/docs/install.md
@@ -24,6 +24,15 @@ can be manually downloaded and installed.
 
 From there, you should be able to run the client: `helm help`.
 
+### From Snap (Linux)
+
+The Snap package for Helm is maintained by
+[Snapcrafters](https://github.com/snapcrafters/helm).
+
+```
+$ sudo snap install helm
+```
+
 ### From Homebrew (macOS)
 
 Members of the Kubernetes community have contributed a Helm formula build to

From 4f1fec3edbcf06f3e358a53375570ef8c8195410 Mon Sep 17 00:00:00 2001
From: Matt Butcher <matt.butcher@microsoft.com>
Date: Mon, 23 Jul 2018 15:26:40 -0600
Subject: [PATCH 51/54] docs(OWNERS): add rimusz as emeritus maintainer (#4357)

This PR was approved by vote of the core maintainers. It adds Rimus, one
of the project's founders, as an emeritus Helm maintainer.
---
 OWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OWNERS b/OWNERS
index 32b26efa2..39f8c8448 100644
--- a/OWNERS
+++ b/OWNERS
@@ -28,3 +28,4 @@ emeritus:
   - migmartri
   - seh
   - vaikas-google
+  - rimusz

From a65710679837ff12879d90c76aa99764e6f2178f Mon Sep 17 00:00:00 2001
From: nashasha1 <a4012017@sina.com>
Date: Tue, 24 Jul 2018 23:49:50 +0800
Subject: [PATCH 52/54] Dashes are not allowed in the name

---
 docs/chart_best_practices/conventions.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/chart_best_practices/conventions.md b/docs/chart_best_practices/conventions.md
index 324ef88f9..4d080ceb1 100644
--- a/docs/chart_best_practices/conventions.md
+++ b/docs/chart_best_practices/conventions.md
@@ -4,14 +4,14 @@ This part of the Best Practices Guide explains general conventions.
 
 ## Chart Names
 
-Chart names should be lower case letters and numbers. Words _may_ be separated with dashes (-):
+Chart names should be lower case letters and numbers. Dashes (-) are not allowed:
 
 Examples:
 
 ```
 drupal
-nginx-lego
-aws-cluster-autoscaler
+cluster01
+aws-cluster-autoscaler #incorrect do not use dashes in the name
 ```
 
 Neither uppercase letters nor underscores should be used in chart names. Dots should not be used in chart names.

From dc939086267357aa1a87418fa38ed91e68b535bc Mon Sep 17 00:00:00 2001
From: KUOKA Yusuke <ykuoka@gmail.com>
Date: Thu, 26 Jul 2018 06:12:40 +0900
Subject: [PATCH 53/54] feat: Set values from local files (#3758)

Adds the `--set-file key=filepath` flag to `install`, `upgrade`, `template` and `lint` sub-commands so that the content of the file at the `filepath` is set to the value for the `key`.

Resolves #1754
---
 cmd/helm/install.go                 | 28 +++++++++---
 cmd/helm/lint.go                    | 19 ++++++++
 cmd/helm/template.go                |  4 +-
 cmd/helm/upgrade.go                 | 11 +++--
 docs/chart_best_practices/values.md |  1 +
 docs/helm/helm_install.md           | 12 +++--
 docs/helm/helm_lint.md              |  3 +-
 docs/helm/helm_template.md          |  3 +-
 docs/helm/helm_upgrade.md           |  9 ++--
 docs/using_helm.md                  | 31 ++++++++++++-
 pkg/strvals/parser.go               | 69 ++++++++++++++++++++++++-----
 pkg/strvals/parser_test.go          | 33 ++++++++++++++
 12 files changed, 193 insertions(+), 30 deletions(-)

diff --git a/cmd/helm/install.go b/cmd/helm/install.go
index a6a8758ed..2213fd1fb 100644
--- a/cmd/helm/install.go
+++ b/cmd/helm/install.go
@@ -50,8 +50,10 @@ The install argument must be a chart reference, a path to a packaged chart,
 a path to an unpacked chart directory or a URL.
 
 To override values in a chart, use either the '--values' flag and pass in a file
-or use the '--set' flag and pass configuration from the command line, to force
-a string value use '--set-string'.
+or use the '--set' flag and pass configuration from the command line.  To force string
+values in '--set', use '--set-string' instead. In case a value is large and therefore
+you want not to use neither '--values' nor '--set', use '--set-file' to read the
+single large value from file.
 
 	$ helm install -f myvalues.yaml ./redis
 
@@ -63,6 +65,9 @@ or
 
 	$ helm install --set-string long_int=1234567890 ./redis
 
+or
+    $ helm install --set-file multiline_text=path/to/textfile
+
 You can specify the '--values'/'-f' flag multiple times. The priority will be given to the
 last (right-most) file specified. For example, if both myvalues.yaml and override.yaml
 contained a key called 'Test', the value set in override.yaml would take precedence:
@@ -120,6 +125,7 @@ type installCmd struct {
 	client         helm.Interface
 	values         []string
 	stringValues   []string
+	fileValues     []string
 	nameTemplate   string
 	version        string
 	timeout        int64
@@ -196,6 +202,7 @@ func newInstallCmd(c helm.Interface, out io.Writer) *cobra.Command {
 	f.BoolVar(&inst.replace, "replace", false, "re-use the given name, even if that name is already used. This is unsafe in production")
 	f.StringArrayVar(&inst.values, "set", []string{}, "set values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)")
 	f.StringArrayVar(&inst.stringValues, "set-string", []string{}, "set STRING values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)")
+	f.StringArrayVar(&inst.fileValues, "set-file", []string{}, "set values from respective files specified via the command line (can specify multiple or separate values with commas: key1=path1,key2=path2)")
 	f.StringVar(&inst.nameTemplate, "name-template", "", "specify template used to name the release")
 	f.BoolVar(&inst.verify, "verify", false, "verify the package before installing it")
 	f.StringVar(&inst.keyring, "keyring", defaultKeyring(), "location of public keys used for verification")
@@ -222,7 +229,7 @@ func (i *installCmd) run() error {
 		i.namespace = defaultNamespace()
 	}
 
-	rawVals, err := vals(i.valueFiles, i.values, i.stringValues, i.certFile, i.keyFile, i.caFile)
+	rawVals, err := vals(i.valueFiles, i.values, i.stringValues, i.fileValues, i.certFile, i.keyFile, i.caFile)
 	if err != nil {
 		return err
 	}
@@ -343,8 +350,8 @@ func mergeValues(dest map[string]interface{}, src map[string]interface{}) map[st
 }
 
 // vals merges values from files specified via -f/--values and
-// directly via --set or --set-string, marshaling them to YAML
-func vals(valueFiles valueFiles, values []string, stringValues []string, CertFile, KeyFile, CAFile string) ([]byte, error) {
+// directly via --set or --set-string or --set-file, marshaling them to YAML
+func vals(valueFiles valueFiles, values []string, stringValues []string, fileValues []string, CertFile, KeyFile, CAFile string) ([]byte, error) {
 	base := map[string]interface{}{}
 
 	// User specified a values files via -f/--values
@@ -384,6 +391,17 @@ func vals(valueFiles valueFiles, values []string, stringValues []string, CertFil
 		}
 	}
 
+	// User specified a value via --set-file
+	for _, value := range fileValues {
+		reader := func(rs []rune) (interface{}, error) {
+			bytes, err := readFile(string(rs), CertFile, KeyFile, CAFile)
+			return string(bytes), err
+		}
+		if err := strvals.ParseIntoFile(value, base, reader); err != nil {
+			return []byte{}, fmt.Errorf("failed parsing --set-file data: %s", err)
+		}
+	}
+
 	return yaml.Marshal(base)
 }
 
diff --git a/cmd/helm/lint.go b/cmd/helm/lint.go
index c81468e50..3221368ce 100644
--- a/cmd/helm/lint.go
+++ b/cmd/helm/lint.go
@@ -47,6 +47,7 @@ type lintCmd struct {
 	valueFiles valueFiles
 	values     []string
 	sValues    []string
+	fValues    []string
 	namespace  string
 	strict     bool
 	paths      []string
@@ -73,6 +74,7 @@ func newLintCmd(out io.Writer) *cobra.Command {
 	cmd.Flags().VarP(&l.valueFiles, "values", "f", "specify values in a YAML file (can specify multiple)")
 	cmd.Flags().StringArrayVar(&l.values, "set", []string{}, "set values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)")
 	cmd.Flags().StringArrayVar(&l.sValues, "set-string", []string{}, "set STRING values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)")
+	cmd.Flags().StringArrayVar(&l.fValues, "set-file", []string{}, "set values from respective files specified via the command line (can specify multiple or separate values with commas: key1=path1,key2=path2)")
 	cmd.Flags().StringVar(&l.namespace, "namespace", "default", "namespace to put the release into")
 	cmd.Flags().BoolVar(&l.strict, "strict", false, "fail on lint warnings")
 
@@ -172,6 +174,12 @@ func lintChart(path string, vals []byte, namespace string, strict bool) (support
 	return lint.All(chartPath, vals, namespace, strict), nil
 }
 
+// vals merges values from files specified via -f/--values and
+// directly via --set or --set-string or --set-file, marshaling them to YAML
+//
+// This func is implemented intentionally and separately from the `vals` func for the `install` and `upgrade` comammdsn.
+// Compared to the alternative func, this func lacks the parameters for tls opts - ca key, cert, and ca cert.
+// That's because this command, `lint`, is explicitly forbidden from making server connections.
 func (l *lintCmd) vals() ([]byte, error) {
 	base := map[string]interface{}{}
 
@@ -204,5 +212,16 @@ func (l *lintCmd) vals() ([]byte, error) {
 		}
 	}
 
+	// User specified a value via --set-file
+	for _, value := range l.fValues {
+		reader := func(rs []rune) (interface{}, error) {
+			bytes, err := ioutil.ReadFile(string(rs))
+			return string(bytes), err
+		}
+		if err := strvals.ParseIntoFile(value, base, reader); err != nil {
+			return []byte{}, fmt.Errorf("failed parsing --set-file data: %s", err)
+		}
+	}
+
 	return yaml.Marshal(base)
 }
diff --git a/cmd/helm/template.go b/cmd/helm/template.go
index 9ba217871..bcfb6a7e4 100644
--- a/cmd/helm/template.go
+++ b/cmd/helm/template.go
@@ -69,6 +69,7 @@ type templateCmd struct {
 	out              io.Writer
 	values           []string
 	stringValues     []string
+	fileValues       []string
 	nameTemplate     string
 	showNotes        bool
 	releaseName      string
@@ -100,6 +101,7 @@ func newTemplateCmd(out io.Writer) *cobra.Command {
 	f.StringVar(&t.namespace, "namespace", "", "namespace to install the release into")
 	f.StringArrayVar(&t.values, "set", []string{}, "set values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)")
 	f.StringArrayVar(&t.stringValues, "set-string", []string{}, "set STRING values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)")
+	f.StringArrayVar(&t.fileValues, "set-file", []string{}, "set values from respective files specified via the command line (can specify multiple or separate values with commas: key1=path1,key2=path2)")
 	f.StringVar(&t.nameTemplate, "name-template", "", "specify template used to name the release")
 	f.StringVar(&t.kubeVersion, "kube-version", defaultKubeVersion, "kubernetes version used as Capabilities.KubeVersion.Major/Minor")
 	f.StringVar(&t.outputDir, "output-dir", "", "writes the executed templates to files in output-dir instead of stdout")
@@ -132,7 +134,7 @@ func (t *templateCmd) run(cmd *cobra.Command, args []string) error {
 		t.namespace = defaultNamespace()
 	}
 	// get combined values and create config
-	rawVals, err := vals(t.valueFiles, t.values, t.stringValues, "", "", "")
+	rawVals, err := vals(t.valueFiles, t.values, t.stringValues, t.fileValues, "", "", "")
 	if err != nil {
 		return err
 	}
diff --git a/cmd/helm/upgrade.go b/cmd/helm/upgrade.go
index aaf87b7d0..27c504e20 100644
--- a/cmd/helm/upgrade.go
+++ b/cmd/helm/upgrade.go
@@ -37,8 +37,10 @@ a packaged chart, or a fully qualified URL. For chart references, the latest
 version will be specified unless the '--version' flag is set.
 
 To override values in a chart, use either the '--values' flag and pass in a file
-or use the '--set' flag and pass configuration from the command line, to force string
-values, use '--set-string'.
+or use the '--set' flag and pass configuration from the command line. To force string
+values in '--set', use '--set-string' instead. In case a value is large and therefore
+you want not to use neither '--values' nor '--set', use '--set-file' to read the
+single large value from file.
 
 You can specify the '--values'/'-f' flag multiple times. The priority will be given to the
 last (right-most) file specified. For example, if both myvalues.yaml and override.yaml
@@ -65,6 +67,7 @@ type upgradeCmd struct {
 	valueFiles   valueFiles
 	values       []string
 	stringValues []string
+	fileValues   []string
 	verify       bool
 	keyring      string
 	install      bool
@@ -122,6 +125,7 @@ func newUpgradeCmd(client helm.Interface, out io.Writer) *cobra.Command {
 	f.BoolVar(&upgrade.force, "force", false, "force resource update through delete/recreate if needed")
 	f.StringArrayVar(&upgrade.values, "set", []string{}, "set values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)")
 	f.StringArrayVar(&upgrade.stringValues, "set-string", []string{}, "set STRING values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)")
+	f.StringArrayVar(&upgrade.fileValues, "set-file", []string{}, "set values from respective files specified via the command line (can specify multiple or separate values with commas: key1=path1,key2=path2)")
 	f.BoolVar(&upgrade.disableHooks, "disable-hooks", false, "disable pre/post upgrade hooks. DEPRECATED. Use no-hooks")
 	f.BoolVar(&upgrade.disableHooks, "no-hooks", false, "disable pre/post upgrade hooks")
 	f.BoolVar(&upgrade.verify, "verify", false, "verify the provenance of the chart before upgrading")
@@ -189,6 +193,7 @@ func (u *upgradeCmd) run() error {
 				keyring:      u.keyring,
 				values:       u.values,
 				stringValues: u.stringValues,
+				fileValues:   u.fileValues,
 				namespace:    u.namespace,
 				timeout:      u.timeout,
 				wait:         u.wait,
@@ -198,7 +203,7 @@ func (u *upgradeCmd) run() error {
 		}
 	}
 
-	rawVals, err := vals(u.valueFiles, u.values, u.stringValues, u.certFile, u.keyFile, u.caFile)
+	rawVals, err := vals(u.valueFiles, u.values, u.stringValues, u.fileValues, u.certFile, u.keyFile, u.caFile)
 	if err != nil {
 		return err
 	}
diff --git a/docs/chart_best_practices/values.md b/docs/chart_best_practices/values.md
index 2962e7d45..28e3a3eac 100644
--- a/docs/chart_best_practices/values.md
+++ b/docs/chart_best_practices/values.md
@@ -93,6 +93,7 @@ There are three potential sources of values:
 - A chart's `values.yaml` file
 - A values file supplied by `helm install -f` or `helm upgrade -f`
 - The values passed to a `--set` or `--set-string` flag on `helm install` or `helm upgrade`
+- The content of a file passed to `--set-file` flag on `helm install` or `helm upgrade`
 
 When designing the structure of your values, keep in mind that users of your
 chart may want to override them via either the `-f` flag or with the `--set`
diff --git a/docs/helm/helm_install.md b/docs/helm/helm_install.md
index dbb087964..c266222b8 100644
--- a/docs/helm/helm_install.md
+++ b/docs/helm/helm_install.md
@@ -12,8 +12,10 @@ The install argument must be a chart reference, a path to a packaged chart,
 a path to an unpacked chart directory or a URL.
 
 To override values in a chart, use either the '--values' flag and pass in a file
-or use the '--set' flag and pass configuration from the command line, to force
-a string value use '--set-string'.
+or use the '--set' flag and pass configuration from the command line.  To force string
+values in '--set', use '--set-string' instead. In case a value is large and therefore
+you want not to use neither '--values' nor '--set', use '--set-file' to read the
+single large value from file.
 
 	$ helm install -f myvalues.yaml ./redis
 
@@ -25,6 +27,9 @@ or
 
 	$ helm install --set-string long_int=1234567890 ./redis
 
+or
+    $ helm install --set-file multiline_text=path/to/textfile
+
 You can specify the '--values'/'-f' flag multiple times. The priority will be given to the
 last (right-most) file specified. For example, if both myvalues.yaml and override.yaml
 contained a key called 'Test', the value set in override.yaml would take precedence:
@@ -91,6 +96,7 @@ helm install [CHART]
       --replace                  re-use the given name, even if that name is already used. This is unsafe in production
       --repo string              chart repository url where to locate the requested chart
       --set stringArray          set values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)
+      --set-file stringArray     set values from respective files specified via the command line (can specify multiple or separate values with commas: key1=path1,key2=path2)
       --set-string stringArray   set STRING values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)
       --timeout int              time in seconds to wait for any individual Kubernetes operation (like Jobs for hooks) (default 300)
       --tls                      enable TLS for request
@@ -120,4 +126,4 @@ helm install [CHART]
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 17-Jun-2018
+###### Auto generated by spf13/cobra on 17-Jul-2018
diff --git a/docs/helm/helm_lint.md b/docs/helm/helm_lint.md
index 319939bcf..9c328a086 100644
--- a/docs/helm/helm_lint.md
+++ b/docs/helm/helm_lint.md
@@ -23,6 +23,7 @@ helm lint [flags] PATH
 ```
       --namespace string         namespace to put the release into (default "default")
       --set stringArray          set values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)
+      --set-file stringArray     set values from respective files specified via the command line (can specify multiple or separate values with commas: key1=path1,key2=path2)
       --set-string stringArray   set STRING values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)
       --strict                   fail on lint warnings
   -f, --values valueFiles        specify values in a YAML file (can specify multiple) (default [])
@@ -43,4 +44,4 @@ helm lint [flags] PATH
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 17-Jun-2018
+###### Auto generated by spf13/cobra on 25-Jul-2018
diff --git a/docs/helm/helm_template.md b/docs/helm/helm_template.md
index 81c7fa00e..f456f74be 100644
--- a/docs/helm/helm_template.md
+++ b/docs/helm/helm_template.md
@@ -34,6 +34,7 @@ helm template [flags] CHART
       --notes                    show the computed NOTES.txt file as well
       --output-dir string        writes the executed templates to files in output-dir instead of stdout
       --set stringArray          set values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)
+      --set-file stringArray     set values from respective files specified via the command line (can specify multiple or separate values with commas: key1=path1,key2=path2)
       --set-string stringArray   set STRING values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)
   -f, --values valueFiles        specify values in a YAML file (can specify multiple) (default [])
 ```
@@ -53,4 +54,4 @@ helm template [flags] CHART
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 17-Jun-2018
+###### Auto generated by spf13/cobra on 17-Jul-2018
diff --git a/docs/helm/helm_upgrade.md b/docs/helm/helm_upgrade.md
index d83231fcb..ecd51e65c 100644
--- a/docs/helm/helm_upgrade.md
+++ b/docs/helm/helm_upgrade.md
@@ -14,8 +14,10 @@ a packaged chart, or a fully qualified URL. For chart references, the latest
 version will be specified unless the '--version' flag is set.
 
 To override values in a chart, use either the '--values' flag and pass in a file
-or use the '--set' flag and pass configuration from the command line, to force string
-values, use '--set-string'.
+or use the '--set' flag and pass configuration from the command line. To force string
+values in '--set', use '--set-string' instead. In case a value is large and therefore
+you want not to use neither '--values' nor '--set', use '--set-file' to read the
+single large value from file.
 
 You can specify the '--values'/'-f' flag multiple times. The priority will be given to the
 last (right-most) file specified. For example, if both myvalues.yaml and override.yaml
@@ -54,6 +56,7 @@ helm upgrade [RELEASE] [CHART]
       --reset-values             when upgrading, reset the values to the ones built into the chart
       --reuse-values             when upgrading, reuse the last release's values and merge in any overrides from the command line via --set and -f. If '--reset-values' is specified, this is ignored.
       --set stringArray          set values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)
+      --set-file stringArray     set values from respective files specified via the command line (can specify multiple or separate values with commas: key1=path1,key2=path2)
       --set-string stringArray   set STRING values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)
       --timeout int              time in seconds to wait for any individual Kubernetes operation (like Jobs for hooks) (default 300)
       --tls                      enable TLS for request
@@ -83,4 +86,4 @@ helm upgrade [RELEASE] [CHART]
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 17-Jun-2018
+###### Auto generated by spf13/cobra on 17-May-2018
diff --git a/docs/using_helm.md b/docs/using_helm.md
index 5490abbe1..b7fec60ed 100755
--- a/docs/using_helm.md
+++ b/docs/using_helm.md
@@ -227,7 +227,7 @@ There are two ways to pass configuration data during install:
 
 - `--values` (or `-f`): Specify a YAML file with overrides. This can be specified multiple times
   and the rightmost file will take precedence
-- `--set`: Specify overrides on the command line.
+- `--set` (and its variants `--set-string` and `--set-file`): Specify overrides on the command line.
 
 If both are used, `--set` values are merged into `--values` with higher precedence.
 Overrides specified with `--set` are persisted in a configmap. Values that have been
@@ -304,6 +304,35 @@ Deeply nested data structures can be difficult to express using `--set`. Chart
 designers are encouraged to consider the `--set` usage when designing the format
 of a `values.yaml` file.
 
+Helm will cast certain values specified with `--set` to integers.
+For example, `--set foo=true` results Helm to cast `true` into an int64 value.
+In case you want a string, use a `--set`'s variant named `--set-string`. `--set-string foo=true` results in a string value of `"true"`.
+
+`--set-file key=filepath` is another variant of `--set`.
+It reads the file and use its content as a value.
+An example use case of it is to inject a multi-line text into values without dealing with indentation in YAML.
+Say you want to create a [brigade](https://github.com/Azure/brigade) project with certain value containing 5 lines JavaScript code, you might write a `values.yaml` like:
+
+```yaml
+defaultScript: |
+  const { events, Job } = require("brigadier")
+  function run(e, project) {
+    console.log("hello default script")
+  }
+  events.on("run", run)
+```
+
+Being embedded in a YAML, this makes it harder for you to use IDE features and testing framework and so on that supports writing code.
+Instead, you can use `--set-file defaultScript=brigade.js` with `brigade.js` containing:
+
+```javascript
+const { events, Job } = require("brigadier")
+function run(e, project) {
+  console.log("hello default script")
+}
+events.on("run", run)
+```
+
 ### More Installation Methods
 
 The `helm install` command can install from several sources:
diff --git a/pkg/strvals/parser.go b/pkg/strvals/parser.go
index dae949d8e..eb29c250f 100644
--- a/pkg/strvals/parser.go
+++ b/pkg/strvals/parser.go
@@ -50,6 +50,20 @@ func Parse(s string) (map[string]interface{}, error) {
 	return vals, err
 }
 
+// ParseFile parses a set line, but its final value is loaded from the file at the path specified by the original value.
+//
+// A set line is of the form name1=path1,name2=path2
+//
+// When the files at path1 and path2 contained "val1" and "val2" respectively, the set line is consumed as
+// name1=val1,name2=val2
+func ParseFile(s string, runesToVal runesToVal) (map[string]interface{}, error) {
+	vals := map[string]interface{}{}
+	scanner := bytes.NewBufferString(s)
+	t := newFileParser(scanner, vals, runesToVal)
+	err := t.parse()
+	return vals, err
+}
+
 // ParseString parses a set line and forces a string value.
 //
 // A set line is of the form name1=value1,name2=value2
@@ -71,6 +85,15 @@ func ParseInto(s string, dest map[string]interface{}) error {
 	return t.parse()
 }
 
+// ParseIntoFile parses a filevals line and merges the result into dest.
+//
+// This method always returns a string as the value.
+func ParseIntoFile(s string, dest map[string]interface{}, runesToVal runesToVal) error {
+	scanner := bytes.NewBufferString(s)
+	t := newFileParser(scanner, dest, runesToVal)
+	return t.parse()
+}
+
 // ParseIntoString parses a strvals line nad merges the result into dest.
 //
 // This method always returns a string as the value.
@@ -87,13 +110,22 @@ func ParseIntoString(s string, dest map[string]interface{}) error {
 // where data is the final parsed data from the parses with correct types
 // where st is a boolean to figure out if we're forcing it to parse values as string
 type parser struct {
-	sc   *bytes.Buffer
-	data map[string]interface{}
-	st   bool
+	sc         *bytes.Buffer
+	data       map[string]interface{}
+	runesToVal runesToVal
 }
 
+type runesToVal func([]rune) (interface{}, error)
+
 func newParser(sc *bytes.Buffer, data map[string]interface{}, stringBool bool) *parser {
-	return &parser{sc: sc, data: data, st: stringBool}
+	rs2v := func(rs []rune) (interface{}, error) {
+		return typedVal(rs, stringBool), nil
+	}
+	return &parser{sc: sc, data: data, runesToVal: rs2v}
+}
+
+func newFileParser(sc *bytes.Buffer, data map[string]interface{}, runesToVal runesToVal) *parser {
+	return &parser{sc: sc, data: data, runesToVal: runesToVal}
 }
 
 func (t *parser) parse() error {
@@ -157,8 +189,12 @@ func (t *parser) key(data map[string]interface{}) error {
 				set(data, string(k), "")
 				return e
 			case ErrNotList:
-				v, e := t.val()
-				set(data, string(k), typedVal(v, t.st))
+				rs, e := t.val()
+				if e != nil && e != io.EOF {
+					return e
+				}
+				v, e := t.runesToVal(rs)
+				set(data, string(k), v)
 				return e
 			default:
 				return e
@@ -230,8 +266,12 @@ func (t *parser) listItem(list []interface{}, i int) ([]interface{}, error) {
 		case io.EOF:
 			return setIndex(list, i, ""), err
 		case ErrNotList:
-			v, e := t.val()
-			return setIndex(list, i, typedVal(v, t.st)), e
+			rs, e := t.val()
+			if e != nil && e != io.EOF {
+				return list, e
+			}
+			v, e := t.runesToVal(rs)
+			return setIndex(list, i, v), e
 		default:
 			return list, e
 		}
@@ -279,7 +319,7 @@ func (t *parser) valList() ([]interface{}, error) {
 	list := []interface{}{}
 	stop := runeSet([]rune{',', '}'})
 	for {
-		switch v, last, err := runesUntil(t.sc, stop); {
+		switch rs, last, err := runesUntil(t.sc, stop); {
 		case err != nil:
 			if err == io.EOF {
 				err = errors.New("list must terminate with '}'")
@@ -290,10 +330,15 @@ func (t *parser) valList() ([]interface{}, error) {
 			if r, _, e := t.sc.ReadRune(); e == nil && r != ',' {
 				t.sc.UnreadRune()
 			}
-			list = append(list, typedVal(v, t.st))
-			return list, nil
+			v, e := t.runesToVal(rs)
+			list = append(list, v)
+			return list, e
 		case last == ',':
-			list = append(list, typedVal(v, t.st))
+			v, e := t.runesToVal(rs)
+			if e != nil {
+				return list, e
+			}
+			list = append(list, v)
 		}
 	}
 }
diff --git a/pkg/strvals/parser_test.go b/pkg/strvals/parser_test.go
index 22f0e753a..f23a57e0a 100644
--- a/pkg/strvals/parser_test.go
+++ b/pkg/strvals/parser_test.go
@@ -416,6 +416,39 @@ func TestParseIntoString(t *testing.T) {
 	}
 }
 
+func TestParseIntoFile(t *testing.T) {
+	got := map[string]interface{}{}
+	input := "name1=path1"
+	expect := map[string]interface{}{
+		"name1": "value1",
+	}
+	rs2v := func(rs []rune) (interface{}, error) {
+		v := string(rs)
+		if v != "path1" {
+			t.Errorf("%s: runesToVal: Expected value path1, got %s", input, v)
+			return "", nil
+		}
+		return "value1", nil
+	}
+
+	if err := ParseIntoFile(input, got, rs2v); err != nil {
+		t.Fatal(err)
+	}
+
+	y1, err := yaml.Marshal(expect)
+	if err != nil {
+		t.Fatal(err)
+	}
+	y2, err := yaml.Marshal(got)
+	if err != nil {
+		t.Fatalf("Error serializing parsed value: %s", err)
+	}
+
+	if string(y1) != string(y2) {
+		t.Errorf("%s: Expected:\n%s\nGot:\n%s", input, y1, y2)
+	}
+}
+
 func TestToYAML(t *testing.T) {
 	// The TestParse does the hard part. We just verify that YAML formatting is
 	// happening.

From ade712dad2864277b79ef93347056cf7f367e35d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Magnusson?= <bjornmagnusson1984@gmail.com>
Date: Thu, 26 Jul 2018 12:08:34 +0200
Subject: [PATCH 54/54] README: updated links to helm/helm

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index fc091056e..0c281a54a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Kubernetes Helm
 
-[![CircleCI](https://circleci.com/gh/kubernetes/helm.svg?style=svg)](https://circleci.com/gh/kubernetes/helm)
-[![Go Report Card](https://goreportcard.com/badge/github.com/kubernetes/helm)](https://goreportcard.com/report/github.com/kubernetes/helm)
+[![CircleCI](https://circleci.com/gh/helm/helm.svg?style=svg)](https://circleci.com/gh/helm/helm)
+[![Go Report Card](https://goreportcard.com/badge/github.com/helm/helm)](https://goreportcard.com/report/github.com/helm/helm)
 [![GoDoc](https://godoc.org/github.com/kubernetes/helm?status.svg)](https://godoc.org/github.com/kubernetes/helm)
 
 Helm is a tool for managing Kubernetes charts. Charts are packages of
@@ -9,7 +9,7 @@ pre-configured Kubernetes resources.
 
 Use Helm to:
 
-- Find and use [popular software packaged as Kubernetes charts](https://github.com/kubernetes/charts)
+- Find and use [popular software packaged as Kubernetes charts](https://github.com/helm/charts)
 - Share your own applications as Kubernetes charts
 - Create reproducible builds of your Kubernetes applications
 - Intelligently manage your Kubernetes manifest files
@@ -32,7 +32,7 @@ Think of it like apt/yum/homebrew for Kubernetes.
 
 ## Install
 
-Binary downloads of the Helm client can be found on [the latest Releases page](https://github.com/kubernetes/helm/releases/latest).
+Binary downloads of the Helm client can be found on [the latest Releases page](https://github.com/helm/helm/releases/latest).
 
 Unpack the `helm` binary and add it to your PATH and you are good to go!
 
@@ -52,7 +52,7 @@ Get started with the [Quick Start guide](https://docs.helm.sh/using_helm/#quicks
 
 ## Roadmap
 
-The [Helm roadmap uses Github milestones](https://github.com/kubernetes/helm/milestones) to track the progress of the project.
+The [Helm roadmap uses Github milestones](https://github.com/helm/helm/milestones) to track the progress of the project.
 
 ## Community, discussion, contribution, and support