mirror of
https://github.com/kubernetes-sigs/kustomize.git
synced 2026-09-15 12:18:57 +00:00
remove glog dependency from kustomize code (#542)
This commit is contained in:
2
Gopkg.lock
generated
2
Gopkg.lock
generated
@@ -40,7 +40,6 @@
|
|||||||
"aws/signer/v4",
|
"aws/signer/v4",
|
||||||
"internal/sdkio",
|
"internal/sdkio",
|
||||||
"internal/sdkrand",
|
"internal/sdkrand",
|
||||||
"internal/sdkuri",
|
|
||||||
"internal/shareddefaults",
|
"internal/shareddefaults",
|
||||||
"private/protocol",
|
"private/protocol",
|
||||||
"private/protocol/eventstream",
|
"private/protocol/eventstream",
|
||||||
@@ -493,7 +492,6 @@
|
|||||||
input-imports = [
|
input-imports = [
|
||||||
"github.com/evanphx/json-patch",
|
"github.com/evanphx/json-patch",
|
||||||
"github.com/ghodss/yaml",
|
"github.com/ghodss/yaml",
|
||||||
"github.com/golang/glog",
|
|
||||||
"github.com/hashicorp/go-getter",
|
"github.com/hashicorp/go-getter",
|
||||||
"github.com/pkg/errors",
|
"github.com/pkg/errors",
|
||||||
"github.com/spf13/cobra",
|
"github.com/spf13/cobra",
|
||||||
|
|||||||
@@ -34,10 +34,6 @@
|
|||||||
name = "github.com/ghodss/yaml"
|
name = "github.com/ghodss/yaml"
|
||||||
version = "1.0.0"
|
version = "1.0.0"
|
||||||
|
|
||||||
[[constraint]]
|
|
||||||
branch = "master"
|
|
||||||
name = "github.com/golang/glog"
|
|
||||||
|
|
||||||
[[constraint]]
|
[[constraint]]
|
||||||
name = "github.com/spf13/cobra"
|
name = "github.com/spf13/cobra"
|
||||||
version = "0.0.2"
|
version = "0.0.2"
|
||||||
@@ -65,7 +61,3 @@
|
|||||||
[[constraint]]
|
[[constraint]]
|
||||||
branch = "master"
|
branch = "master"
|
||||||
name = "github.com/hashicorp/go-getter"
|
name = "github.com/hashicorp/go-getter"
|
||||||
|
|
||||||
[[constraint]]
|
|
||||||
name = "github.com/krishicks/yaml-patch"
|
|
||||||
version = "0.0.10"
|
|
||||||
|
|||||||
@@ -19,14 +19,11 @@ package main
|
|||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/golang/glog"
|
|
||||||
"sigs.k8s.io/kustomize/k8sdeps"
|
"sigs.k8s.io/kustomize/k8sdeps"
|
||||||
"sigs.k8s.io/kustomize/pkg/commands"
|
"sigs.k8s.io/kustomize/pkg/commands"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
defer glog.Flush()
|
|
||||||
|
|
||||||
if err := commands.NewDefaultCommand(k8sdeps.NewFactory()).Execute(); err != nil {
|
if err := commands.NewDefaultCommand(k8sdeps.NewFactory()).Execute(); err != nil {
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,11 +20,11 @@ package resmap
|
|||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"log"
|
||||||
"reflect"
|
"reflect"
|
||||||
"sort"
|
"sort"
|
||||||
|
|
||||||
"github.com/ghodss/yaml"
|
"github.com/ghodss/yaml"
|
||||||
"github.com/golang/glog"
|
|
||||||
"sigs.k8s.io/kustomize/pkg/ifc"
|
"sigs.k8s.io/kustomize/pkg/ifc"
|
||||||
"sigs.k8s.io/kustomize/pkg/resid"
|
"sigs.k8s.io/kustomize/pkg/resid"
|
||||||
"sigs.k8s.io/kustomize/pkg/resource"
|
"sigs.k8s.io/kustomize/pkg/resource"
|
||||||
@@ -181,17 +181,17 @@ func MergeWithOverride(maps ...ResMap) (ResMap, error) {
|
|||||||
id = matchedId[0]
|
id = matchedId[0]
|
||||||
switch r.Behavior() {
|
switch r.Behavior() {
|
||||||
case ifc.BehaviorReplace:
|
case ifc.BehaviorReplace:
|
||||||
glog.V(4).Infof(
|
log.Printf(
|
||||||
"Replace %v with %v", result[id].Map(), r.Map())
|
"Replace %v with %v", result[id].Map(), r.Map())
|
||||||
r.Replace(result[id])
|
r.Replace(result[id])
|
||||||
result[id] = r
|
result[id] = r
|
||||||
result[id].SetBehavior(ifc.BehaviorCreate)
|
result[id].SetBehavior(ifc.BehaviorCreate)
|
||||||
case ifc.BehaviorMerge:
|
case ifc.BehaviorMerge:
|
||||||
glog.V(4).Infof(
|
log.Printf(
|
||||||
"Merging %v with %v", result[id].Map(), r.Map())
|
"Merging %v with %v", result[id].Map(), r.Map())
|
||||||
r.Merge(result[id])
|
r.Merge(result[id])
|
||||||
result[id] = r
|
result[id] = r
|
||||||
glog.V(4).Infof(
|
log.Printf(
|
||||||
"Merged object is %v", result[id].Map())
|
"Merged object is %v", result[id].Map())
|
||||||
result[id].SetBehavior(ifc.BehaviorCreate)
|
result[id].SetBehavior(ifc.BehaviorCreate)
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -21,10 +21,10 @@ import (
|
|||||||
"bytes"
|
"bytes"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"log"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/ghodss/yaml"
|
"github.com/ghodss/yaml"
|
||||||
"github.com/golang/glog"
|
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"sigs.k8s.io/kustomize/pkg/constants"
|
"sigs.k8s.io/kustomize/pkg/constants"
|
||||||
"sigs.k8s.io/kustomize/pkg/fs"
|
"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
|
result[v.Name] = s
|
||||||
} else {
|
} else {
|
||||||
glog.Infof("couldn't resolve v: %v", v)
|
log.Printf("couldn't resolve v: %v", v)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return result, nil
|
return result, nil
|
||||||
|
|||||||
Reference in New Issue
Block a user