Skip to content

Commit

Permalink
Fixed format
Browse files Browse the repository at this point in the history
Signed-off-by: intetinte <[email protected]>
  • Loading branch information
intetinte authored Feb 26, 2024
1 parent d231ce4 commit 95b103b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkg/chartutil/dependencies.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 95b103b

Please sign in to comment.