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

don't merge patches until they are applied

Browse Source
This commit is contained in:
Natasha Sarkar
2021-01-26 16:43:15 -08:00
parent 48676fe34b
commit 5958edda14
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer.go
View File

@@ -64,11 +64,10 @@ func (p *plugin) Config(
"patch appears to be empty; files=%v, Patch=%s", p.Paths, p.Patches) "patch appears to be empty; files=%v, Patch=%s", p.Paths, p.Patches)
} }
// Merge the patches, looking for conflicts. // Merge the patches, looking for conflicts.
m, err := h.ResmapFactory().ConflatePatches(p.loadedPatches) _, err = h.ResmapFactory().ConflatePatches(p.loadedPatches)
if err != nil { if err != nil {
return err return err
} }
p.loadedPatches = m.Resources()
return nil return nil
} }