Merge branch 'dev-v3' into feat-v3/dynCompDifferentHelm

cmd/helm/testdata/output/list-all.txt

@@ -5,6 +5,5 @@ groot      	default  	1       	2016-01-16 00:00:01 +0000 UTC	uninstalled    	chi
 hummingbird	default  	1       	2016-01-16 00:00:03 +0000 UTC	deployed       	chickadee-1.0.0
 iguana     	default  	2       	2016-01-16 00:00:04 +0000 UTC	deployed       	chickadee-1.0.0
 rocket     	default  	1       	2016-01-16 00:00:02 +0000 UTC	failed         	chickadee-1.0.0
-starlord   	default  	1       	2016-01-16 00:00:01 +0000 UTC	superseded     	chickadee-1.0.0
 starlord   	default  	2       	2016-01-16 00:00:01 +0000 UTC	deployed       	chickadee-1.0.0
 thanos     	default  	1       	2016-01-16 00:00:01 +0000 UTC	pending-install	chickadee-1.0.0

pkg/action/action_test.go

@@ -166,6 +166,13 @@ func buildChart(opts ...chartOption) *chart.Chart {
 	return c.Chart
 }
 
+func withSampleValues() chartOption {
+	values := map[string]interface{}{"someKey": "someValue"}
+	return func(opts *chartOptions) {
+		opts.Values = values
+	}
+}
+
 func withNotes(notes string) chartOption {
 	return func(opts *chartOptions) {
 		opts.Templates = append(opts.Templates, &chart.File{

pkg/action/install_test.go

@@ -74,6 +74,33 @@ func TestInstallRelease(t *testing.T) {
 	is.Equal(rel.Info.Description, "Install complete")
 }
 
+func TestInstallReleaseWithValues(t *testing.T) {
+	is := assert.New(t)
+	instAction := installAction(t)
+	userVals := map[string]interface{}{}
+	expectedUserValues := map[string]interface{}{}
+	res, err := instAction.Run(buildChart(withSampleValues()), userVals)
+	if err != nil {
+		t.Fatalf("Failed install: %s", err)
+	}
+	is.Equal(res.Name, "test-install-release", "Expected release name.")
+	is.Equal(res.Namespace, "spaced")
+
+	rel, err := instAction.cfg.Releases.Get(res.Name, res.Version)
+	is.NoError(err)
+
+	is.Len(rel.Hooks, 1)
+	is.Equal(rel.Hooks[0].Manifest, manifestWithHook)
+	is.Equal(rel.Hooks[0].Events[0], release.HookPostInstall)
+	is.Equal(rel.Hooks[0].Events[1], release.HookPreDelete, "Expected event 0 is pre-delete")
+
+	is.NotEqual(len(res.Manifest), 0)
+	is.NotEqual(len(rel.Manifest), 0)
+	is.Contains(rel.Manifest, "---\n# Source: hello/templates/hello\nhello: world")
+	is.Equal("Install complete", rel.Info.Description)
+	is.Equal(expectedUserValues, rel.Config)
+}
+
 func TestInstallReleaseClientOnly(t *testing.T) {
 	is := assert.New(t)
 	instAction := installAction(t)

pkg/action/lint.go

@@ -83,10 +83,6 @@ func (l *Lint) Run(paths []string, vals map[string]interface{}) *LintResult {
 func lintChart(path string, vals map[string]interface{}, namespace string, strict bool) (support.Linter, error) {
 	var chartPath string
 	linter := support.Linter{}
-	currentVals := make(map[string]interface{}, len(vals))
-	for key, value := range vals {
-		currentVals[key] = value
-	}
 
 	if strings.HasSuffix(path, ".tgz") {
 		tempDir, err := ioutil.TempDir("", "helm-lint")
@@ -120,5 +116,5 @@ func lintChart(path string, vals map[string]interface{}, namespace string, stric
 		return linter, errLintNoChart
 	}
 
-	return lint.All(chartPath, currentVals, namespace, strict), nil
+	return lint.All(chartPath, vals, namespace, strict), nil
 }

pkg/action/list.go

@@ -171,6 +171,8 @@ func (l *List) Run() ([]*release.Release, error) {
 		return results, nil
 	}
 
+	results = filterList(results)
+
 	// Unfortunately, we have to sort before truncating, which can incur substantial overhead
 	l.sort(results)
 
@@ -218,6 +220,30 @@ func (l *List) sort(rels []*release.Release) {
 	}
 }
 
+// filterList returns a list scrubbed of old releases.
+func filterList(rels []*release.Release) []*release.Release {
+	idx := map[string]int{}
+
+	for _, r := range rels {
+		name, version := r.Name, r.Version
+		if max, ok := idx[name]; ok {
+			// check if we have a greater version already
+			if max > version {
+				continue
+			}
+		}
+		idx[name] = version
+	}
+
+	uniq := make([]*release.Release, 0, len(idx))
+	for _, r := range rels {
+		if idx[r.Name] == r.Version {
+			uniq = append(uniq, r)
+		}
+	}
+	return uniq
+}
+
 // setStateMask calculates the state mask based on parameters.
 func (l *List) SetStateMask() {
 	if l.All {

pkg/chartutil/coalesce.go

@@ -34,13 +34,13 @@ import (
 //	- A chart has access to all of the variables for it, as well as all of
 //		the values destined for its dependencies.
 func CoalesceValues(chrt *chart.Chart, vals map[string]interface{}) (Values, error) {
-	if vals == nil {
+	// create a copy of vals and then pass it to coalesce
-		vals = make(map[string]interface{})
+	// and coalesceDeps, as both will mutate the passed values
+	valsCopy := copyMap(vals)
+	if _, err := coalesce(chrt, valsCopy); err != nil {
+		return valsCopy, err
 	}
-	if _, err := coalesce(chrt, vals); err != nil {
+	return coalesceDeps(chrt, valsCopy)
-		return vals, err
-	}
-	return coalesceDeps(chrt, vals)
 }
 
 // coalesce coalesces the dest values and the chart values, giving priority to the dest values.

pkg/chartutil/coalesce_test.go

@@ -19,6 +19,8 @@ package chartutil
 import (
 	"encoding/json"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 // ref: http://www.yaml.org/spec/1.2/spec.html#id2803362
@@ -48,6 +50,7 @@ pequod:
 `)
 
 func TestCoalesceValues(t *testing.T) {
+	is := assert.New(t)
 	c := loadChart(t, "testdata/moby")
 
 	vals, err := ReadValues(testCoalesceValuesYaml)
@@ -55,6 +58,14 @@ func TestCoalesceValues(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	// taking a copy of the values before passing it
+	// to CoalesceValues as argument, so that we can
+	// use it for asserting later
+	valsCopy := make(Values, len(vals))
+	for key, value := range vals {
+		valsCopy[key] = value
+	}
+
 	v, err := CoalesceValues(c, vals)
 	if err != nil {
 		t.Fatal(err)
@@ -102,6 +113,9 @@ func TestCoalesceValues(t *testing.T) {
 			t.Errorf("Expected key %q to be removed, still present", nullKey)
 		}
 	}
+
+	// CoalesceValues should not mutate the passed arguments
+	is.Equal(valsCopy, vals)
 }
 
 func TestCoalesceTables(t *testing.T) {