kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-11 17:12:51 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Add tests for IsTaggedNull, IsYNodeEmptySeq and IsYNodeEmptyMap.

Browse Source
This commit is contained in:
jregan
2020-08-09 12:15:22 -07:00
parent 01b34c8ea0
commit 5559601ecb
5 changed files with 98 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kyaml/yaml/merge2/merge2.go
View File

@@ -56,7 +56,7 @@ func (m Merger) VisitMap(nodes walk.Sources, s *openapi.ResourceSchema) (*yaml.R
// Add
return nodes.Origin(), nil
}
if yaml.IsNull(nodes.Origin()) {
if nodes.Origin().IsTaggedNull() {
// clear the value
return walk.ClearNode, nil
}
@@ -112,7 +112,7 @@ func (m Merger) VisitList(nodes walk.Sources, s *openapi.ResourceSchema, kind wa
return nodes.Origin(), nil
}
// Clear
if yaml.IsNull(nodes.Origin()) {
if nodes.Origin().IsTaggedNull() {
return walk.ClearNode, nil
}
// Recursively Merge dest