msb-public
/
helm
mirror of https://github.com/helm/helm
1
0
Code Issues Projects Releases Wiki Activity

Fixed format

Browse Source 
Signed-off-by: intetinte <123629048+intetinte@users.noreply.github.com>
pull/12590/head
intetinte 2 years ago committed by Tore Johansson
parent f1e722a2a4
commit 57d0b702af
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
pkg/chartutil/dependencies.go
Unescape View File

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

Write Preview
Loading…
Cancel
Save