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

remove glog dependency from kustomize code (#542)

Browse Source
This commit is contained in:
Jingfang Liu
2018-11-12 11:35:00 -08:00
committed by GitHub
parent 1648eceb47
commit 83bc67c8ad
5 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/resmap/resmap.go
View File

@@ -20,11 +20,11 @@ package resmap
import (
"bytes"
"fmt"
"log"
"reflect"
"sort"
"github.com/ghodss/yaml"
"github.com/golang/glog"
"sigs.k8s.io/kustomize/pkg/ifc"
"sigs.k8s.io/kustomize/pkg/resid"
"sigs.k8s.io/kustomize/pkg/resource"
@@ -181,17 +181,17 @@ func MergeWithOverride(maps ...ResMap) (ResMap, error) {
id = matchedId[0]
switch r.Behavior() {
case ifc.BehaviorReplace:
glog.V(4).Infof(
log.Printf(
"Replace %v with %v", result[id].Map(), r.Map())
r.Replace(result[id])
result[id] = r
result[id].SetBehavior(ifc.BehaviorCreate)
case ifc.BehaviorMerge:
glog.V(4).Infof(
log.Printf(
"Merging %v with %v", result[id].Map(), r.Map())
r.Merge(result[id])
result[id] = r
glog.V(4).Infof(
log.Printf(
"Merged object is %v", result[id].Map())
result[id].SetBehavior(ifc.BehaviorCreate)
default: