Merge pull request #3040 from natasha41575/fixIssue2896

fixed issue 2896
kubernetes-sigs · Sep 30, 2020 · dd8edb1 · dd8edb1
2 parents bb42d8a + c93274c
commit dd8edb1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/api/builtins/PatchTransformer.go b/api/builtins/PatchTransformer.go
diff --git a/api/krusty/issue2896_test.go b/api/krusty/issue2896_test.go
@@ -88,7 +88,7 @@ patches:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: example
+  name: example-test-api
 spec:
   template:
     spec:

diff --git a/plugin/builtin/patchtransformer/PatchTransformer.go b/plugin/builtin/patchtransformer/PatchTransformer.go
@@ -143,9 +143,15 @@ func (p *plugin) applySMPatch(resource, patch *resource.Resource) error {
 	if err != nil {
 		return err
 	}
-	return filtersutil.ApplyToJSON(patchstrategicmerge.Filter{
+	n, ns := resource.GetName(), resource.GetNamespace()
+	err = filtersutil.ApplyToJSON(patchstrategicmerge.Filter{
 		Patch: node,
 	}, resource)
+	if len(resource.Map()) != 0 {
+		resource.SetName(n)
+		resource.SetNamespace(ns)
+	}
+	return err
 }
 
 // transformJson6902 applies the provided json6902 patch