From f7a7a157ce16dbfe29e42f61319934781c04373b Mon Sep 17 00:00:00 2001
From: Adam Reese <adam@reese.io>
Date: Wed, 29 Aug 2018 14:05:37 -0700
Subject: [PATCH] ref(*): merge requirement.yaml into Chart.yaml

Signed-off-by: Adam Reese <adam@reese.io>
---
 cmd/helm/dependency.go                        |  16 ++---
 cmd/helm/dependency_update.go                 |  10 ++--
 cmd/helm/dependency_update_test.go            |  47 ++++++---------
 cmd/helm/helm_test.go                         |   2 -
 cmd/helm/install.go                           |   6 +-
 cmd/helm/install_test.go                      |   4 +-
 cmd/helm/package.go                           |   4 +-
 cmd/helm/template.go                          |   2 +-
 .../output/dependency-list-archive.txt        |   1 +
 .../output/upgrade-with-bad-dependencies.txt  |   2 +-
 .../chart-bad-requirements/Chart.yaml         |   4 ++
 .../testcharts/chart-missing-deps/Chart.yaml  |   7 +++
 .../testdata/testcharts/reqtest-0.1.0.tgz     | Bin 911 -> 786 bytes
 .../testdata/testcharts/reqtest/Chart.yaml    |  10 ++++
 cmd/helm/upgrade.go                           |   2 +-
 pkg/chart/chart.go                            |   2 -
 pkg/chart/loader/load.go                      |   5 --
 pkg/chart/loader/load_test.go                 |  17 +++---
 .../loader/testdata/albatross/Chart.yaml      |   4 ++
 .../loader/testdata/albatross/values.yaml     |   4 ++
 pkg/chart/loader/testdata/frobnitz-1.2.3.tgz  | Bin 2070 -> 3559 bytes
 pkg/chart/loader/testdata/frobnitz/Chart.yaml |   7 +++
 .../frobnitz/charts/mariner-4.3.2.tgz         | Bin 1034 -> 935 bytes
 .../testdata/frobnitz/requirements.yaml       |   7 ---
 .../testdata/frobnitz_backslash-1.2.3.tgz     | Bin 2079 -> 3617 bytes
 .../testdata/frobnitz_backslash/Chart.yaml    |   7 +++
 .../frobnitz_backslash/requirements.yaml      |   7 ---
 pkg/chart/loader/testdata/genfrob.sh          |  12 ++++
 pkg/chart/loader/testdata/mariner/Chart.yaml  |   8 +++
 .../mariner/charts/albatross-0.1.0.tgz        | Bin 0 -> 292 bytes
 .../mariner/templates/placeholder.tpl         |   1 +
 pkg/chart/loader/testdata/mariner/values.yaml |   7 +++
 pkg/chart/metadata.go                         |   2 +
 pkg/chart/requirements.go                     |   8 ---
 pkg/chartutil/create.go                       |   2 +-
 pkg/chartutil/requirements.go                 |  32 +++++-----
 pkg/chartutil/requirements_test.go            |  54 ++++++++---------
 .../testdata/dependent-chart-alias/Chart.yaml |  12 ++++
 .../Chart.yaml                                |   7 +++
 .../Chart.yaml                                |   4 ++
 pkg/chartutil/testdata/frobnitz-1.2.3.tgz     | Bin 2070 -> 3559 bytes
 pkg/chartutil/testdata/frobnitz/Chart.yaml    |   7 +++
 .../frobnitz/charts/mariner-4.3.2.tgz         | Bin 1034 -> 954 bytes
 .../testdata/frobnitz_backslash-1.2.3.tgz     | Bin 2079 -> 3617 bytes
 .../testdata/frobnitz_backslash/Chart.yaml    |   7 +++
 pkg/chartutil/testdata/mariner/Chart.yaml     |   4 ++
 .../mariner/charts/albatross-0.1.0.tgz        | Bin 347 -> 292 bytes
 pkg/chartutil/testdata/subpop/Chart.yaml      |  31 ++++++++++
 .../subpop/charts/subchart1/Chart.yaml        |  32 ++++++++++
 .../subpop/charts/subchart2/Chart.yaml        |  15 +++++
 pkg/chartutil/values.go                       |  24 ++------
 pkg/downloader/manager.go                     |  16 ++---
 pkg/resolver/resolver.go                      |  10 ++--
 pkg/resolver/resolver_test.go                 |  56 +++++++-----------
 pkg/urlutil/urlutil_test.go                   |   5 +-
 55 files changed, 328 insertions(+), 205 deletions(-)
 create mode 100644 pkg/chart/loader/testdata/albatross/Chart.yaml
 create mode 100644 pkg/chart/loader/testdata/albatross/values.yaml
 delete mode 100644 pkg/chart/loader/testdata/frobnitz/requirements.yaml
 delete mode 100755 pkg/chart/loader/testdata/frobnitz_backslash/requirements.yaml
 create mode 100755 pkg/chart/loader/testdata/genfrob.sh
 create mode 100644 pkg/chart/loader/testdata/mariner/Chart.yaml
 create mode 100644 pkg/chart/loader/testdata/mariner/charts/albatross-0.1.0.tgz
 create mode 100644 pkg/chart/loader/testdata/mariner/templates/placeholder.tpl
 create mode 100644 pkg/chart/loader/testdata/mariner/values.yaml

diff --git a/cmd/helm/dependency.go b/cmd/helm/dependency.go
index 542f13521..ff88150cd 100644
--- a/cmd/helm/dependency.go
+++ b/cmd/helm/dependency.go
@@ -136,14 +136,14 @@ func (o *dependencyLisOptions) run(out io.Writer) error {
 		return err
 	}
 
-	if c.Requirements == nil {
+	if c.Metadata.Requirements == nil {
 		fmt.Fprintf(out, "WARNING: no requirements at %s/charts\n", o.chartpath)
 		return nil
 	}
 
-	o.printRequirements(out, c.Requirements)
+	o.printRequirements(out, c.Metadata.Requirements)
 	fmt.Fprintln(out)
-	o.printMissing(out, c.Requirements)
+	o.printMissing(out, c.Metadata.Requirements)
 	return nil
 }
 
@@ -222,18 +222,18 @@ func (o *dependencyLisOptions) dependencyStatus(dep *chart.Dependency) string {
 }
 
 // printRequirements prints all of the requirements in the yaml file.
-func (o *dependencyLisOptions) printRequirements(out io.Writer, reqs *chart.Requirements) {
+func (o *dependencyLisOptions) printRequirements(out io.Writer, reqs []*chart.Dependency) {
 	table := uitable.New()
 	table.MaxColWidth = 80
 	table.AddRow("NAME", "VERSION", "REPOSITORY", "STATUS")
-	for _, row := range reqs.Dependencies {
+	for _, row := range reqs {
 		table.AddRow(row.Name, row.Version, row.Repository, o.dependencyStatus(row))
 	}
 	fmt.Fprintln(out, table)
 }
 
 // printMissing prints warnings about charts that are present on disk, but are not in the requirements.
-func (o *dependencyLisOptions) printMissing(out io.Writer, reqs *chart.Requirements) {
+func (o *dependencyLisOptions) printMissing(out io.Writer, reqs []*chart.Dependency) {
 	folder := filepath.Join(o.chartpath, "charts/*")
 	files, err := filepath.Glob(folder)
 	if err != nil {
@@ -256,14 +256,14 @@ func (o *dependencyLisOptions) printMissing(out io.Writer, reqs *chart.Requireme
 			continue
 		}
 		found := false
-		for _, d := range reqs.Dependencies {
+		for _, d := range reqs {
 			if d.Name == c.Name() {
 				found = true
 				break
 			}
 		}
 		if !found {
-			fmt.Fprintf(out, "WARNING: %q is not in requirements.yaml.\n", f)
+			fmt.Fprintf(out, "WARNING: %q is not in Chart.yaml.\n", f)
 		}
 	}
 
diff --git a/cmd/helm/dependency_update.go b/cmd/helm/dependency_update.go
index b684c4560..586c2e09b 100644
--- a/cmd/helm/dependency_update.go
+++ b/cmd/helm/dependency_update.go
@@ -28,18 +28,18 @@ import (
 )
 
 const dependencyUpDesc = `
-Update the on-disk dependencies to mirror the requirements.yaml file.
+Update the on-disk dependencies to mirror Chart.yaml.
 
-This command verifies that the required charts, as expressed in 'requirements.yaml',
+This command verifies that the required charts, as expressed in 'Chart.yaml',
 are present in 'charts/' and are at an acceptable version. It will pull down
 the latest charts that satisfy the dependencies, and clean up old dependencies.
 
 On successful update, this will generate a lock file that can be used to
 rebuild the requirements to an exact version.
 
-Dependencies are not required to be represented in 'requirements.yaml'. For that
+Dependencies are not required to be represented in 'Chart.yaml'. For that
 reason, an update command will not remove charts unless they are (a) present
-in the requirements.yaml file, but (b) at the wrong version.
+in the Chart.yaml file, but (b) at the wrong version.
 `
 
 // dependencyUpdateOptions describes a 'helm dependency update'
@@ -63,7 +63,7 @@ func newDependencyUpdateCmd(out io.Writer) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "update CHART",
 		Aliases: []string{"up"},
-		Short:   "update charts/ based on the contents of requirements.yaml",
+		Short:   "update charts/ based on the contents of Chart.yaml",
 		Long:    dependencyUpDesc,
 		Args:    require.MaximumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
diff --git a/cmd/helm/dependency_update_test.go b/cmd/helm/dependency_update_test.go
index 13bf2c822..f6a8b91cb 100644
--- a/cmd/helm/dependency_update_test.go
+++ b/cmd/helm/dependency_update_test.go
@@ -24,8 +24,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ghodss/yaml"
-
 	"k8s.io/helm/pkg/chart"
 	"k8s.io/helm/pkg/chartutil"
 	"k8s.io/helm/pkg/provenance"
@@ -49,7 +47,8 @@ func TestDependencyUpdateCmd(t *testing.T) {
 	t.Logf("Listening on directory %s", srv.Root())
 
 	chartname := "depup"
-	if err := createTestingChart(hh.String(), chartname, srv.URL()); err != nil {
+	md := createTestingMetadata(chartname, srv.URL())
+	if _, err := chartutil.Create(md, hh.String()); err != nil {
 		t.Fatal(err)
 	}
 
@@ -87,14 +86,12 @@ func TestDependencyUpdateCmd(t *testing.T) {
 
 	// Now change the dependencies and update. This verifies that on update,
 	// old dependencies are cleansed and new dependencies are added.
-	reqfile := &chart.Requirements{
-		Dependencies: []*chart.Dependency{
-			{Name: "reqtest", Version: "0.1.0", Repository: srv.URL()},
-			{Name: "compressedchart", Version: "0.3.0", Repository: srv.URL()},
-		},
+	md.Requirements = []*chart.Dependency{
+		{Name: "reqtest", Version: "0.1.0", Repository: srv.URL()},
+		{Name: "compressedchart", Version: "0.3.0", Repository: srv.URL()},
 	}
-	dir := hh.Path(chartname)
-	if err := writeRequirements(dir, reqfile); err != nil {
+	dir := hh.Path(chartname, "Chart.yaml")
+	if err := chartutil.SaveChartfile(dir, md); err != nil {
 		t.Fatal(err)
 	}
 
@@ -209,33 +206,25 @@ func TestDependencyUpdateCmd_DontDeleteOldChartsOnError(t *testing.T) {
 	}
 }
 
-// createTestingChart creates a basic chart that depends on reqtest-0.1.0
+// createTestingMetadata creates a basic chart that depends on reqtest-0.1.0
 //
 // The baseURL can be used to point to a particular repository server.
-func createTestingChart(dest, name, baseURL string) error {
-	cfile := &chart.Metadata{
+func createTestingMetadata(name, baseURL string) *chart.Metadata {
+	return &chart.Metadata{
 		Name:    name,
 		Version: "1.2.3",
-	}
-	dir := filepath.Join(dest, name)
-	_, err := chartutil.Create(cfile, dest)
-	if err != nil {
-		return err
-	}
-	req := &chart.Requirements{
-		Dependencies: []*chart.Dependency{
+		Requirements: []*chart.Dependency{
 			{Name: "reqtest", Version: "0.1.0", Repository: baseURL},
 			{Name: "compressedchart", Version: "0.1.0", Repository: baseURL},
 		},
 	}
-	return writeRequirements(dir, req)
 }
 
-func writeRequirements(dir string, req *chart.Requirements) error {
-	data, err := yaml.Marshal(req)
-	if err != nil {
-		return err
-	}
-
-	return ioutil.WriteFile(filepath.Join(dir, "requirements.yaml"), data, 0655)
+// createTestingChart creates a basic chart that depends on reqtest-0.1.0
+//
+// The baseURL can be used to point to a particular repository server.
+func createTestingChart(dest, name, baseURL string) error {
+	cfile := createTestingMetadata(name, baseURL)
+	_, err := chartutil.Create(cfile, dest)
+	return err
 }
diff --git a/cmd/helm/helm_test.go b/cmd/helm/helm_test.go
index c32abd877..9bc68a8be 100644
--- a/cmd/helm/helm_test.go
+++ b/cmd/helm/helm_test.go
@@ -141,12 +141,10 @@ func ensureTestHome(t *testing.T, home helmpath.Home) {
 		}
 	}
 	if r, err := repo.LoadRepositoriesFile(repoFile); err == repo.ErrRepoOutOfDate {
-		t.Log("Updating repository file format...")
 		if err := r.WriteFile(repoFile, 0644); err != nil {
 			t.Fatal(err)
 		}
 	}
-	t.Logf("$HELM_HOME has been configured at %s.\n", home)
 }
 
 // testHelmHome sets up a Helm Home in a temp dir.
diff --git a/cmd/helm/install.go b/cmd/helm/install.go
index 24ed14e33..8178f023c 100644
--- a/cmd/helm/install.go
+++ b/cmd/helm/install.go
@@ -181,7 +181,7 @@ func (o *installOptions) run(out io.Writer) error {
 		return err
 	}
 
-	if req := chartRequested.Requirements; req != nil {
+	if req := chartRequested.Metadata.Requirements; req != nil {
 		// If checkDependencies returns an error, we have unfulfilled dependencies.
 		// As of Helm 2.4.0, this is treated as a stopping condition:
 		// https://github.com/kubernetes/helm/issues/2209
@@ -286,11 +286,11 @@ func generateName(nameTemplate string) (string, error) {
 	return b.String(), err
 }
 
-func checkDependencies(ch *chart.Chart, reqs *chart.Requirements) error {
+func checkDependencies(ch *chart.Chart, reqs []*chart.Dependency) error {
 	var missing []string
 
 OUTER:
-	for _, r := range reqs.Dependencies {
+	for _, r := range reqs {
 		for _, d := range ch.Dependencies() {
 			if d.Name() == r.Name {
 				continue OUTER
diff --git a/cmd/helm/install_test.go b/cmd/helm/install_test.go
index cd0fc9b3f..0a0d0d351 100644
--- a/cmd/helm/install_test.go
+++ b/cmd/helm/install_test.go
@@ -112,9 +112,9 @@ func TestInstall(t *testing.T) {
 			cmd:       "install testdata/testcharts/chart-missing-deps",
 			wantError: true,
 		},
-		// Install, chart with bad requirements.yaml in /charts
+		// Install, chart with bad dependencies in Chart.yaml in /charts
 		{
-			name:      "install chart with bad requirements.yaml",
+			name:      "install chart with bad  dependencies in Chart.yaml",
 			cmd:       "install testdata/testcharts/chart-bad-requirements",
 			wantError: true,
 		},
diff --git a/cmd/helm/package.go b/cmd/helm/package.go
index a95146693..ac8b57c8c 100644
--- a/cmd/helm/package.go
+++ b/cmd/helm/package.go
@@ -102,7 +102,7 @@ func newPackageCmd(out io.Writer) *cobra.Command {
 	f.StringVar(&o.version, "version", "", "set the version on the chart to this semver version")
 	f.StringVar(&o.appVersion, "app-version", "", "set the appVersion on the chart to this version")
 	f.StringVarP(&o.destination, "destination", "d", ".", "location to write the chart.")
-	f.BoolVarP(&o.dependencyUpdate, "dependency-update", "u", false, `update dependencies from "requirements.yaml" to dir "charts/" before packaging`)
+	f.BoolVarP(&o.dependencyUpdate, "dependency-update", "u", false, `update dependencies from "Chart.yaml" to dir "charts/" before packaging`)
 	o.valuesOptions.addFlags(f)
 
 	return cmd
@@ -161,7 +161,7 @@ func (o *packageOptions) run(out io.Writer) error {
 		return errors.Errorf("directory name (%s) and Chart.yaml name (%s) must match", filepath.Base(path), ch.Name())
 	}
 
-	if reqs := ch.Requirements; reqs != nil {
+	if reqs := ch.Metadata.Requirements; reqs != nil {
 		if err := checkDependencies(ch, reqs); err != nil {
 			return err
 		}
diff --git a/cmd/helm/template.go b/cmd/helm/template.go
index 5584db87c..e94eecd21 100644
--- a/cmd/helm/template.go
+++ b/cmd/helm/template.go
@@ -158,7 +158,7 @@ func (o *templateOptions) run(out io.Writer) error {
 		return err
 	}
 
-	if req := c.Requirements; req != nil {
+	if req := c.Metadata.Requirements; req != nil {
 		if err := checkDependencies(c, req); err != nil {
 			return err
 		}
diff --git a/cmd/helm/testdata/output/dependency-list-archive.txt b/cmd/helm/testdata/output/dependency-list-archive.txt
index 098bc0635..a0fc13cd0 100644
--- a/cmd/helm/testdata/output/dependency-list-archive.txt
+++ b/cmd/helm/testdata/output/dependency-list-archive.txt
@@ -1,4 +1,5 @@
 NAME        	VERSION	REPOSITORY                	STATUS 
 reqsubchart 	0.1.0  	https://example.com/charts	missing
 reqsubchart2	0.2.0  	https://example.com/charts	missing
+reqsubchart3	>=0.1.0	https://example.com/charts	missing
 
diff --git a/cmd/helm/testdata/output/upgrade-with-bad-dependencies.txt b/cmd/helm/testdata/output/upgrade-with-bad-dependencies.txt
index a50915b9b..5652097a6 100644
--- a/cmd/helm/testdata/output/upgrade-with-bad-dependencies.txt
+++ b/cmd/helm/testdata/output/upgrade-with-bad-dependencies.txt
@@ -1 +1 @@
-Error: cannot load requirements.yaml: error converting YAML to JSON: yaml: line 2: did not find expected '-' indicator
+Error: cannot load Chart.yaml: error converting YAML to JSON: yaml: line 5: did not find expected '-' indicator
diff --git a/cmd/helm/testdata/testcharts/chart-bad-requirements/Chart.yaml b/cmd/helm/testdata/testcharts/chart-bad-requirements/Chart.yaml
index 02be4c013..ba72c77bf 100644
--- a/cmd/helm/testdata/testcharts/chart-bad-requirements/Chart.yaml
+++ b/cmd/helm/testdata/testcharts/chart-bad-requirements/Chart.yaml
@@ -1,3 +1,7 @@
 description: A Helm chart for Kubernetes
 name: chart-missing-deps
 version: 0.1.0
+dependencies:
+  - name: reqsubchart
+  version: 0.1.0
+  repository: "https://example.com/charts"
diff --git a/cmd/helm/testdata/testcharts/chart-missing-deps/Chart.yaml b/cmd/helm/testdata/testcharts/chart-missing-deps/Chart.yaml
index 02be4c013..8cd47d20c 100644
--- a/cmd/helm/testdata/testcharts/chart-missing-deps/Chart.yaml
+++ b/cmd/helm/testdata/testcharts/chart-missing-deps/Chart.yaml
@@ -1,3 +1,10 @@
 description: A Helm chart for Kubernetes
 name: chart-missing-deps
 version: 0.1.0
+dependencies:
+  - name: reqsubchart
+    version: 0.1.0
+    repository: "https://example.com/charts"
+  - name: reqsubchart2
+    version: 0.2.0
+    repository: "https://example.com/charts"
diff --git a/cmd/helm/testdata/testcharts/reqtest-0.1.0.tgz b/cmd/helm/testdata/testcharts/reqtest-0.1.0.tgz
index 356bc93030395fa1c045c8aaefb60c9d80a079a5..8618e91d73eb13803aefe7365459c8828163200d 100644
GIT binary patch
delta 749
zcmV<J0uud?2a*N|ABzYS00000kq9$?nL%&cHWbHm=BIdr57~^3q9t1f3~a!V4A`(k
z3#7=kprsdy2}LR-<s>cI&t6!DQ&(|q#8D-r=I<aUltPh+e&qjI25%i&7o6qXIQqZ~
zdD1$JF*cn{>QBa4^OH^3`0?kueH6xFbONmXp**Fsj++zq;(IkG_ew~yM3tg{N(9;&
z`2!R$a0Ui%Z8cAp&jbN5SZXVrHV-q%oh$7u2=Ja4r9_(OBB-yk1Ym*23aw_q=!mjy
zy@dyM7jEw^I;gwTzy7QTcuG>Vi4mo%oBxJ?Q5H~N4_Dg2|J59gLWh<--gzktY0R_l
z|KUqm`@i6_Li=MDfPMatLe}tqKVlQ_e<y6nG$R0+)N?Lp@bMGbwD$X_qQ<Gd=i_-E
zYyWAEvJjcl23x<!-u-_xdE$Q*djGp%0B^Z-Xp{w~Vf6sOU5*Oom5`}W8I(M^;Tc*=
z2JkKy7Hn0P+Bgd~M=5Ljq2Mmbh01;hgOWS3Kq$G(H`=*M$p92)e7W6!!mp*lD{+r0
z+zFS%FTYWEqvQi<RsZF3NKm2yDHKvd&oACzIBk#&;7k{VR&aTC0jV&S&`h|XKCXsO
z==_5T>f^d0&w}M){i|K5;A=;7p4?O=TnUMm45_^<$&k+Z4H;5blw|ms4B(O*p(_jj
zo&RGAEseg$#1Se|<iYBHI-{>&<KnmWf0dGgjg`H<l3?%tA2t1t$KL;L_$L2@s-!$1
z6hGDqKT$9~5_b6CT1l|af5x8pAID?we;3ro_dN(tZ|v~DwUXfZ`9F@wBkz9~`26ql
z|91bw)(U|A`9E&@zg!Z${~ge3{trpxEBn4@=h??D|Jy164#@vp({b$m?*gCykDFco
zw^aZfkpHLt{eL(3{O|MscK@S(^S|H!JE7J5ANl<M+SuiPulaxK{qF*w|Bstp{`Z>y
f{rkU8@cI9^^S{UAIbOa500960H(VY805kvqK23*E

delta 875
zcmV-x1C;!d29E~_ABzYS010l0kq9$?S>JD@HW0pN{)*}4rLDUB+5kD;PD!O!{VC;i
zQdL!zfeE+)Lv52>`q00<1Kj3LWV7hD9IIsgDKe~M5BBbSpJxV%e`{3QIWL&h_8qIr
z7qi19L_yGB3FE8lx#9hN-|zXssrLfrU&$7<N;651|G##|n|mV2P^FSLn%5$KhS%^N
zmKCI(FThnT;fFRsDUdwG60E`)-n)x+gHrWVT-&o<>(IL}*cTiA->|Yp^?3wfivPan
zkNF=(f#LrWIDreiVr{8m@PMB7@14T7PT)<!70@4p-(LUp<BI-UF|9F!D_&wZ-~!W<
zNrX-x1}}n!aj8JpkaYJ-(P%Dz=;K}8O3+v}B_s3Q<Uv&WSw=$+f(`%ef|Q@<qLw)O
zGp6_-c)<hy2fpF|5;%chJ3dR%6LxR_xGhjX((*FnA}0!`*DN0h+slD!o2HhUZpdj$
z$jdqbQiZgj(ch4G5WV?LM}1v<)XzlLF&=Z)1sm{XBk_vABW<|lH13OkuWa~5ly^{z
zerC5MXi!4Q1?h}^arx(^rnQlY^SY|Yz}xdn$Vg}`JLlTz+hO^Zo%|!6zTI>bxzjb9
zkLpG^9}Fe5zqaWGO<7;t>b9XaVb|2^ithiVp>LVwb*td}i*M<HjjaE|R9iOBkU7IR
z>UxS2w&6crTQ0Fep_N^K*6H<(&zOw=*Y1e_r#__wFyj&)$C2|t!v;l$BIT%J`27zn
z<3x2G!_Tz_PDgd`5|~*z3Y2tiXEFG$7p~k_D{uYAi()^By~qw;t)sKE=qy^fVeFcW
z;Hh9M|7XquCgcBT{eb@@2{7Xl9*5!o2mV_CE4WYeRh#sc0O|#Q7$y8&m&B%4oDSu?
z7+w}yH!5}<e8)P`u+zG7`q}E`cB}r_tpBNI5B=3W3vBp5e5uYyKhS(7!O8RgLH-}E
zPfh;62tK|3cP|U32KWrHga5OY1SijbZ(RQmL(iQ5i{P>P-^L3}4e)tm2mfa)2~P3<
zVf`-*Li7G_5t#Z~pQ-<C=f6K&0x%u_kMsZV)a3umVE_2vw?@hPp|@hN2X^s)t^{D8
z_&+l5{}zFX|BoBH_&-+yut)q)0f6EE5-{=qamW7#1_sBA{{jF2|Nk9>FjW9B007x>
B&%OWv

diff --git a/cmd/helm/testdata/testcharts/reqtest/Chart.yaml b/cmd/helm/testdata/testcharts/reqtest/Chart.yaml
index e2fbe4b01..e38826af3 100644
--- a/cmd/helm/testdata/testcharts/reqtest/Chart.yaml
+++ b/cmd/helm/testdata/testcharts/reqtest/Chart.yaml
@@ -1,3 +1,13 @@
 description: A Helm chart for Kubernetes
 name: reqtest
 version: 0.1.0
+dependencies:
+  - name: reqsubchart
+    version: 0.1.0
+    repository: "https://example.com/charts"
+  - name: reqsubchart2
+    version: 0.2.0
+    repository: "https://example.com/charts"
+  - name: reqsubchart3
+    version: ">=0.1.0"
+    repository: "https://example.com/charts"
diff --git a/cmd/helm/upgrade.go b/cmd/helm/upgrade.go
index afe993f43..841e871c7 100644
--- a/cmd/helm/upgrade.go
+++ b/cmd/helm/upgrade.go
@@ -154,7 +154,7 @@ func (o *upgradeOptions) run(out io.Writer) error {
 	if err != nil {
 		return err
 	}
-	if req := ch.Requirements; req != nil {
+	if req := ch.Metadata.Requirements; req != nil {
 		if err := checkDependencies(ch, req); err != nil {
 			return err
 		}
diff --git a/pkg/chart/chart.go b/pkg/chart/chart.go
index c8918df18..c78ad60fb 100644
--- a/pkg/chart/chart.go
+++ b/pkg/chart/chart.go
@@ -20,8 +20,6 @@ package chart
 type Chart struct {
 	// Metadata is the contents of the Chartfile.
 	Metadata *Metadata
-	// Requirements is the contents of requirements.yaml.
-	Requirements *Requirements
 	// RequirementsLock is the contents of requirements.lock.
 	RequirementsLock *RequirementsLock
 	// Templates for this chart.
diff --git a/pkg/chart/loader/load.go b/pkg/chart/loader/load.go
index 66297afdd..4075ed6fa 100644
--- a/pkg/chart/loader/load.go
+++ b/pkg/chart/loader/load.go
@@ -77,11 +77,6 @@ func LoadFiles(files []*BufferedFile) (*chart.Chart, error) {
 			if err := yaml.Unmarshal(f.Data, c.Metadata); err != nil {
 				return c, errors.Wrap(err, "cannot load Chart.yaml")
 			}
-		case f.Name == "requirements.yaml":
-			c.Requirements = new(chart.Requirements)
-			if err := yaml.Unmarshal(f.Data, c.Requirements); err != nil {
-				return c, errors.Wrap(err, "cannot load requirements.yaml")
-			}
 		case f.Name == "requirements.lock":
 			c.RequirementsLock = new(chart.RequirementsLock)
 			if err := yaml.Unmarshal(f.Data, &c.RequirementsLock); err != nil {
diff --git a/pkg/chart/loader/load_test.go b/pkg/chart/loader/load_test.go
index 2efea1a35..630da5cd4 100644
--- a/pkg/chart/loader/load_test.go
+++ b/pkg/chart/loader/load_test.go
@@ -176,15 +176,15 @@ func verifyChart(t *testing.T, c *chart.Chart) {
 }
 
 func verifyRequirements(t *testing.T, c *chart.Chart) {
-	if len(c.Requirements.Dependencies) != 2 {
-		t.Errorf("Expected 2 requirements, got %d", len(c.Requirements.Dependencies))
+	if len(c.Metadata.Requirements) != 2 {
+		t.Errorf("Expected 2 requirements, got %d", len(c.Metadata.Requirements))
 	}
 	tests := []*chart.Dependency{
 		{Name: "alpine", Version: "0.1.0", Repository: "https://example.com/charts"},
 		{Name: "mariner", Version: "4.3.2", Repository: "https://example.com/charts"},
 	}
 	for i, tt := range tests {
-		d := c.Requirements.Dependencies[i]
+		d := c.Metadata.Requirements[i]
 		if d.Name != tt.Name {
 			t.Errorf("Expected dependency named %q, got %q", tt.Name, d.Name)
 		}
@@ -198,15 +198,15 @@ func verifyRequirements(t *testing.T, c *chart.Chart) {
 }
 
 func verifyRequirementsLock(t *testing.T, c *chart.Chart) {
-	if len(c.Requirements.Dependencies) != 2 {
-		t.Errorf("Expected 2 requirements, got %d", len(c.Requirements.Dependencies))
+	if len(c.Metadata.Requirements) != 2 {
+		t.Errorf("Expected 2 requirements, got %d", len(c.Metadata.Requirements))
 	}
 	tests := []*chart.Dependency{
 		{Name: "alpine", Version: "0.1.0", Repository: "https://example.com/charts"},
 		{Name: "mariner", Version: "4.3.2", Repository: "https://example.com/charts"},
 	}
 	for i, tt := range tests {
-		d := c.Requirements.Dependencies[i]
+		d := c.Metadata.Requirements[i]
 		if d.Name != tt.Name {
 			t.Errorf("Expected dependency named %q, got %q", tt.Name, d.Name)
 		}
@@ -224,7 +224,6 @@ func verifyFrobnitz(t *testing.T, c *chart.Chart) {
 }
 
 func verifyChartFileAndTemplate(t *testing.T, c *chart.Chart, name string) {
-
 	if c.Metadata == nil {
 		t.Fatal("Metadata is nil")
 	}
@@ -246,8 +245,8 @@ func verifyChartFileAndTemplate(t *testing.T, c *chart.Chart, name string) {
 	if len(c.Dependencies()) != 2 {
 		t.Fatalf("Expected 2 Dependency, got %d", len(c.Dependencies()))
 	}
-	if len(c.Requirements.Dependencies) != 2 {
-		t.Fatalf("Expected 2 Requirements.Dependency, got %d", len(c.Requirements.Dependencies))
+	if len(c.Metadata.Requirements) != 2 {
+		t.Fatalf("Expected 2 Requirements.Dependency, got %d", len(c.Metadata.Requirements))
 	}
 	if len(c.RequirementsLock.Dependencies) != 2 {
 		t.Fatalf("Expected 2 RequirementsLock.Dependency, got %d", len(c.RequirementsLock.Dependencies))
diff --git a/pkg/chart/loader/testdata/albatross/Chart.yaml b/pkg/chart/loader/testdata/albatross/Chart.yaml
new file mode 100644
index 000000000..eeef737ff
--- /dev/null
+++ b/pkg/chart/loader/testdata/albatross/Chart.yaml
@@ -0,0 +1,4 @@
+name: albatross
+description: A Helm chart for Kubernetes
+version: 0.1.0
+home: ""
diff --git a/pkg/chart/loader/testdata/albatross/values.yaml b/pkg/chart/loader/testdata/albatross/values.yaml
new file mode 100644
index 000000000..3121cd7ce
--- /dev/null
+++ b/pkg/chart/loader/testdata/albatross/values.yaml
@@ -0,0 +1,4 @@
+albatross: "true"
+
+global:
+  author: Coleridge
diff --git a/pkg/chart/loader/testdata/frobnitz-1.2.3.tgz b/pkg/chart/loader/testdata/frobnitz-1.2.3.tgz
index fb21cd08fb08fd2f4e45e940634ce1cdb0421457..a8ba8ec6f4838980e28e67d8f619cc097ccd03f5 100644
GIT binary patch
literal 3559
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

literal 2070
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
ATmS$7

diff --git a/pkg/chart/loader/testdata/frobnitz/Chart.yaml b/pkg/chart/loader/testdata/frobnitz/Chart.yaml
index 134cd1109..fcd4a4a37 100644
--- a/pkg/chart/loader/testdata/frobnitz/Chart.yaml
+++ b/pkg/chart/loader/testdata/frobnitz/Chart.yaml
@@ -18,3 +18,10 @@ icon: https://example.com/64x64.png
 annotations:
   extrakey: extravalue
   anotherkey: anothervalue
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
diff --git a/pkg/chart/loader/testdata/frobnitz/charts/mariner-4.3.2.tgz b/pkg/chart/loader/testdata/frobnitz/charts/mariner-4.3.2.tgz
index 3af333e76a3c268ce6d23f5ae8ba59387a75a38a..ac499ec9fe2422d6eeaca7455279c7409ce4c21d 100644
GIT binary patch
literal 935
zcmV;Y16ceYiwFSX$c0+~1MQb@XcK1~$0LJPZbM}_aZ~8CbV>)y<t}%ZXpl;+&Wf{x
zw$n-(>`C$@xp{xW^E{_%m4cMMnR`=kA^~+nbT5=mRQ&&EFz4Jlx)<xPZ??h^(V+$@
zxK*q5$t4YKMN3%|*?c|(p1b6^=lA6K{{Ec_v2G#k_mmJxl0upW+%Xt*M=7A@#{xiB
z6jfGKB`Al0BrCEad4N{RO^xCZ3NhOX#0U}e^m%MrJpPPz3jd=x{zoti`qw2PreYg3
zjp?_+&LgO*PuD*Xk|*e|Nt)&X()4fTNnUXMEoh=JD0qPoLnMmz6xD4j3~E6=GE5N7
zc?O8v7_4<72wR9EB5X#OxRX>-5d%Wf&aLA0vISDeiXkhiBN7$>@PWJmXha~zHX-ag
z05D3~M5i`x3xg!3DH8VkQ5u>l1Bp@F^p85FYdZf((V$lnWl{19&->v1CyYPp(v*Rz
z=YLg|Ri6LL!KnTevFL*=v`gRuQ`cXU13|8TIT+P{Gc+7TO49&LR{s@Qo2b7c2YCH2
z2UTDtibKbsAnyTgp<h;4U)$K+P`hqbjVM%s=A=#l`#`X<cHR3vHp7IJq8NzltY8-_
zctWR1C*l@xYMX}7fL6l25^_eO20LN58_4?_NI@MFKy47oT@%9A(=B$}W;+-Z(^1ZT
zzJ>6*k9h@Q%<gh62Af2~fMN&no?z-cng7`kMM>L;AuQ6=bYz3c;-4je@$ny!<bcBC
zzZ{H>?y<`ASb8y-(Ek_T(|qo0mPixr|K7%A@vpKU3-PZiYJk=MkQP*V{Fj5u9Wy<D
zUg>J}ymY&7;FC^i?#rof2Ip2(ez7A{oes4t{Y{tdwR9bSXU)5}ZYR!0zC663^UU&F
z4}M?hpC#YD_G|y;mDv^P`gqlW!^aOc`Fff@Kiz&PvGet=pM(#0Zd`@8RXZ!%FZe!s
z^{qFTTi>Uze|z%5<r60!e!ORJ>B0M}ck7ROdjC0<mRq-Gw|q9Rzxl6w!^f7L&0JjH
zxajTd`R>1m2Zyph@7k2HwzrU$p^nO}ClB51-rH~K&bc@G!XNxn_g%*i-JMI0%>HWe
z=_~UZ>77#znNRoC%-QziqLGSd#Vj)Hsp+}c_nY%*?VhTU0hk$?|HqArhOYjWtMgl5
z@hX>khcdf*k7lnfc<;=N@dwkff5VoqW3PFtpN}pa4u`|xa5x+ehr{7;I2_J&@E8dW
JuRj1N003B=-M9b%

literal 1034
zcmV+l1oitLiwFRoe*ISf1MQf5Y!pQt$1j*vT_1mmq6v0Vv`Rzw_Pu%yR;*Eys*pfJ
z2%2>6ZtiaDKCZKKh4VpUVhPw(Vq+5%p#1{`AAuCqVmyct4N85WAVyGp#n=>Wj1n4S
z;p*((BjusRcz0-+&)sGA_I7u6_dCDuclIoZ4IANLpo|EDpsOnITP@cLl9Frl08!F)
zQI-`+mw+HDk|+d#TF#Ryka7vc^i(WJNH|3z353tP9o;Mz`<vtBucO%hPq6a(Hzgn@
zd>UG2>HDDfLsOK$)?XBLPk%{~bzM;vs=p>GasUXWKb3R2#PzqKg+d@d3b-h8BiKk1
z!?8nP9+;0z3q-t;0b&jY&8aZLHX_L7+7WjBjTBzyB`)E3N2#gdF81Xx{vn0>_f>Yw
z69X6O|EeIVvL?{_R~21m{$B|S`eW3VGBC1`P25t)z?A;4N@wN2u8Au1|4I-=Nn}Tn
z9Wjs_;sB@zxkP|w7!vHbE?oxzMoGsth=bE1kRT-KhJrz~0$NEE@e#)gp6Md~F2#hX
z5qOaoSTy`MDJVw}6%*2EFGB=ep#M*v|4Cl`Gyg9?1^wHhnL;IZ{v1>Jzocru{;DFY
zvZ8zXD}u!QzY@#>_o5g~nFQoUfIrdC4+@@}1r{d^7tl8ZOXofKKt27{yHO|#Vg~j8
zVi?2?l1PR9EFg|$)|=3d`%9eHLBxa@`N5JKXCMg;>;mF|u(#~G^mv9%zowlO21P6K
z`p>0NjlUbqkkWIm|I;Rd5{?<A1Art;;RaLHzaWce`oAR77pwnDFuB4fE6+;p(%`J;
z|Kha2-k-JeB>vdH?_;X^S7q6M{?qA4k~LcYf~K+m|0+Ut*A;=jm8X{kE*t&)SnE4r
zM%A}7hwC=o@X3?4*}Ff!Z$VXtJ9Kn&ORKnfAk%L&Pun>D;)phO*KK{PKizeFOIz=n
zy*o!wAB(P@-@O0Xt)Vxb?^^Wuz7^Z9s$0DG<(79l=RDI;yJg+Mmmb}CrBT<tX8ZB)
zcMN_Pe)}_P_saPC6QNaOYlWt4*U_i%=+L?|WBS2~h4<{*(0Cx--@$WRJFlDFaVr_>
z-!}KT=4?9KaOjJkYcgQjk@g!0$KO1e>6trl|4%m!{=B?u+4!Emw}w`2=pOv&TJ81s
z9#V$gq1JEK%Ii?$Zt#20ucxXP^=-QPiQlpZ?i{{l`pMzO-oRHAJB1&st=E><&K!N!
zdCK`A=yslR;D-|}568cpeRH7ta7WJ{hsPI;tY0|c!1o)c|1u-g@WGDm6TNL{-wPw*
z(Wd>^e|==&5o^vX4U=!@9%pP?@baZ~f!i;ZpbQ3s!C){L3<iV2V4R0P0hhy5PXH(Y
E0Om^*5C8xG

diff --git a/pkg/chart/loader/testdata/frobnitz/requirements.yaml b/pkg/chart/loader/testdata/frobnitz/requirements.yaml
deleted file mode 100644
index 5eb0bc98b..000000000
--- a/pkg/chart/loader/testdata/frobnitz/requirements.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-dependencies:
-  - name: alpine
-    version: "0.1.0"
-    repository: https://example.com/charts
-  - name: mariner
-    version: "4.3.2"
-    repository: https://example.com/charts
diff --git a/pkg/chart/loader/testdata/frobnitz_backslash-1.2.3.tgz b/pkg/chart/loader/testdata/frobnitz_backslash-1.2.3.tgz
index 692dd6aba5da8382262cd94fae736785709b339f..bc6be27aa6d1afe8959df123f150919b74e514e8 100644
GIT binary patch
literal 3617
zcmV++4&Lz}iwFSX$c0+~1MOT1TolzGr!<dEO9jKi<F%NX%Iv+Xpb{z~q9Wpnsm$)a
zWk+UrwwYO$4N)`Czh;W%9e=dEur$s7-lAoH(@M+>kC3#?8_f&FVE=Ds7lajE(fzMk
z^Zkf(yx+X{W`6toz27xspee1HVBZ;`#dXOHi8DrtpSK~EN;N7K;J0cuzm>|B&aDeT
zrcfwl3Z+z`RsyL^rBG=6fXeGLsRCAp#c4DZoQ9Br_oqW-2EzmTaotDx_9=nkUjFxr
z?i$%AKGJ(*c;vraRmOjXTBbq#S1VLfKOptq6z-3IIR9PD1{M<6K_f-#A&rTi^rQs%
z3{}W~S0hfdm>oBfUK+!L{L5tMptAgH<QkbE|GofjAqGO4At-YwNRf%mxCw@Wdw&!n
zJ!Et=VPSc~{zifU=pSBAiHTCmdJ)SoIi?VclA+y3(RwCS1VBhRA%DPFXiAq1S^hvz
z>2bZtgcD{K{h?l*7dU6q-v~huNSZ)@h?~%P03f0yLxB;Ud=sYPCJPBM9c8L;O+00S
zlo^6Zl7SU3F;iMfZ?AL_Ls@AZbd6|aSql>?kyId%7${1j#c7d|;(F#NDieqZ9e2-F
zU8+{5s+E|<oFu}{W{SnRN5_u@Q&}2EPbbv5mx7a4Zk{+IGD4bfaP2#r^w0v$dT7=W
zu+p=^Neg;j{2ktX_)<)UNyYq08d@lZU@6*O^#paCoHG?VG~qPI0Jk2Mm;#emtH&q(
zn-=i!s6zicx#&eV;9>25saz&ksb!q~hn4}s{`Uo{;6JC*FeW9*Yh!rgzY3jnTmPkU
zwXpvC0v*FsO=Ow2?<D3HkMPc-j)?sLHJ}9x?R65n7CxKJhS?MtMJGw*=q4qoP3$Cl
zAPK*AID1Pa33GB)#Ig<@I!O3damDq=IU`^r^sKRy7-<JFTKS12BkMXK^qs^kWLR-$
zbX7;rNa-BuT#x|wGwvwiPjPKD)UiCdfuIpRNJTw}ft~-~)xA=Bw|6z#HxMM*No>Yb
z>|#mfJ{X8P*YlmoRD3T=553S(&vnv~dmx?vLMvny@*mwNzJEloUKpFodS?ue`d=fz
z$NrZo1^M>{%1wDQAk63<NfH_4I;#nqS&X;7btHlIk!@%PdV;Z#Xv?B&gdoA+169aB
z;=ebozelqF<Z6Xr|M>z{@E_xRYa+=^(GPeW)qzL;%cSo5U#Zpz`rj9D@>wEi^M5F+
zkpF&>5#4%6VkW(}#_%Nna)r!2|D%=*@n4@H7<4a-%!(@5g083@;A26UNE93l1~7OM
ztcnN&(JV0H3@}r`$`Lu~yTKGlQWnmV6p6Z1G|)RwKpI(^2C5xkAVj7l`lBo%B-d6U
zz9^WNK0+1p&qBmi9C_8=G6Jh_|7jEonPC6<0#)#z&pI$(OaOY~zf9?_|1~PPO3?ql
zKrn~^PKI-VDx~l!J`KlkI|d@jO7nRuq|u!zA~Ba-1AWlGSR`Vgj?V{*fGdF{<{FT8
z2RLxGi3L6W*G3icPs6vZ1P!@`o54s*m;AV6c#?mG)J^{7QjJ28f1lu~OD^k)B*?I#
zNXsC#Md$_n@_2Zl{a3b!v6ja%1w7h+O1JpGT&C6t@qeG72P8=fq@`i}(me_}X$IU%
zvOsL3Xi_guPZtF2Z;kuK|GgOm@+kkRd+mRf5dZNB?w0aZr~n2AE?nbE1G*f5Cp}RC
z{}<f9{>y0rdLsr@?f8#eDpd>hUp~S8`9H#$8X94G>@1+i_>WZW?*FM(g8%0e@cN%I
zQdUwAv=BIXj&|*QXr82Sv>dbpTC1}HgrhL)NUI)^@L?WTe&9*pg@8xJ{pH`~u!rz2
zI>siw^T=a(kbk*Uc8~w3RLKST_XS!^t>c$Dx@3@FjZ1UW$biVEyCie_4{I@I%Hp~y
z{nqvDT6A;kJM{;C7MGDd<IOI0=Cg(7Li2^rtG;9=T#L|Y>mKQ^)%p8pmDH%&;@yCQ
z+K!VO)bE*|1-kbg_3e=W)3ipf=uV!$cp~`pqHj}e#<{uq@aD}FTS`$_&Sl%pc9ZJ|
zolMM{R%cw+$~ISqhUAGdGLo<P#qGDo&2Ah$XDn!w(Yof?guS!c%%JP;yxzZEj~?wK
z#dXK$Zf=&}?xi~me*JCrCr3(Szqnegc@4B0^-6-_+?}kVuJIq{93By1jU5v`(>g4!
zadu9tHnd-zCE*`28+YDVzi2`i5H8x#nhrkFqtQ2Ox+XTC`$4bgyKR~IjP`|EKdz8|
ztrmZG`dGu1lJ^6K|Na_wGBs+&ij&yQ)6&vcClnVANcrBsM&NlzHdwK?)xP3EjfWXZ
zN7NM+>kiJAOV`fm{d2!v+dnK_-81QQ&Z;SGt~q)(h>X@p&1@!{5p>FLdF_qe#u}P5
zy0`%wR@<+8^e)xp_YS-|1GGFhaa_c@XA`3R|7f^NlzC2EihVnNdBfD1frFKQYTjra
z)u6Heexsyo&9|}~v6+tO;Ux-(B>cIO<BR5XdCgYZH2!wZrz5wOW{X#@U7S|jcHGWC
za~l2dY|-K-z2?>Yt^3&UpK@OmWiEK`rPu2P?$gwaIn(LZo1IDyZH{X#($>0Bs%^5f
zenyW8CGEg;czD6S>33ol=0)rr-{kg=jG!b?xBkUvPmTRz{l!h!Qz!P$S^9B6t;n`l
zi*uL6y`K~G{fzz0D#w9V;~GtWc}b12En`mBia(SCrY05VwA>%K($Q18@$1*y=Jvd_
z|Ci6sI8Lq0Iq~nWuC**Zl5<&?T|5XL9aDPXTvUcC!7*;>8i%7z7i(VQcej1CY)(xq
zsN~PV7s3*|A6l=NbU~eeW%sPFj&2U$Mnw#m7{;<p%*qXRaDY<A9&cZIYO*>d&y>D0
zJl{GhX6WVlTf?GaTTES*S+K=%^z%iU%*zSaZ*6OQd{y?)Ek&ni+rrLtJkWPD%-=Dm
zd4B4WxV)`~JAYiZ)f*i+`i>&GXwR);|3w3I$rF~6c|R??e0JX^g|2wVlnF%_kL^nZ
z`2{<ep<$~R<iFka<?{vVqK&_kp~o#}r)DP06OYck8B}{$LC1OL=7m`tv6}j&Tegfm
zdMk6=`iTQgXPf_dHsR8ZqUQZ3<}W%-9o}=H@2}=7X}PPHWe46cZ7QBpu(oz#(`~SL
z_sRdB*gnWVY(k5bpXbfa+uJn#kbTeXSI?$o(!Wgd4|#D{&cbvitJo5i+hWqLz-gb2
zXn%5hQP47nJow<19n%Z_x0;Lv&j+9UX=zE`m~{Ow4U_k_tv`!8(>#exxN>!g_1)u=
z*;(~!y|*J#+JxUMoD}}doNwY|{aQb1JtW}Cz@z`?g||UH+W$(0+xjn;3i)5(pi;J{
z(o3G*poOID$i~;=450%NJPGJUn60V6Lh0|m@X2R|D!d`dC2o@2GZ;ZhxJpvNIruBX
zqx^f}ZNTcse`E@kQ2*@{c;vqq5&@q0uevAykN7X>f1iMl|CCjG+HeLWLFDw~EYt%l
zLzt8JFp!QinQ*fnBy##3=xB)AU28@n#+8IZka#z1oCx#;_of_0+wYbW;at++4j6(T
z2(2H0hR(O|fsJ5|02k>fE7wFBfCZ<~s>Gu8rL1#TNg7L;$V9g~C2oFYNz1ZACW_`x
zixQnv3_+vu223I-PiTuoLntfIRe0-(t@t3Ex9+^%3a>>mWd#Xk(vkSohrT?@zZa@O
ztFQmL0I;C{eF2aB_d+$ONB+Clf6C=@webBXpCFij$&=H^oF`CL<!Q2qIN2}MZ~o0u
z4gK%7nm+s(9_>GcyZ?_YLc#v?3EaN_luVfQp`b5v?~wt9>v0ypTiu<OhV_Fa#2LsJ
zi>0TBpfk?!kn<Q(lDHO<d?6_SMo1GZo>ckDcu1!ZIwvu3rVsm+_3qY}tGRr7<rJ<n
zU=(=UO0gU<V}UwuP-IggZnAwTlF-??E6U5+`aooViUH=L7-8W__;FmOq}!LLY&gNX
z%2f#ye-~n>0E8;IuUqlcbDG7WV5nH4CCn0rgwP^xC+>iL0ODa!hvs}(|KEf&tUQDd
z^;A0-=-K~s`~IU`p%UspeFHB4w=8%dm;XClF!DWVK&>mo?*vRLJn`}JxU>03uv%&V
zIvANCO~@F0<aq3?wNuwRW=vmu**0rIgHH;gr+4o#;^$Qv+TXkP6zQ5pVcG37XSAN*
zW#EM6G12Yz%(q9%Fa2lnZaX~ld6Uy6DOWG`Ic_`i<AF_uv#fnC|DhgU*Z*ox!5bH@
z1;XNh+_^bX!v?fCBN<=s_Vcn`*!d1)-q<*#;j$w?Y#fv6$eMPd@A7dMhipDv_~PjB
z7lJl@5|tk`a?YMC^SbLw(^t*b<zZnXFMQo{Z{*&i=C=+HUj1dx=$CJ;NiFTV2OAJ{
ztFWX+?wB<T$E<2u=!ltoJI(aM*7+Z#WHh=JS=vwiouiSqH0n_7u_eXN+{$(^Lq0BX
z>|ScP?ugm2sCNE}6-5EbU|n(FfDXqxRD5vTKe9i!_0zyBPkHL3I`S`jL>KT8{6D2s
zD)@iCK=t_lXvrW?{Flkx^}kXfy#M1Hl)apTxLY~>6XE>sCeMC8q84M-LfQ<GCs1|j
zM=bb?Pa&!&|Bn_7@+ALqnY;g|RB43zFQ0(>PQyLHbDr6lD7eCheuqT#?iGUCOgPKs
z2DlhJN6-!GNc7}*pUL^_02Z8}8NgCpv8V-S7`{{#9oi`?T^@jExQn@qKqnyPuM@O~
n009C72oNAZfB*pk1PBlyK!5-N0t5&U;5GaYDAa`V0C)fZ`8qyL

literal 2079
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
J;bQ=3007~8JqQ2*

diff --git a/pkg/chart/loader/testdata/frobnitz_backslash/Chart.yaml b/pkg/chart/loader/testdata/frobnitz_backslash/Chart.yaml
index 49df2a046..b1dd40a5d 100755
--- a/pkg/chart/loader/testdata/frobnitz_backslash/Chart.yaml
+++ b/pkg/chart/loader/testdata/frobnitz_backslash/Chart.yaml
@@ -18,3 +18,10 @@ icon: https://example.com/64x64.png
 annotations:
   extrakey: extravalue
   anotherkey: anothervalue
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
diff --git a/pkg/chart/loader/testdata/frobnitz_backslash/requirements.yaml b/pkg/chart/loader/testdata/frobnitz_backslash/requirements.yaml
deleted file mode 100755
index 5eb0bc98b..000000000
--- a/pkg/chart/loader/testdata/frobnitz_backslash/requirements.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-dependencies:
-  - name: alpine
-    version: "0.1.0"
-    repository: https://example.com/charts
-  - name: mariner
-    version: "4.3.2"
-    repository: https://example.com/charts
diff --git a/pkg/chart/loader/testdata/genfrob.sh b/pkg/chart/loader/testdata/genfrob.sh
new file mode 100755
index 000000000..8f2cddec1
--- /dev/null
+++ b/pkg/chart/loader/testdata/genfrob.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# Pack the albatross chart into the mariner chart.
+echo "Packing albatross into mariner"
+tar -zcvf mariner/charts/albatross-0.1.0.tgz albatross
+
+echo "Packing mariner into frobnitz"
+tar -zcvf frobnitz/charts/mariner-4.3.2.tgz mariner
+
+# Pack the frobnitz chart.
+echo "Packing frobnitz"
+tar --exclude=ignore/* -zcvf frobnitz-1.2.3.tgz frobnitz
diff --git a/pkg/chart/loader/testdata/mariner/Chart.yaml b/pkg/chart/loader/testdata/mariner/Chart.yaml
new file mode 100644
index 000000000..e2efb7f99
--- /dev/null
+++ b/pkg/chart/loader/testdata/mariner/Chart.yaml
@@ -0,0 +1,8 @@
+name: mariner
+description: A Helm chart for Kubernetes
+version: 4.3.2
+home: ""
+dependencies:
+  - name: albatross
+    repository: https://example.com/mariner/charts
+    version: "0.1.0"
diff --git a/pkg/chart/loader/testdata/mariner/charts/albatross-0.1.0.tgz b/pkg/chart/loader/testdata/mariner/charts/albatross-0.1.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..f34758e120e49702c5029755b49eaa181d593574
GIT binary patch
literal 292
zcmV+<0o(o`iwFSX$c0+~1MSq`YJ)Ho25_(Q6bB!mi<&5SH+nPJQ^fXIg|sP2EbQ%P
zyJDfN8-uz(?EBpuFAg#B<kQ&3MDId)NM<9YthA<6Ez47txq7Q-lof@_3RRR@MRI&7
zbwYZ+EnN&D8b5Buc;>*j`^L7m{a~H*Ii~tYm}&mY&iJ@^F<X1@cZ}boRO<Hpvpl<+
zzgAKuB=5bE_x$tu@648Knr?wub6EL)AA7f}>5-n;ZfSMA8PqyY&qKq0$B~0Lun(su
zxyTk$bnduLnu?!35PZoc{|93S4s-kfKFhz<)ph<$og@F>VVeIK-slHTh1giv7+VV>
qGsMpMnwHM8@7Ehfx&Z(H000000000000000exp}+u4EDbC;$LV29I_C

literal 0
HcmV?d00001

diff --git a/pkg/chart/loader/testdata/mariner/templates/placeholder.tpl b/pkg/chart/loader/testdata/mariner/templates/placeholder.tpl
new file mode 100644
index 000000000..29c11843a
--- /dev/null
+++ b/pkg/chart/loader/testdata/mariner/templates/placeholder.tpl
@@ -0,0 +1 @@
+# This is a placeholder.
diff --git a/pkg/chart/loader/testdata/mariner/values.yaml b/pkg/chart/loader/testdata/mariner/values.yaml
new file mode 100644
index 000000000..b0ccb0086
--- /dev/null
+++ b/pkg/chart/loader/testdata/mariner/values.yaml
@@ -0,0 +1,7 @@
+# Default values for <CHARTNAME>.
+# This is a YAML-formatted file. https://github.com/toml-lang/toml
+# Declare name/value pairs to be passed into your templates.
+# name: "value"
+
+<CHARTNAME>:
+  test: true
diff --git a/pkg/chart/metadata.go b/pkg/chart/metadata.go
index 850a0b26a..239bdd2eb 100644
--- a/pkg/chart/metadata.go
+++ b/pkg/chart/metadata.go
@@ -65,4 +65,6 @@ type Metadata struct {
 	Annotations map[string]string `json:"annotations,omitempty"`
 	// KubeVersion is a SemVer constraint specifying the version of Kubernetes required.
 	KubeVersion string `json:"kubeVersion,omitempty"`
+	// Requirements are a list of requirements for a chart.
+	Requirements []*Dependency `json:"dependencies,omitempty"`
 }
diff --git a/pkg/chart/requirements.go b/pkg/chart/requirements.go
index b6e2dba30..bb2d1d11c 100644
--- a/pkg/chart/requirements.go
+++ b/pkg/chart/requirements.go
@@ -49,14 +49,6 @@ type Dependency struct {
 	Alias string `json:"alias,omitempty"`
 }
 
-// Requirements is a list of requirements for a chart.
-//
-// Requirements are charts upon which this chart depends. This expresses
-// developer intent.
-type Requirements struct {
-	Dependencies []*Dependency `json:"dependencies"`
-}
-
 // RequirementsLock is a lock file for requirements.
 //
 // It represents the state that the dependencies should be in.
diff --git a/pkg/chartutil/create.go b/pkg/chartutil/create.go
index 9d68c7c57..b5bed235f 100644
--- a/pkg/chartutil/create.go
+++ b/pkg/chartutil/create.go
@@ -318,7 +318,7 @@ func CreateFrom(chartfile *chart.Metadata, dest, src string) error {
 	}
 
 	var m map[string]interface{}
-	if err := yaml.Unmarshal([]byte(transform(string(b), schart.Name())), &m); err != nil {
+	if err := yaml.Unmarshal(transform(string(b), schart.Name()), &m); err != nil {
 		return err
 	}
 	schart.Values = m
diff --git a/pkg/chartutil/requirements.go b/pkg/chartutil/requirements.go
index d58187e6d..2325176ed 100644
--- a/pkg/chartutil/requirements.go
+++ b/pkg/chartutil/requirements.go
@@ -26,11 +26,11 @@ import (
 )
 
 // ProcessRequirementsConditions disables charts based on condition path value in values
-func ProcessRequirementsConditions(reqs *chart.Requirements, cvals Values) {
+func ProcessRequirementsConditions(reqs []*chart.Dependency, cvals Values) {
 	if reqs == nil {
 		return
 	}
-	for _, r := range reqs.Dependencies {
+	for _, r := range reqs {
 		var hasTrue, hasFalse bool
 		for _, c := range strings.Split(strings.TrimSpace(r.Condition), ",") {
 			if len(c) > 0 {
@@ -67,7 +67,7 @@ func ProcessRequirementsConditions(reqs *chart.Requirements, cvals Values) {
 }
 
 // ProcessRequirementsTags disables charts based on tags in values
-func ProcessRequirementsTags(reqs *chart.Requirements, cvals Values) {
+func ProcessRequirementsTags(reqs []*chart.Dependency, cvals Values) {
 	if reqs == nil {
 		return
 	}
@@ -75,7 +75,7 @@ func ProcessRequirementsTags(reqs *chart.Requirements, cvals Values) {
 	if err != nil {
 		return
 	}
-	for _, r := range reqs.Dependencies {
+	for _, r := range reqs {
 		var hasTrue, hasFalse bool
 		for _, k := range r.Tags {
 			if b, ok := vt[k]; ok {
@@ -127,19 +127,19 @@ func getAliasDependency(charts []*chart.Chart, aliasChart *chart.Dependency) *ch
 
 // ProcessRequirementsEnabled removes disabled charts from dependencies
 func ProcessRequirementsEnabled(c *chart.Chart, v map[string]interface{}) error {
-	if c.Requirements == nil {
+	if c.Metadata.Requirements == nil {
 		return nil
 	}
 
 	var chartDependencies []*chart.Chart
-	// If any dependency is not a part of requirements.yaml
+	// If any dependency is not a part of Chart.yaml
 	// then this should be added to chartDependencies.
-	// However, if the dependency is already specified in requirements.yaml
-	// we should not add it, as it would be anyways processed from requirements.yaml
+	// However, if the dependency is already specified in Chart.yaml
+	// we should not add it, as it would be anyways processed from Chart.yaml
 
 	for _, existingDependency := range c.Dependencies() {
 		var dependencyFound bool
-		for _, req := range c.Requirements.Dependencies {
+		for _, req := range c.Metadata.Requirements {
 			if existingDependency.Metadata.Name == req.Name && version.IsCompatibleRange(req.Version, existingDependency.Metadata.Version) {
 				dependencyFound = true
 				break
@@ -150,7 +150,7 @@ func ProcessRequirementsEnabled(c *chart.Chart, v map[string]interface{}) error
 		}
 	}
 
-	for _, req := range c.Requirements.Dependencies {
+	for _, req := range c.Metadata.Requirements {
 		if chartDependency := getAliasDependency(c.Dependencies(), req); chartDependency != nil {
 			chartDependencies = append(chartDependencies, chartDependency)
 		}
@@ -161,7 +161,7 @@ func ProcessRequirementsEnabled(c *chart.Chart, v map[string]interface{}) error
 	c.SetDependencies(chartDependencies...)
 
 	// set all to true
-	for _, lr := range c.Requirements.Dependencies {
+	for _, lr := range c.Metadata.Requirements {
 		lr.Enabled = true
 	}
 	b, _ := yaml.Marshal(v)
@@ -170,11 +170,11 @@ func ProcessRequirementsEnabled(c *chart.Chart, v map[string]interface{}) error
 		return err
 	}
 	// flag dependencies as enabled/disabled
-	ProcessRequirementsTags(c.Requirements, cvals)
-	ProcessRequirementsConditions(c.Requirements, cvals)
+	ProcessRequirementsTags(c.Metadata.Requirements, cvals)
+	ProcessRequirementsConditions(c.Metadata.Requirements, cvals)
 	// make a map of charts to remove
 	rm := map[string]struct{}{}
-	for _, r := range c.Requirements.Dependencies {
+	for _, r := range c.Metadata.Requirements {
 		if !r.Enabled {
 			// remove disabled chart
 			rm[r.Name] = struct{}{}
@@ -232,7 +232,7 @@ func pathToMap(path string, data map[string]interface{}) map[string]interface{}
 
 // processImportValues merges values from child to parent based on the chart's dependencies' ImportValues field.
 func processImportValues(c *chart.Chart) error {
-	if c.Requirements == nil {
+	if c.Metadata.Requirements == nil {
 		return nil
 	}
 	// combine chart values and empty config to get Values
@@ -242,7 +242,7 @@ func processImportValues(c *chart.Chart) error {
 	}
 	b := make(map[string]interface{})
 	// import values from each dependency if specified in import-values
-	for _, r := range c.Requirements.Dependencies {
+	for _, r := range c.Metadata.Requirements {
 		var outiv []interface{}
 		for _, riv := range r.ImportValues {
 			switch iv := riv.(type) {
diff --git a/pkg/chartutil/requirements_test.go b/pkg/chartutil/requirements_test.go
index 120275cc4..4d35c07cf 100644
--- a/pkg/chartutil/requirements_test.go
+++ b/pkg/chartutil/requirements_test.go
@@ -256,39 +256,39 @@ func TestGetAliasDependency(t *testing.T) {
 		t.Fatalf("Failed to load testdata: %s", err)
 	}
 
-	req := c.Requirements
+	req := c.Metadata.Requirements
 
-	if len(req.Dependencies) == 0 {
+	if len(req) == 0 {
 		t.Fatalf("There are no requirements to test")
 	}
 
 	// Success case
-	aliasChart := getAliasDependency(c.Dependencies(), req.Dependencies[0])
+	aliasChart := getAliasDependency(c.Dependencies(), req[0])
 	if aliasChart == nil {
-		t.Fatalf("Failed to get dependency chart for alias %s", req.Dependencies[0].Name)
+		t.Fatalf("Failed to get dependency chart for alias %s", req[0].Name)
 	}
-	if req.Dependencies[0].Alias != "" {
-		if aliasChart.Name() != req.Dependencies[0].Alias {
-			t.Fatalf("Dependency chart name should be %s but got %s", req.Dependencies[0].Alias, aliasChart.Name())
+	if req[0].Alias != "" {
+		if aliasChart.Name() != req[0].Alias {
+			t.Fatalf("Dependency chart name should be %s but got %s", req[0].Alias, aliasChart.Name())
 		}
-	} else if aliasChart.Name() != req.Dependencies[0].Name {
-		t.Fatalf("Dependency chart name should be %s but got %s", req.Dependencies[0].Name, aliasChart.Name())
+	} else if aliasChart.Name() != req[0].Name {
+		t.Fatalf("Dependency chart name should be %s but got %s", req[0].Name, aliasChart.Name())
 	}
 
-	if req.Dependencies[0].Version != "" {
-		if !version.IsCompatibleRange(req.Dependencies[0].Version, aliasChart.Metadata.Version) {
+	if req[0].Version != "" {
+		if !version.IsCompatibleRange(req[0].Version, aliasChart.Metadata.Version) {
 			t.Fatalf("Dependency chart version is not in the compatible range")
 		}
 	}
 
 	// Failure case
-	req.Dependencies[0].Name = "something-else"
-	if aliasChart := getAliasDependency(c.Dependencies(), req.Dependencies[0]); aliasChart != nil {
+	req[0].Name = "something-else"
+	if aliasChart := getAliasDependency(c.Dependencies(), req[0]); aliasChart != nil {
 		t.Fatalf("expected no chart but got %s", aliasChart.Name())
 	}
 
-	req.Dependencies[0].Version = "something else which is not in the compatible range"
-	if version.IsCompatibleRange(req.Dependencies[0].Version, aliasChart.Metadata.Version) {
+	req[0].Version = "something else which is not in the compatible range"
+	if version.IsCompatibleRange(req[0].Version, aliasChart.Metadata.Version) {
 		t.Fatalf("Dependency chart version which is not in the compatible range should cause a failure other than a success ")
 	}
 }
@@ -312,8 +312,8 @@ func TestDependentChartAliases(t *testing.T) {
 		t.Fatal("Expected alias dependencies to be added, but did not got that")
 	}
 
-	if len(c.Dependencies()) != len(c.Requirements.Dependencies) {
-		t.Fatalf("Expected number of chart dependencies %d, but got %d", len(c.Requirements.Dependencies), len(c.Dependencies()))
+	if len(c.Dependencies()) != len(c.Metadata.Requirements) {
+		t.Fatalf("Expected number of chart dependencies %d, but got %d", len(c.Metadata.Requirements), len(c.Dependencies()))
 	}
 }
 
@@ -375,8 +375,8 @@ func TestDependentChartsWithSubchartsAllSpecifiedInRequirements(t *testing.T) {
 		t.Fatal("Expected no changes in dependencies to be, but did something got changed")
 	}
 
-	if len(c.Dependencies()) != len(c.Requirements.Dependencies) {
-		t.Fatalf("Expected number of chart dependencies %d, but got %d", len(c.Requirements.Dependencies), len(c.Dependencies()))
+	if len(c.Dependencies()) != len(c.Metadata.Requirements) {
+		t.Fatalf("Expected number of chart dependencies %d, but got %d", len(c.Metadata.Requirements), len(c.Dependencies()))
 	}
 }
 
@@ -399,21 +399,21 @@ func TestDependentChartsWithSomeSubchartsSpecifiedInRequirements(t *testing.T) {
 		t.Fatal("Expected no changes in dependencies to be, but did something got changed")
 	}
 
-	if len(c.Dependencies()) <= len(c.Requirements.Dependencies) {
-		t.Fatalf("Expected more dependencies than specified in requirements.yaml(%d), but got %d", len(c.Requirements.Dependencies), len(c.Dependencies()))
+	if len(c.Dependencies()) <= len(c.Metadata.Requirements) {
+		t.Fatalf("Expected more dependencies than specified in requirements.yaml(%d), but got %d", len(c.Metadata.Requirements), len(c.Dependencies()))
 	}
 }
 
 func verifyRequirements(t *testing.T, c *chart.Chart) {
-	if len(c.Requirements.Dependencies) != 2 {
-		t.Errorf("Expected 2 requirements, got %d", len(c.Requirements.Dependencies))
+	if len(c.Metadata.Requirements) != 2 {
+		t.Errorf("Expected 2 requirements, got %d", len(c.Metadata.Requirements))
 	}
 	tests := []*chart.Dependency{
 		{Name: "alpine", Version: "0.1.0", Repository: "https://example.com/charts"},
 		{Name: "mariner", Version: "4.3.2", Repository: "https://example.com/charts"},
 	}
 	for i, tt := range tests {
-		d := c.Requirements.Dependencies[i]
+		d := c.Metadata.Requirements[i]
 		if d.Name != tt.Name {
 			t.Errorf("Expected dependency named %q, got %q", tt.Name, d.Name)
 		}
@@ -427,15 +427,15 @@ func verifyRequirements(t *testing.T, c *chart.Chart) {
 }
 
 func verifyRequirementsLock(t *testing.T, c *chart.Chart) {
-	if len(c.Requirements.Dependencies) != 2 {
-		t.Errorf("Expected 2 requirements, got %d", len(c.Requirements.Dependencies))
+	if len(c.Metadata.Requirements) != 2 {
+		t.Errorf("Expected 2 requirements, got %d", len(c.Metadata.Requirements))
 	}
 	tests := []*chart.Dependency{
 		{Name: "alpine", Version: "0.1.0", Repository: "https://example.com/charts"},
 		{Name: "mariner", Version: "4.3.2", Repository: "https://example.com/charts"},
 	}
 	for i, tt := range tests {
-		d := c.Requirements.Dependencies[i]
+		d := c.Metadata.Requirements[i]
 		if d.Name != tt.Name {
 			t.Errorf("Expected dependency named %q, got %q", tt.Name, d.Name)
 		}
diff --git a/pkg/chartutil/testdata/dependent-chart-alias/Chart.yaml b/pkg/chartutil/testdata/dependent-chart-alias/Chart.yaml
index 7c071c27b..751a3aa67 100644
--- a/pkg/chartutil/testdata/dependent-chart-alias/Chart.yaml
+++ b/pkg/chartutil/testdata/dependent-chart-alias/Chart.yaml
@@ -15,3 +15,15 @@ sources:
   - https://example.com/foo/bar
 home: http://example.com
 icon: https://example.com/64x64.png
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
+    alias: mariners2
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
+    alias: mariners1
diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/Chart.yaml b/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/Chart.yaml
index 7c071c27b..fe7a99681 100644
--- a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/Chart.yaml
+++ b/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/Chart.yaml
@@ -15,3 +15,10 @@ sources:
   - https://example.com/foo/bar
 home: http://example.com
 icon: https://example.com/64x64.png
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/Chart.yaml b/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/Chart.yaml
index 7c071c27b..7fc39e28d 100644
--- a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/Chart.yaml
+++ b/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/Chart.yaml
@@ -15,3 +15,7 @@ sources:
   - https://example.com/foo/bar
 home: http://example.com
 icon: https://example.com/64x64.png
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
diff --git a/pkg/chartutil/testdata/frobnitz-1.2.3.tgz b/pkg/chartutil/testdata/frobnitz-1.2.3.tgz
index fb21cd08fb08fd2f4e45e940634ce1cdb0421457..a8ba8ec6f4838980e28e67d8f619cc097ccd03f5 100644
GIT binary patch
literal 3559
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

literal 2070
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
ATmS$7

diff --git a/pkg/chartutil/testdata/frobnitz/Chart.yaml b/pkg/chartutil/testdata/frobnitz/Chart.yaml
index 134cd1109..fcd4a4a37 100644
--- a/pkg/chartutil/testdata/frobnitz/Chart.yaml
+++ b/pkg/chartutil/testdata/frobnitz/Chart.yaml
@@ -18,3 +18,10 @@ icon: https://example.com/64x64.png
 annotations:
   extrakey: extravalue
   anotherkey: anothervalue
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
diff --git a/pkg/chartutil/testdata/frobnitz/charts/mariner-4.3.2.tgz b/pkg/chartutil/testdata/frobnitz/charts/mariner-4.3.2.tgz
index 3af333e76a3c268ce6d23f5ae8ba59387a75a38a..ea6e2a160b2cbbdf87ea7de414c687110c33fbd3 100644
GIT binary patch
literal 954
zcmV;r14aBFiwFP^#)Vq|1MQc4Xj@er$Ag7+yCC+T{WI!%Oc<4w+}vk6LoLKA3)J{W
zsAFppcaxkncfF7F+>>ew!+*58)^5`dw!xs=A8u@*TcujqMzS$h8KT9y7x*YjAylxG
zijPi5J-JC^+c9gg$<Un-fpe34?)jaZ@9%YW1*rx^9!Ck`IIdonfjxS?_Q(lRek=fZ
zQIvR5;_4*<aJ<M1k^{)4+|&X|3oD3hML`f+@c#42v{>wK)+zjt;`kpyFX-PCR}f}X
zimt7_4RRh{NxHxOLOuVN{^SP7%bd(R0JrvAxtE7re?!rs4-~wBi9#!a)C5*d!w38z
z05u&%a-IQVCIZdLFhmB#&|<nEvg}C`E3yI;H*>2von(OoG@{UmsL=8;0JuTkfTD#J
zj7-ZSzX5<?!n9OuqLdHBF-}-Mj|aZ0=m`z75mWapIHhem|47lGlVf?7b21P5;Ql8p
zJ?hewfq$C+Ie`~sFHhoMk~o_G%ff>G7?S8yNNAV91y--W%=2EVe>qstze~}Q&?-#>
zuu}aOd70=hcqPFr%aUFHMS-LBzZ|&0voNM4H4O3|U>Ev^rhq@x@`6A3TqDc4KucV;
z0Qo3jmp}Nto6OJ^jA0bSR8p{u6}(-=@nqO8;MmkPx272F_7#&e64A&B+ucCk*FZv1
zkp-{`!nte9BI~IJ`I<752o%#%&VIgyaN3VK8D`P$axDg#gna;`B&0pT>bW=nlOY1*
zrWS>W#fi1Z1}nusNdQapzrgXlNaMd8EROEQ%F|eSI9S&I7vIy|_G=c4+q?h0jg{hG
zA~y@~|00QfQvXT2DAD*Y2Q_``9aW=mv^gq%yxzR$3Rksm_t|9c6P1B2ZJ|pS-VL5O
zb#UNXMYJw}j*pxjSXcSXm!ZI&<MSg&`wwp4bhj(r`BcxL&Ak`i34Q+diO5I4?1ZN$
ze%NsO%<%c)(ReWQV)u@X(dk>`y9Ph(YpP>~+H~63`El#sb7NE0k-M(1x6RLuUTxUh
z`F`f-`kvp<wZ1%<*?QyZAN@O^fA(ho#q8i%#&X}1(vJ*H4!`x)OW*c<aB_Qhcw+qf
z86m#W`Sh=kezISz9m*cr-#6J3eDC(_R~iTQ{Weu``S7uyGOwhw_(092_PN8cuA{GY
zY?+;Ze01)y?>-yK?yKsk*_7?@Pu{t>Vd!LPrh4R4+4aq`gUNhR_vW<cn&Zg_A`68=
cp-?Ck3WY+UP$(1%g|a663FnFh%>XC>0KLieH~;_u

literal 1034
zcmV+l1oitLiwFRoe*ISf1MQf5Y!pQt$1j*vT_1mmq6v0Vv`Rzw_Pu%yR;*Eys*pfJ
z2%2>6ZtiaDKCZKKh4VpUVhPw(Vq+5%p#1{`AAuCqVmyct4N85WAVyGp#n=>Wj1n4S
z;p*((BjusRcz0-+&)sGA_I7u6_dCDuclIoZ4IANLpo|EDpsOnITP@cLl9Frl08!F)
zQI-`+mw+HDk|+d#TF#Ryka7vc^i(WJNH|3z353tP9o;Mz`<vtBucO%hPq6a(Hzgn@
zd>UG2>HDDfLsOK$)?XBLPk%{~bzM;vs=p>GasUXWKb3R2#PzqKg+d@d3b-h8BiKk1
z!?8nP9+;0z3q-t;0b&jY&8aZLHX_L7+7WjBjTBzyB`)E3N2#gdF81Xx{vn0>_f>Yw
z69X6O|EeIVvL?{_R~21m{$B|S`eW3VGBC1`P25t)z?A;4N@wN2u8Au1|4I-=Nn}Tn
z9Wjs_;sB@zxkP|w7!vHbE?oxzMoGsth=bE1kRT-KhJrz~0$NEE@e#)gp6Md~F2#hX
z5qOaoSTy`MDJVw}6%*2EFGB=ep#M*v|4Cl`Gyg9?1^wHhnL;IZ{v1>Jzocru{;DFY
zvZ8zXD}u!QzY@#>_o5g~nFQoUfIrdC4+@@}1r{d^7tl8ZOXofKKt27{yHO|#Vg~j8
zVi?2?l1PR9EFg|$)|=3d`%9eHLBxa@`N5JKXCMg;>;mF|u(#~G^mv9%zowlO21P6K
z`p>0NjlUbqkkWIm|I;Rd5{?<A1Art;;RaLHzaWce`oAR77pwnDFuB4fE6+;p(%`J;
z|Kha2-k-JeB>vdH?_;X^S7q6M{?qA4k~LcYf~K+m|0+Ut*A;=jm8X{kE*t&)SnE4r
zM%A}7hwC=o@X3?4*}Ff!Z$VXtJ9Kn&ORKnfAk%L&Pun>D;)phO*KK{PKizeFOIz=n
zy*o!wAB(P@-@O0Xt)Vxb?^^Wuz7^Z9s$0DG<(79l=RDI;yJg+Mmmb}CrBT<tX8ZB)
zcMN_Pe)}_P_saPC6QNaOYlWt4*U_i%=+L?|WBS2~h4<{*(0Cx--@$WRJFlDFaVr_>
z-!}KT=4?9KaOjJkYcgQjk@g!0$KO1e>6trl|4%m!{=B?u+4!Emw}w`2=pOv&TJ81s
z9#V$gq1JEK%Ii?$Zt#20ucxXP^=-QPiQlpZ?i{{l`pMzO-oRHAJB1&st=E><&K!N!
zdCK`A=yslR;D-|}568cpeRH7ta7WJ{hsPI;tY0|c!1o)c|1u-g@WGDm6TNL{-wPw*
z(Wd>^e|==&5o^vX4U=!@9%pP?@baZ~f!i;ZpbQ3s!C){L3<iV2V4R0P0hhy5PXH(Y
E0Om^*5C8xG

diff --git a/pkg/chartutil/testdata/frobnitz_backslash-1.2.3.tgz b/pkg/chartutil/testdata/frobnitz_backslash-1.2.3.tgz
index 692dd6aba5da8382262cd94fae736785709b339f..bc6be27aa6d1afe8959df123f150919b74e514e8 100644
GIT binary patch
literal 3617
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

literal 2079
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
J;bQ=3007~8JqQ2*

diff --git a/pkg/chartutil/testdata/frobnitz_backslash/Chart.yaml b/pkg/chartutil/testdata/frobnitz_backslash/Chart.yaml
index 49df2a046..b1dd40a5d 100755
--- a/pkg/chartutil/testdata/frobnitz_backslash/Chart.yaml
+++ b/pkg/chartutil/testdata/frobnitz_backslash/Chart.yaml
@@ -18,3 +18,10 @@ icon: https://example.com/64x64.png
 annotations:
   extrakey: extravalue
   anotherkey: anothervalue
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
diff --git a/pkg/chartutil/testdata/mariner/Chart.yaml b/pkg/chartutil/testdata/mariner/Chart.yaml
index 4d52794c6..e2efb7f99 100644
--- a/pkg/chartutil/testdata/mariner/Chart.yaml
+++ b/pkg/chartutil/testdata/mariner/Chart.yaml
@@ -2,3 +2,7 @@ name: mariner
 description: A Helm chart for Kubernetes
 version: 4.3.2
 home: ""
+dependencies:
+  - name: albatross
+    repository: https://example.com/mariner/charts
+    version: "0.1.0"
diff --git a/pkg/chartutil/testdata/mariner/charts/albatross-0.1.0.tgz b/pkg/chartutil/testdata/mariner/charts/albatross-0.1.0.tgz
index 0b66d27fe1bb83cde374420591ce39b5ee58543f..72bb6b36f07c6377977fa59c19f5159fdc3c6d0d 100644
GIT binary patch
literal 292
zcmV+<0o(o`iwFP^#)Vq|1MSpHYQr!P24JssiXjI`C0kO!yOK?zr;wA$17s^ma-g@b
zlLiMu(^5$Kp#Qg-jgUtg{dT@_Ifj%Tio20g&WxdBwf0zLso&}esj9TPw8m&nQdN3Z
z6=d$$(pjIfi$g0eGAF*iZdkTjeX!5z9Ao_>+&KUF#>G5+ajn1gH-`JLT3?^PD%HjO
zjaFqr^45*K=bz8Nb1m02z5=o2w20eX-iEHGM|xu4(&F$kXcZzo_YKF6Gbgd<n2w9&
zR86JWgu_0QiTLRQ!Izx#zjwapbdMjvXZe?AcA0-`CG!6r#`zE7&9Uc+5NjVA=W9Xa
q`n(CTrg`ujx63sn-2eap000000000000000ztJm)?k~vzC;$Lr&5_Lj

literal 347
zcmV-h0i^yPiwFRoe*ISf1MSw`YQrEH2H+j%Dx??CeJ1`u&PGoLy9(3VreJC@rm(x8
zX-fj5`=#kN_C6<`h|#?2r*V~u!ME-G-DHSJOUaI{I<=IGQ+vjEt_vzu!Kq-xg)E9Y
zCa0UysB5DMX)2A0vFhTow&7yG)NQ?fXPomohW3vzL;j1}ggAdTjl1?Y(*ICGyq!PK
zd7pnS3ay0{DSst&%Ac-1kxTx0{yWpyk`22cTiJFQw)?pCyOKSyN9!84>~{uR`@o*M
z%7&edw#^PUw8u^~=X1(x-;Xn!Wk0<j_>%GbA5)&B41Dtb&pGEL74_#ol>prTw=m`(
zZL@bK9qp@cfp6q5bA|kGVa)$vTxZ)U9snQJf0Fvu`%medQ2%dX$UhbD7&<%4vW@eV
tab?Ds>0<3e$rj$(uw88|syhGx0000000000006*m_5v>lSt<Z1007~~uh0Mh

diff --git a/pkg/chartutil/testdata/subpop/Chart.yaml b/pkg/chartutil/testdata/subpop/Chart.yaml
index bbb0941c3..9af6c6b68 100644
--- a/pkg/chartutil/testdata/subpop/Chart.yaml
+++ b/pkg/chartutil/testdata/subpop/Chart.yaml
@@ -2,3 +2,34 @@ apiVersion: v1
 description: A Helm chart for Kubernetes
 name: parentchart
 version: 0.1.0
+dependencies:
+      - name: subchart1
+        repository: http://localhost:10191
+        version: 0.1.0
+        condition: subchart1.enabled
+        tags:
+          - front-end
+          - subchart1
+        import-values:
+          - child: SC1data
+            parent: imported-chart1
+          - child: SC1data
+            parent: overridden-chart1
+          - child: imported-chartA
+            parent: imported-chartA
+          - child: imported-chartA-B
+            parent: imported-chartA-B
+          - child: overridden-chartA-B
+            parent: overridden-chartA-B
+          - child: SCBexported1A
+            parent: .
+          - SCBexported2
+          - SC1exported1
+
+      - name: subchart2
+        repository: http://localhost:10191
+        version: 0.1.0
+        condition: subchart2.enabled
+        tags:
+          - back-end
+          - subchart2
diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/Chart.yaml b/pkg/chartutil/testdata/subpop/charts/subchart1/Chart.yaml
index f58d82818..f028284b0 100644
--- a/pkg/chartutil/testdata/subpop/charts/subchart1/Chart.yaml
+++ b/pkg/chartutil/testdata/subpop/charts/subchart1/Chart.yaml
@@ -2,3 +2,35 @@ apiVersion: v1
 description: A Helm chart for Kubernetes
 name: subchart1
 version: 0.1.0
+dependencies:
+      - name: subcharta
+        repository: http://localhost:10191
+        version: 0.1.0
+        condition: subcharta.enabled,subchart1.subcharta.enabled
+        tags:
+          - front-end
+          - subcharta
+        import-values:
+          - child: SCAdata
+            parent: imported-chartA
+          - child: SCAdata
+            parent: overridden-chartA
+          - child: SCAdata
+            parent: imported-chartA-B
+
+      - name: subchartb
+        repository: http://localhost:10191
+        version: 0.1.0
+        condition: subchartb.enabled
+        import-values:
+          - child: SCBdata
+            parent: imported-chartB
+          - child: SCBdata
+            parent: imported-chartA-B
+          - child: exports.SCBexported2
+            parent: exports.SCBexported2
+          - SCBexported1
+
+        tags:
+          - front-end
+          - subchartb
diff --git a/pkg/chartutil/testdata/subpop/charts/subchart2/Chart.yaml b/pkg/chartutil/testdata/subpop/charts/subchart2/Chart.yaml
index 2c76b0786..edd40b52f 100644
--- a/pkg/chartutil/testdata/subpop/charts/subchart2/Chart.yaml
+++ b/pkg/chartutil/testdata/subpop/charts/subchart2/Chart.yaml
@@ -2,3 +2,18 @@ apiVersion: v1
 description: A Helm chart for Kubernetes
 name: subchart2
 version: 0.1.0
+dependencies:
+      - name: subchartb
+        repository: http://localhost:10191
+        version: 0.1.0
+        condition: subchartb.enabled,subchart2.subchartb.enabled
+        tags:
+          - back-end
+          - subchartb
+      - name: subchartc
+        repository: http://localhost:10191
+        version: 0.1.0
+        condition: subchartc.enabled
+        tags:
+          - back-end
+          - subchartc
diff --git a/pkg/chartutil/values.go b/pkg/chartutil/values.go
index ccef6a0bd..d52a7a4d3 100644
--- a/pkg/chartutil/values.go
+++ b/pkg/chartutil/values.go
@@ -151,10 +151,7 @@ func CoalesceValues(chrt *chart.Chart, vals []byte) (Values, error) {
 		}
 	}
 
-	cvals, err = coalesce(chrt, cvals)
-	if err != nil {
-		return cvals, err
-	}
+	coalesce(chrt, cvals)
 
 	return coalesceDeps(chrt, cvals)
 }
@@ -162,14 +159,10 @@ func CoalesceValues(chrt *chart.Chart, vals []byte) (Values, error) {
 // coalesce coalesces the dest values and the chart values, giving priority to the dest values.
 //
 // This is a helper function for CoalesceValues.
-func coalesce(ch *chart.Chart, dest map[string]interface{}) (map[string]interface{}, error) {
-	var err error
-	dest, err = coalesceValues(ch, dest)
-	if err != nil {
-		return dest, err
-	}
+func coalesce(ch *chart.Chart, dest map[string]interface{}) map[string]interface{} {
+	coalesceValues(ch, dest)
 	coalesceDeps(ch, dest)
-	return dest, nil
+	return dest
 }
 
 // coalesceDeps coalesces the dependencies of the given chart.
@@ -187,12 +180,8 @@ func coalesceDeps(chrt *chart.Chart, dest map[string]interface{}) (map[string]in
 			// Get globals out of dest and merge them into dvmap.
 			coalesceGlobals(dvmap, dest)
 
-			var err error
 			// Now coalesce the rest of the values.
-			dest[subchart.Name()], err = coalesce(subchart, dvmap)
-			if err != nil {
-				return dest, err
-			}
+			dest[subchart.Name()] = coalesce(subchart, dvmap)
 		}
 	}
 	return dest, nil
@@ -261,7 +250,7 @@ func copyMap(src map[string]interface{}) map[string]interface{} {
 // coalesceValues builds up a values map for a particular chart.
 //
 // Values in v will override the values in the chart.
-func coalesceValues(c *chart.Chart, v map[string]interface{}) (map[string]interface{}, error) {
+func coalesceValues(c *chart.Chart, v map[string]interface{}) {
 	for key, val := range c.Values {
 		if value, ok := v[key]; ok {
 			if value == nil {
@@ -285,7 +274,6 @@ func coalesceValues(c *chart.Chart, v map[string]interface{}) (map[string]interf
 			v[key] = val
 		}
 	}
-	return v, nil
 }
 
 // coalesceTables merges a source map into a destination map.
diff --git a/pkg/downloader/manager.go b/pkg/downloader/manager.go
index 8348bedf2..d4461d4bf 100644
--- a/pkg/downloader/manager.go
+++ b/pkg/downloader/manager.go
@@ -78,10 +78,9 @@ func (m *Manager) Build() error {
 		return m.Update()
 	}
 
-	// A lock must accompany a requirements.yaml file.
-	req := c.Requirements
+	req := c.Metadata.Requirements
 	if sum, err := resolver.HashReq(req); err != nil || sum != lock.Digest {
-		return errors.New("requirements.lock is out of sync with requirements.yaml")
+		return errors.New("requirements.lock is out of sync with Chart.yaml")
 	}
 
 	// Check that all of the repos we're dependent on actually exist.
@@ -106,7 +105,7 @@ func (m *Manager) Build() error {
 
 // Update updates a local charts directory.
 //
-// It first reads the requirements.yaml file, and then attempts to
+// It first reads the Chart.yaml file, and then attempts to
 // negotiate versions based on that. It will download the versions
 // from remote chart repositories unless SkipUpdate is true.
 func (m *Manager) Update() error {
@@ -117,12 +116,13 @@ func (m *Manager) Update() error {
 
 	// If no requirements file is found, we consider this a successful
 	// completion.
-	req := c.Requirements
+	req := c.Metadata.Requirements
 	if req == nil {
 		return nil
 	}
 
 	// Hash requirements.yaml
+	// FIXME should this hash all of Chart.yaml
 	hash, err := resolver.HashReq(req)
 	if err != nil {
 		return err
@@ -130,7 +130,7 @@ func (m *Manager) Update() error {
 
 	// Check that all of the repos we're dependent on actually exist and
 	// the repo index names.
-	repoNames, err := m.getRepoNames(req.Dependencies)
+	repoNames, err := m.getRepoNames(req)
 	if err != nil {
 		return err
 	}
@@ -143,7 +143,7 @@ func (m *Manager) Update() error {
 	}
 
 	// Now we need to find out which version of a chart best satisfies the
-	// requirements the requirements.yaml
+	// requirements in the Chart.yaml
 	lock, err := m.resolve(req, repoNames, hash)
 	if err != nil {
 		return err
@@ -176,7 +176,7 @@ func (m *Manager) loadChartDir() (*chart.Chart, error) {
 // resolve takes a list of requirements and translates them into an exact version to download.
 //
 // This returns a lock file, which has all of the requirements normalized to a specific version.
-func (m *Manager) resolve(req *chart.Requirements, repoNames map[string]string, hash string) (*chart.RequirementsLock, error) {
+func (m *Manager) resolve(req []*chart.Dependency, repoNames map[string]string, hash string) (*chart.RequirementsLock, error) {
 	res := resolver.New(m.ChartPath, m.HelmHome)
 	return res.Resolve(req, repoNames, hash)
 }
diff --git a/pkg/resolver/resolver.go b/pkg/resolver/resolver.go
index 1426baa5e..7072547f1 100644
--- a/pkg/resolver/resolver.go
+++ b/pkg/resolver/resolver.go
@@ -47,12 +47,12 @@ func New(chartpath string, helmhome helmpath.Home) *Resolver {
 }
 
 // Resolve resolves dependencies and returns a lock file with the resolution.
-func (r *Resolver) Resolve(reqs *chart.Requirements, repoNames map[string]string, d string) (*chart.RequirementsLock, error) {
+func (r *Resolver) Resolve(reqs []*chart.Dependency, repoNames map[string]string, d string) (*chart.RequirementsLock, error) {
 
 	// Now we clone the dependencies, locking as we go.
-	locked := make([]*chart.Dependency, len(reqs.Dependencies))
+	locked := make([]*chart.Dependency, len(reqs))
 	missing := []string{}
-	for i, d := range reqs.Dependencies {
+	for i, d := range reqs {
 		if strings.HasPrefix(d.Repository, "file://") {
 
 			if _, err := GetLocalPath(d.Repository, r.chartpath); err != nil {
@@ -105,7 +105,7 @@ func (r *Resolver) Resolve(reqs *chart.Requirements, repoNames map[string]string
 		}
 	}
 	if len(missing) > 0 {
-		return nil, errors.Errorf("can't get a valid version for repositories %s. Try changing the version constraint in requirements.yaml", strings.Join(missing, ", "))
+		return nil, errors.Errorf("can't get a valid version for repositories %s. Try changing the version constraint in Chart.yaml", strings.Join(missing, ", "))
 	}
 	return &chart.RequirementsLock{
 		Generated:    time.Now(),
@@ -118,7 +118,7 @@ func (r *Resolver) Resolve(reqs *chart.Requirements, repoNames map[string]string
 //
 // This should be used only to compare against another hash generated by this
 // function.
-func HashReq(req *chart.Requirements) (string, error) {
+func HashReq(req []*chart.Dependency) (string, error) {
 	data, err := json.Marshal(req)
 	if err != nil {
 		return "", err
diff --git a/pkg/resolver/resolver_test.go b/pkg/resolver/resolver_test.go
index 205cce69f..84cf54ccf 100644
--- a/pkg/resolver/resolver_test.go
+++ b/pkg/resolver/resolver_test.go
@@ -24,52 +24,42 @@ import (
 func TestResolve(t *testing.T) {
 	tests := []struct {
 		name   string
-		req    *chart.Requirements
+		req    []*chart.Dependency
 		expect *chart.RequirementsLock
 		err    bool
 	}{
 		{
 			name: "version failure",
-			req: &chart.Requirements{
-				Dependencies: []*chart.Dependency{
-					{Name: "oedipus-rex", Repository: "http://example.com", Version: ">a1"},
-				},
+			req: []*chart.Dependency{
+				{Name: "oedipus-rex", Repository: "http://example.com", Version: ">a1"},
 			},
 			err: true,
 		},
 		{
 			name: "cache index failure",
-			req: &chart.Requirements{
-				Dependencies: []*chart.Dependency{
-					{Name: "oedipus-rex", Repository: "http://example.com", Version: "1.0.0"},
-				},
+			req: []*chart.Dependency{
+				{Name: "oedipus-rex", Repository: "http://example.com", Version: "1.0.0"},
 			},
 			err: true,
 		},
 		{
 			name: "chart not found failure",
-			req: &chart.Requirements{
-				Dependencies: []*chart.Dependency{
-					{Name: "redis", Repository: "http://example.com", Version: "1.0.0"},
-				},
+			req: []*chart.Dependency{
+				{Name: "redis", Repository: "http://example.com", Version: "1.0.0"},
 			},
 			err: true,
 		},
 		{
 			name: "constraint not satisfied failure",
-			req: &chart.Requirements{
-				Dependencies: []*chart.Dependency{
-					{Name: "alpine", Repository: "http://example.com", Version: ">=1.0.0"},
-				},
+			req: []*chart.Dependency{
+				{Name: "alpine", Repository: "http://example.com", Version: ">=1.0.0"},
 			},
 			err: true,
 		},
 		{
 			name: "valid lock",
-			req: &chart.Requirements{
-				Dependencies: []*chart.Dependency{
-					{Name: "alpine", Repository: "http://example.com", Version: ">=0.1.0"},
-				},
+			req: []*chart.Dependency{
+				{Name: "alpine", Repository: "http://example.com", Version: ">=0.1.0"},
 			},
 			expect: &chart.RequirementsLock{
 				Dependencies: []*chart.Dependency{
@@ -79,10 +69,8 @@ func TestResolve(t *testing.T) {
 		},
 		{
 			name: "repo from valid local path",
-			req: &chart.Requirements{
-				Dependencies: []*chart.Dependency{
-					{Name: "signtest", Repository: "file://../../../../cmd/helm/testdata/testcharts/signtest", Version: "0.1.0"},
-				},
+			req: []*chart.Dependency{
+				{Name: "signtest", Repository: "file://../../../../cmd/helm/testdata/testcharts/signtest", Version: "0.1.0"},
 			},
 			expect: &chart.RequirementsLock{
 				Dependencies: []*chart.Dependency{
@@ -92,10 +80,8 @@ func TestResolve(t *testing.T) {
 		},
 		{
 			name: "repo from invalid local path",
-			req: &chart.Requirements{
-				Dependencies: []*chart.Dependency{
-					{Name: "notexist", Repository: "file://../testdata/notexist", Version: "0.1.0"},
-				},
+			req: []*chart.Dependency{
+				{Name: "notexist", Repository: "file://../testdata/notexist", Version: "0.1.0"},
 			},
 			err: true,
 		},
@@ -128,7 +114,7 @@ func TestResolve(t *testing.T) {
 		}
 
 		// Check fields.
-		if len(l.Dependencies) != len(tt.req.Dependencies) {
+		if len(l.Dependencies) != len(tt.req) {
 			t.Errorf("%s: wrong number of dependencies in lock", tt.name)
 		}
 		d0 := l.Dependencies[0]
@@ -146,11 +132,9 @@ func TestResolve(t *testing.T) {
 }
 
 func TestHashReq(t *testing.T) {
-	expect := "sha256:e70e41f8922e19558a8bf62f591a8b70c8e4622e3c03e5415f09aba881f13885"
-	req := &chart.Requirements{
-		Dependencies: []*chart.Dependency{
-			{Name: "alpine", Version: "0.1.0", Repository: "http://localhost:8879/charts"},
-		},
+	expect := "sha256:d661820b01ed7bcf26eed8f01cf16380e0a76326ba33058d3150f919d9b15bc0"
+	req := []*chart.Dependency{
+		{Name: "alpine", Version: "0.1.0", Repository: "http://localhost:8879/charts"},
 	}
 	h, err := HashReq(req)
 	if err != nil {
@@ -160,7 +144,7 @@ func TestHashReq(t *testing.T) {
 		t.Errorf("Expected %q, got %q", expect, h)
 	}
 
-	req = &chart.Requirements{Dependencies: []*chart.Dependency{}}
+	req = []*chart.Dependency{}
 	h, err = HashReq(req)
 	if err != nil {
 		t.Fatal(err)
diff --git a/pkg/urlutil/urlutil_test.go b/pkg/urlutil/urlutil_test.go
index 9db7b9a7b..8e99c1bfb 100644
--- a/pkg/urlutil/urlutil_test.go
+++ b/pkg/urlutil/urlutil_test.go
@@ -65,8 +65,9 @@ func TestEqual(t *testing.T) {
 
 func TestExtractHostname(t *testing.T) {
 	tests := map[string]string{
-		"http://example.com":                                      "example.com",
-		"https://example.com/foo":                                 "example.com",
+		"http://example.com":      "example.com",
+		"https://example.com/foo": "example.com",
+
 		"https://example.com:31337/not/with/a/bang/but/a/whimper": "example.com",
 	}
 	for start, expect := range tests {