From 4d5657f037e3cfc8d773f2fe29679a1fef527371 Mon Sep 17 00:00:00 2001
From: Natasha Sarkar <natashasarkar@google.com>
Date: Tue, 26 Jan 2021 16:43:30 -0800
Subject: [PATCH] smpdirectives shouldn't add elements when element isn't found

---
 kyaml/yaml/merge2/merge2.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kyaml/yaml/merge2/merge2.go b/kyaml/yaml/merge2/merge2.go
index 0a8c84487..d0625bd7c 100644
--- a/kyaml/yaml/merge2/merge2.go
+++ b/kyaml/yaml/merge2/merge2.go
@@ -59,6 +59,11 @@ func (m Merger) VisitMap(nodes walk.Sources, s *openapi.ResourceSchema) (*yaml.R
 	}
 	if yaml.IsMissingOrNull(nodes.Dest()) {
 		// Add
+		ps, _ := determineSmpDirective(nodes.Origin())
+		if ps == smpDelete {
+			return walk.ClearNode, nil
+		}
+
 		return nodes.Origin(), nil
 	}
 	if nodes.Origin().IsTaggedNull() {