From 5958edda142cb2896c3a9875b4f8c86db67057fa Mon Sep 17 00:00:00 2001 From: Natasha Sarkar Date: Tue, 26 Jan 2021 16:43:15 -0800 Subject: [PATCH] don't merge patches until they are applied --- .../PatchStrategicMergeTransformer.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer.go b/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer.go index 59975d6b0..7a37c24ce 100644 --- a/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer.go +++ b/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer.go @@ -64,11 +64,10 @@ func (p *plugin) Config( "patch appears to be empty; files=%v, Patch=%s", p.Paths, p.Patches) } // Merge the patches, looking for conflicts. - m, err := h.ResmapFactory().ConflatePatches(p.loadedPatches) + _, err = h.ResmapFactory().ConflatePatches(p.loadedPatches) if err != nil { return err } - p.loadedPatches = m.Resources() return nil }