From 1b867a47db2389c6baaacacdf43176e4b29ce2bf Mon Sep 17 00:00:00 2001
From: Amir Saeid <amir@glgdgt.com>
Date: Thu, 26 Apr 2018 10:39:13 +0100
Subject: [PATCH 1/2] Delete symlink

---
 rudder | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 rudder

diff --git a/rudder b/rudder
deleted file mode 120000
index 4bb2af3..0000000
--- a/rudder
+++ /dev/null
@@ -1 +0,0 @@
-/Users/peterbroadhurst/dev/photic/rudder
\ No newline at end of file

From 10402d409805fe774d657f48a002a36370eb1d67 Mon Sep 17 00:00:00 2001
From: Amir Saeid <amir@glgdgt.com>
Date: Sun, 29 Apr 2018 22:03:18 +0100
Subject: [PATCH 2/2] Use chartutil to process requirements

---
 internal/controller/release.go | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/internal/controller/release.go b/internal/controller/release.go
index c668153..7cac368 100644
--- a/internal/controller/release.go
+++ b/internal/controller/release.go
@@ -58,14 +58,20 @@ func (rc *ReleaseController) InstallRelease(name, namespace, repo, chart, versio
 	}
 	raw, _ := yaml.Marshal(values)
 
-	inValues := make(map[string]*hapi_chart.Value)
-	for k, v := range values {
-		inValues[k] = &hapi_chart.Value{Value: fmt.Sprintf("%v", v)}
+	config := &hapi_chart.Config{
+		Raw: string(raw),
 	}
 
-	config := &hapi_chart.Config{
-		Raw:    string(raw),
-		Values: inValues,
+	err = chartutil.ProcessRequirementsEnabled(inChart, config)
+	if err != nil {
+		log.WithError(err).Error("unable to remove disabled charts from dependencies")
+		return nil, err
+	}
+
+	err = chartutil.ProcessRequirementsImportValues(inChart)
+	if err != nil {
+		log.WithError(err).Error("unable to import chart values from child to parent")
+		return nil, err
 	}
 
 	req := &tiller.InstallReleaseRequest{