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

Don't swallow error in SM patch and use new RNode Map method.

Browse Source
This commit is contained in:
monopole
2021-01-09 06:57:29 -08:00
parent 1a002005c1
commit c2fbb709da
5 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/resource/resource.go
View File

@@ -423,9 +423,12 @@ func (r *Resource) ApplySmPatch(patch *Resource) error {
return err
}
n, ns := r.GetName(), r.GetNamespace()
r.ApplyFilter(patchstrategicmerge.Filter{
err = r.ApplyFilter(patchstrategicmerge.Filter{
Patch: node,
})
if err != nil {
return err
}
if !r.IsEmpty() {
r.SetName(n)
r.SetNamespace(ns)