@ -36,7 +36,6 @@ func processDependencyConditions(reqs []*chart.Dependency, cvals Values) {
return
return
}
}
for _ , r := range reqs {
for _ , r := range reqs {
var hasTrue , hasFalse bool
for _ , c := range strings . Split ( strings . TrimSpace ( r . Condition ) , "," ) {
for _ , c := range strings . Split ( strings . TrimSpace ( r . Condition ) , "," ) {
if len ( c ) > 0 {
if len ( c ) > 0 {
// retrieve value
// retrieve value
@ -44,11 +43,8 @@ func processDependencyConditions(reqs []*chart.Dependency, cvals Values) {
if err == nil {
if err == nil {
// if not bool, warn
// if not bool, warn
if bv , ok := vv . ( bool ) ; ok {
if bv , ok := vv . ( bool ) ; ok {
if bv {
r . Enabled = bv
hasTrue = true
break
} else {
hasFalse = true
}
} else {
} else {
log . Printf ( "Warning: Condition path '%s' for chart %s returned non-bool value" , c , r . Name )
log . Printf ( "Warning: Condition path '%s' for chart %s returned non-bool value" , c , r . Name )
}
}
@ -56,18 +52,8 @@ func processDependencyConditions(reqs []*chart.Dependency, cvals Values) {
// 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 )
}
}
if vv != nil {
// got first value, break loop
break
}
}
}
}
}
if ! hasTrue && hasFalse {
r . Enabled = false
} else if hasTrue {
r . Enabled = true
}
}
}
}
}