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

fix for the patchdelete test

Browse Source
This commit is contained in:
Natasha Sarkar
2020-09-28 13:28:06 -07:00
parent e17bab7e55
commit f5feffbd23
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/builtins/PatchTransformer.go
View File

@@ -143,8 +143,10 @@ func (p *PatchTransformerPlugin) applySMPatch(resource, patch *resource.Resource
err = filtersutil.ApplyToJSON(patchstrategicmerge.Filter{ err = filtersutil.ApplyToJSON(patchstrategicmerge.Filter{
Patch: node, Patch: node,
}, resource) }, resource)
resource.SetName(n) if resource.GetName() != "" {
resource.SetNamespace(ns) resource.SetName(n)
resource.SetNamespace(ns)
}
return err return err
} }

6
plugin/builtin/patchtransformer/PatchTransformer.go
View File

@@ -147,8 +147,10 @@ func (p *plugin) applySMPatch(resource, patch *resource.Resource) error {
err = filtersutil.ApplyToJSON(patchstrategicmerge.Filter{ err = filtersutil.ApplyToJSON(patchstrategicmerge.Filter{
Patch: node, Patch: node,
}, resource) }, resource)
resource.SetName(n) if resource.GetName() != "" {
resource.SetNamespace(ns) resource.SetName(n)
resource.SetNamespace(ns)
}
return err return err
} }