Fixed format

Signed-off-by: intetinte <123629048+intetinte@users.noreply.github.com>
pull/12590/head
intetinte 7 months ago committed by Tore Johansson
parent f1e722a2a4
commit 57d0b702af

@ -304,8 +304,8 @@ func processImportValues(c *chart.Chart, merge bool) error {
// deep copying the cvals as there are cases where pointers can end
// up in the cvals when they are copied onto b in ways that break things.
// Merge dependencies in the chart values-file first
b = MergeTables(deepCopyMap(c.Values), b)
// next merge sub-chart values in the chart-values merged with the dependencies
b = MergeTables(deepCopyMap(c.Values), b)
// next merge sub-chart values in the chart-values merged with the dependencies
c.Values = MergeTables(deepCopyMap(b), cvals)
} else {
// Trimming the nil values from cvals is needed for backwards compatibility.

Loading…
Cancel
Save