|
|
@ -176,14 +176,12 @@ func coalesceValues(c *chart.Chart, v map[string]interface{}) {
|
|
|
|
// dest is considered authoritative.
|
|
|
|
// dest is considered authoritative.
|
|
|
|
func CoalesceTables(dst, src map[string]interface{}) map[string]interface{} {
|
|
|
|
func CoalesceTables(dst, src map[string]interface{}) map[string]interface{} {
|
|
|
|
// When --reuse-values is set but there are no modifications yet, return new values
|
|
|
|
// When --reuse-values is set but there are no modifications yet, return new values
|
|
|
|
if dst == nil || src == nil {
|
|
|
|
|
|
|
|
if src == nil {
|
|
|
|
if src == nil {
|
|
|
|
return dst
|
|
|
|
return dst
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if dst == nil {
|
|
|
|
if dst == nil {
|
|
|
|
return src
|
|
|
|
return src
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Because dest has higher precedence than src, dest values override src
|
|
|
|
// Because dest has higher precedence than src, dest values override src
|
|
|
|
// values.
|
|
|
|
// values.
|
|
|
|
for key, val := range src {
|
|
|
|
for key, val := range src {
|
|
|
|