kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-30 09:51:23 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

add unit test and address comments

Browse Source
This commit is contained in:
Jingfang Liu
2018-06-11 14:52:31 -07:00
parent 37720765fc
commit 934e37d781
7 changed files with 72 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/resmap/resmap.go
View File

@@ -222,13 +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)
result[id].SetBehavior(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)
result[id].SetBehavior(resource.BehaviorCreate)
default:
return nil, fmt.Errorf("Id %#v exists; must merge or replace.", id)
}