fix: add child/parent support to import-values (#112)

Signed-off-by: GitHub <[email protected]>

Author: scodeman

requirements.go

@@ -13,12 +13,14 @@ type Requirements struct {
 }
 
 type Dependency struct {
-	Name         string   `yaml:"name,omitempty"`
-	Repository   string   `yaml:"repository,omitempty"`
-	Condition    string   `yaml:"condition,omitempty"`
-	Alias        string   `yaml:"alias,omitempty"`
-	Version      string   `yaml:"version,omitempty"`
-	ImportValues []string `yaml:"import-values,omitempty"`
+	Name       string `yaml:"name,omitempty"`
+	Repository string `yaml:"repository,omitempty"`
+	Condition  string `yaml:"condition,omitempty"`
+	Alias      string `yaml:"alias,omitempty"`
+	Version    string `yaml:"version,omitempty"`
+	// ImportValues holds the mapping of source values to parent key to be imported. Each item can be a
+	// string or pair of child/parent sublist items.
+	ImportValues []interface{} `yaml:"import-values,omitempty"`
 }
 
 type ChartDependency struct {

testdata/charts/importvalues/Chart.yaml

@@ -9,3 +9,5 @@ dependencies:
   version: 1.0.0
   import-values:
     - data
+    - child: data
+      parent: data

testdata/charts/importvalues/charts/mydep-1.0.0.tgz

@@ -1,3 +1,6 @@
 exports:
   data:
     myval: FOO
+
+data:
+  myval: BAR

testdata/charts/importvalues/mydep/values.yaml

@@ -5,3 +5,4 @@ metadata:
   namespace: {{ .Release.Namespace }}
 data:
   foo: {{ .Values.myval }}
+  bar: {{ .Values.data.myval }}

testdata/charts/importvalues/templates/configmap.yaml

@@ -7,3 +7,4 @@ metadata:
   namespace: default
 data:
   foo: FOO
+  bar: BAR