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

Reduce log noise.

Browse Source
This commit is contained in:
Jeffrey Regan
2018-12-13 16:29:11 -08:00
parent bd83773a1e
commit 77b44f570a
4 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/target/kusttarget.go
View File

@@ -218,7 +218,7 @@ func (kt *KustTarget) generateConfigMapsAndSecrets(
if err != nil {
errs.Append(errors.Wrap(err, "NewResMapFromSecretArgs"))
}
return resmap.MergeWithoutOverride(cms, secrets)
return resmap.MergeWithErrorOnIdCollision(cms, secrets)
}
// Gets Bases and Resources as advertised.
@@ -232,7 +232,7 @@ func (kt *KustTarget) loadResMapFromBasesAndResources() (resmap.ResMap, error) {
if len(errs.Get()) > 0 {
return nil, errs
}
return resmap.MergeWithoutOverride(resources, bases)
return resmap.MergeWithErrorOnIdCollision(resources, bases)
}
// Loop through the Bases of this kustomization recursively loading resources.
@@ -261,7 +261,7 @@ func (kt *KustTarget) loadCustomizedBases() (resmap.ResMap, *interror.Kustomizat
ldr.Cleanup()
list = append(list, resMap)
}
result, err := resmap.MergeWithoutOverride(list...)
result, err := resmap.MergeWithErrorOnIdCollision(list...)
if err != nil {
errs.Append(errors.Wrap(err, "Merge failed"))
}