upstream/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-02-20 16:35:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix null merge

Browse source 
(cherry-picked from commit c1175a4106)

Signed-off-by: Ben Foster <bpfoster@gmail.com>
(cherry picked from commit f0b699eabb)
This commit is contained in:
Ben Foster 2025-08-07 11:26:59 -04:00 committed by Scott Rigby
parent 7cfb6e486d
commit 578564ee26
No known key found for this signature in database
GPG key ID: C7C6FBB5B91C1155
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkg/chartutil/coalesce.go
View file

@ -283,6 +283,11 @@ func coalesceTablesFullKey(printf printFn, dst, src map[string]interface{}, pref
if dst == nil {
return src
}
for key, val := range dst {
if val == nil {
src[key] = nil
}
}
// Because dest has higher precedence than src, dest values override src
// values.
for key, val := range src {