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

make generated configmaps composable

Browse Source
This commit is contained in:
Jingfang Liu
2018-06-11 12:05:48 -07:00
parent 9459665c96
commit e017d04a16
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/resmap/resmap.go
View File

@@ -222,11 +222,13 @@ func MergeWithOverride(maps ...ResMap) (ResMap, error) {
glog.V(4).Infof("Replace %v with %v", result[id].Object, r.Object)
r.Replace(result[id])
result[id] = r
result[id].ChangeBehavior(resource.BehaviorCreate)
case resource.BehaviorMerge:
glog.V(4).Infof("Merging %v with %v", result[id].Object, r.Object)
r.Merge(result[id])
result[id] = r
glog.V(4).Infof("Merged object is %v", result[id].Object)
result[id].ChangeBehavior(resource.BehaviorCreate)
default:
return nil, fmt.Errorf("Id %#v exists; must merge or replace.", id)
}