kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-05-17 10:15:22 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

updated patch delete test

Browse Source
This commit is contained in:
Natasha Sarkar
2021-01-26 16:42:59 -08:00
parent a8278b6da9
commit 48676fe34b
2 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/builtins/PatchStrategicMergeTransformer.go
View File

@@ -60,11 +60,10 @@ func (p *PatchStrategicMergeTransformerPlugin) 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
}