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

Preserve order when merging.

Browse Source
This commit is contained in:
Jeffrey Regan
2019-06-03 11:22:53 -07:00
committed by jregan
parent c094780aae
commit c63ebbdfc4
9 changed files with 254 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/target/kusttarget.go
View File

@@ -263,7 +263,7 @@ func (kt *KustTarget) runGenerators(
return err
}
// The legacy generators allow override.
err = ra.MergeResourcesWithOverride(resMap)
err = ra.AbsorbAll(resMap)
if err != nil {
return errors.Wrapf(err, "merging from generator %v", g)
}
@@ -277,7 +277,7 @@ func (kt *KustTarget) runGenerators(
if err != nil {
return err
}
err = ra.MergeResourcesWithErrorOnIdCollision(resMap)
err = ra.AppendAll(resMap)
if err != nil {
return errors.Wrapf(err, "merging from generator %v", g)
}
@@ -380,7 +380,7 @@ func (kt *KustTarget) accumulateFile(
if err != nil {
return errors.Wrapf(err, "accumulating resources from '%s'", path)
}
err = ra.MergeResourcesWithErrorOnIdCollision(resources)
err = ra.AppendAll(resources)
if err != nil {
return errors.Wrapf(err, "merging resources from '%s'", path)
}