From e17bab7e55cc710dcfddd006fbf82415ad880674 Mon Sep 17 00:00:00 2001 From: Natasha Sarkar Date: Fri, 25 Sep 2020 15:51:28 -0700 Subject: [PATCH] updated to include namespace --- api/builtins/PatchTransformer.go | 3 ++- plugin/builtin/patchtransformer/PatchTransformer.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/api/builtins/PatchTransformer.go b/api/builtins/PatchTransformer.go index 0cb35fd86..fe0eb050c 100644 --- a/api/builtins/PatchTransformer.go +++ b/api/builtins/PatchTransformer.go @@ -139,11 +139,12 @@ func (p *PatchTransformerPlugin) applySMPatch(resource, patch *resource.Resource if err != nil { return err } - n := resource.GetName() + n, ns := resource.GetName(), resource.GetNamespace() err = filtersutil.ApplyToJSON(patchstrategicmerge.Filter{ Patch: node, }, resource) resource.SetName(n) + resource.SetNamespace(ns) return err } diff --git a/plugin/builtin/patchtransformer/PatchTransformer.go b/plugin/builtin/patchtransformer/PatchTransformer.go index 43d1cbb58..9b2a00469 100644 --- a/plugin/builtin/patchtransformer/PatchTransformer.go +++ b/plugin/builtin/patchtransformer/PatchTransformer.go @@ -143,11 +143,12 @@ func (p *plugin) applySMPatch(resource, patch *resource.Resource) error { if err != nil { return err } - n := resource.GetName() + n, ns := resource.GetName(), resource.GetNamespace() err = filtersutil.ApplyToJSON(patchstrategicmerge.Filter{ Patch: node, }, resource) resource.SetName(n) + resource.SetNamespace(ns) return err }