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

smpdirectives shouldn't add elements when element isn't found

Browse Source
This commit is contained in:
Natasha Sarkar
2021-01-26 16:43:30 -08:00
parent 5958edda14
commit 4d5657f037
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,6 +59,11 @@ func (m Merger) VisitMap(nodes walk.Sources, s *openapi.ResourceSchema) (*yaml.R
} }
if yaml.IsMissingOrNull(nodes.Dest()) { if yaml.IsMissingOrNull(nodes.Dest()) {
// Add // Add
ps, _ := determineSmpDirective(nodes.Origin())
if ps == smpDelete {
return walk.ClearNode, nil
}
return nodes.Origin(), nil return nodes.Origin(), nil
} }
if nodes.Origin().IsTaggedNull() { if nodes.Origin().IsTaggedNull() {