Fix dependency condition on non-existent values

Signed-off-by: Chao <oleooo@126.com>
pull/10297/head
Chao 4 years ago
parent dc912094b3
commit 16da0578af

@ -51,6 +51,8 @@ func processDependencyConditions(reqs []*chart.Dependency, cvals Values, cpath s
} else if _, ok := err.(ErrNoValue); !ok { } else if _, ok := err.(ErrNoValue); !ok {
// this is a real error // this is a real error
log.Printf("Warning: PathValue returned error %v", err) log.Printf("Warning: PathValue returned error %v", err)
} else {
r.Enabled = false
} }
} }
} }

@ -111,6 +111,10 @@ func TestDependencyEnabled(t *testing.T) {
"subcharts with alias also respect conditions", "subcharts with alias also respect conditions",
M{"subchart1": M{"enabled": false}, "subchart2alias": M{"enabled": true, "subchartb": M{"enabled": true}}}, M{"subchart1": M{"enabled": false}, "subchart2alias": M{"enabled": true, "subchartb": M{"enabled": true}}},
[]string{"parentchart", "parentchart.subchart2alias", "parentchart.subchart2alias.subchartb"}, []string{"parentchart", "parentchart.subchart2alias", "parentchart.subchart2alias.subchartb"},
}, {
"subcharts with alias also respect conditions on a non-existent value",
M{"subchart1": M{"enabled": false}, "subchart2alias2": M{}},
[]string{"parentchart"},
}} }}
for _, tc := range tests { for _, tc := range tests {

@ -39,3 +39,9 @@ dependencies:
repository: http://localhost:10191 repository: http://localhost:10191
version: 0.1.0 version: 0.1.0
condition: subchart2alias.enabled condition: subchart2alias.enabled
- name: subchart2
alias: subchart2alias2
repository: http://localhost:10191
version: 0.1.0
condition: subchart2alias2.nonexistent.enabled

Loading…
Cancel
Save