diff --git a/Gopkg.lock b/Gopkg.lock index 829e5be1a..46e595f4b 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -40,7 +40,6 @@ "aws/signer/v4", "internal/sdkio", "internal/sdkrand", - "internal/sdkuri", "internal/shareddefaults", "private/protocol", "private/protocol/eventstream", @@ -493,7 +492,6 @@ input-imports = [ "github.com/evanphx/json-patch", "github.com/ghodss/yaml", - "github.com/golang/glog", "github.com/hashicorp/go-getter", "github.com/pkg/errors", "github.com/spf13/cobra", diff --git a/Gopkg.toml b/Gopkg.toml index 62753c8c0..a484ba5d8 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -34,10 +34,6 @@ name = "github.com/ghodss/yaml" version = "1.0.0" -[[constraint]] - branch = "master" - name = "github.com/golang/glog" - [[constraint]] name = "github.com/spf13/cobra" version = "0.0.2" @@ -65,7 +61,3 @@ [[constraint]] branch = "master" name = "github.com/hashicorp/go-getter" - -[[constraint]] - name = "github.com/krishicks/yaml-patch" - version = "0.0.10" diff --git a/kustomize.go b/kustomize.go index 03dd4c478..e17481de9 100644 --- a/kustomize.go +++ b/kustomize.go @@ -19,14 +19,11 @@ package main import ( "os" - "github.com/golang/glog" "sigs.k8s.io/kustomize/k8sdeps" "sigs.k8s.io/kustomize/pkg/commands" ) func main() { - defer glog.Flush() - if err := commands.NewDefaultCommand(k8sdeps.NewFactory()).Execute(); err != nil { os.Exit(1) } diff --git a/pkg/resmap/resmap.go b/pkg/resmap/resmap.go index 8a6c3e974..2c3f8d543 100644 --- a/pkg/resmap/resmap.go +++ b/pkg/resmap/resmap.go @@ -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: diff --git a/pkg/target/kusttarget.go b/pkg/target/kusttarget.go index f665344c4..1db5c9a31 100644 --- a/pkg/target/kusttarget.go +++ b/pkg/target/kusttarget.go @@ -21,10 +21,10 @@ import ( "bytes" "encoding/json" "fmt" + "log" "strings" "github.com/ghodss/yaml" - "github.com/golang/glog" "github.com/pkg/errors" "sigs.k8s.io/kustomize/pkg/constants" "sigs.k8s.io/kustomize/pkg/fs" @@ -318,7 +318,7 @@ func (kt *KustTarget) resolveRefVars(m resmap.ResMap) (map[string]string, error) } result[v.Name] = s } else { - glog.Infof("couldn't resolve v: %v", v) + log.Printf("couldn't resolve v: %v", v) } } return result, nil