diff --git a/cmd/hyperkube/hyperkube.go b/cmd/hyperkube/hyperkube.go index 5501dacd011..bfb07cffe1e 100644 --- a/cmd/hyperkube/hyperkube.go +++ b/cmd/hyperkube/hyperkube.go @@ -29,6 +29,7 @@ import ( "k8s.io/kubernetes/pkg/util" utilflag "k8s.io/kubernetes/pkg/util/flag" + "k8s.io/kubernetes/pkg/util/logs" "k8s.io/kubernetes/pkg/version/verflag" "github.com/spf13/pflag" @@ -174,8 +175,8 @@ func (hk *HyperKube) Run(args []string) error { verflag.PrintAndExitIfRequested() - util.InitLogs() - defer util.FlushLogs() + logs.InitLogs() + defer logs.FlushLogs() err = s.Run(s, s.Flags().Args()) if err != nil { diff --git a/cmd/kube-apiserver/apiserver.go b/cmd/kube-apiserver/apiserver.go index b381ae9920c..223e94e1f0c 100644 --- a/cmd/kube-apiserver/apiserver.go +++ b/cmd/kube-apiserver/apiserver.go @@ -26,8 +26,8 @@ import ( "k8s.io/kubernetes/cmd/kube-apiserver/app" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" - "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/flag" + "k8s.io/kubernetes/pkg/util/logs" "k8s.io/kubernetes/pkg/version/verflag" "github.com/spf13/pflag" @@ -40,8 +40,8 @@ func main() { s.AddFlags(pflag.CommandLine) flag.InitFlags() - util.InitLogs() - defer util.FlushLogs() + logs.InitLogs() + defer logs.FlushLogs() verflag.PrintAndExitIfRequested() diff --git a/cmd/kube-controller-manager/controller-manager.go b/cmd/kube-controller-manager/controller-manager.go index 4caa7dd3800..4390ae9a3f3 100644 --- a/cmd/kube-controller-manager/controller-manager.go +++ b/cmd/kube-controller-manager/controller-manager.go @@ -27,8 +27,8 @@ import ( "k8s.io/kubernetes/cmd/kube-controller-manager/app" "k8s.io/kubernetes/cmd/kube-controller-manager/app/options" "k8s.io/kubernetes/pkg/healthz" - "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/flag" + "k8s.io/kubernetes/pkg/util/logs" "k8s.io/kubernetes/pkg/version/verflag" "github.com/spf13/pflag" @@ -43,8 +43,8 @@ func main() { s.AddFlags(pflag.CommandLine) flag.InitFlags() - util.InitLogs() - defer util.FlushLogs() + logs.InitLogs() + defer logs.FlushLogs() verflag.PrintAndExitIfRequested() diff --git a/cmd/kube-dns/dns.go b/cmd/kube-dns/dns.go index 7d7a35c1ea0..e1c59029e32 100644 --- a/cmd/kube-dns/dns.go +++ b/cmd/kube-dns/dns.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/pflag" "k8s.io/kubernetes/cmd/kube-dns/app" "k8s.io/kubernetes/cmd/kube-dns/app/options" - "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/flag" + "k8s.io/kubernetes/pkg/util/logs" "k8s.io/kubernetes/pkg/version/verflag" ) @@ -30,8 +30,8 @@ func main() { config.AddFlags(pflag.CommandLine) flag.InitFlags() - util.InitLogs() - defer util.FlushLogs() + logs.InitLogs() + defer logs.FlushLogs() verflag.PrintAndExitIfRequested() server := app.NewKubeDNSServerDefault(config) diff --git a/cmd/kube-proxy/proxy.go b/cmd/kube-proxy/proxy.go index 772a71fe481..f410154d9b7 100644 --- a/cmd/kube-proxy/proxy.go +++ b/cmd/kube-proxy/proxy.go @@ -23,8 +23,8 @@ import ( "k8s.io/kubernetes/cmd/kube-proxy/app" "k8s.io/kubernetes/cmd/kube-proxy/app/options" "k8s.io/kubernetes/pkg/healthz" - "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/flag" + "k8s.io/kubernetes/pkg/util/logs" "k8s.io/kubernetes/pkg/version/verflag" "github.com/spf13/pflag" @@ -39,8 +39,8 @@ func main() { config.AddFlags(pflag.CommandLine) flag.InitFlags() - util.InitLogs() - defer util.FlushLogs() + logs.InitLogs() + defer logs.FlushLogs() verflag.PrintAndExitIfRequested() diff --git a/cmd/kubelet/kubelet.go b/cmd/kubelet/kubelet.go index dbd5dafa400..5bef91e624a 100644 --- a/cmd/kubelet/kubelet.go +++ b/cmd/kubelet/kubelet.go @@ -26,8 +26,8 @@ import ( "k8s.io/kubernetes/cmd/kubelet/app" "k8s.io/kubernetes/cmd/kubelet/app/options" - "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/flag" + "k8s.io/kubernetes/pkg/util/logs" "k8s.io/kubernetes/pkg/version/verflag" "github.com/spf13/pflag" @@ -38,8 +38,8 @@ func main() { s.AddFlags(pflag.CommandLine) flag.InitFlags() - util.InitLogs() - defer util.FlushLogs() + logs.InitLogs() + defer logs.FlushLogs() verflag.PrintAndExitIfRequested() diff --git a/cmd/libs/go2idl/args/args.go b/cmd/libs/go2idl/args/args.go index 97b3dc989f9..8b20a77dca5 100644 --- a/cmd/libs/go2idl/args/args.go +++ b/cmd/libs/go2idl/args/args.go @@ -31,8 +31,8 @@ import ( "k8s.io/kubernetes/cmd/libs/go2idl/namer" "k8s.io/kubernetes/cmd/libs/go2idl/parser" "k8s.io/kubernetes/cmd/libs/go2idl/types" - "k8s.io/kubernetes/pkg/util" utilflag "k8s.io/kubernetes/pkg/util/flag" + "k8s.io/kubernetes/pkg/util/logs" "github.com/spf13/pflag" ) @@ -146,7 +146,7 @@ func DefaultSourceTree() string { // args.Default().Execute(...) func (g *GeneratorArgs) Execute(nameSystems namer.NameSystems, defaultSystem string, pkgs func(*generator.Context, *GeneratorArgs) generator.Packages) error { utilflag.InitFlags() - util.InitLogs() + logs.InitLogs() b, err := g.NewBuilder() if err != nil { diff --git a/contrib/mesos/cmd/k8sm-controller-manager/main.go b/contrib/mesos/cmd/k8sm-controller-manager/main.go index 9e7b7b18be1..2f551656fd8 100644 --- a/contrib/mesos/cmd/k8sm-controller-manager/main.go +++ b/contrib/mesos/cmd/k8sm-controller-manager/main.go @@ -23,6 +23,7 @@ import ( "k8s.io/kubernetes/pkg/healthz" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/flag" + "k8s.io/kubernetes/pkg/util/logs" "k8s.io/kubernetes/pkg/version/verflag" "k8s.io/kubernetes/contrib/mesos/pkg/controllermanager" @@ -40,8 +41,8 @@ func main() { s.AddFlags(pflag.CommandLine) flag.InitFlags() - util.InitLogs() - defer util.FlushLogs() + logs.InitLogs() + defer logs.FlushLogs() verflag.PrintAndExitIfRequested() diff --git a/contrib/mesos/cmd/k8sm-executor/main.go b/contrib/mesos/cmd/k8sm-executor/main.go index 4f706ce6ca6..65f221b4e15 100644 --- a/contrib/mesos/cmd/k8sm-executor/main.go +++ b/contrib/mesos/cmd/k8sm-executor/main.go @@ -25,6 +25,7 @@ import ( "k8s.io/kubernetes/contrib/mesos/pkg/hyperkube" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/flag" + "k8s.io/kubernetes/pkg/util/logs" "k8s.io/kubernetes/pkg/version/verflag" ) @@ -34,8 +35,8 @@ func main() { s.AddFlags(pflag.CommandLine) flag.InitFlags() - util.InitLogs() - defer util.FlushLogs() + logs.InitLogs() + defer logs.FlushLogs() verflag.PrintAndExitIfRequested() diff --git a/contrib/mesos/cmd/k8sm-scheduler/main.go b/contrib/mesos/cmd/k8sm-scheduler/main.go index b685bafc59e..f95ac46773b 100644 --- a/contrib/mesos/cmd/k8sm-scheduler/main.go +++ b/contrib/mesos/cmd/k8sm-scheduler/main.go @@ -25,6 +25,7 @@ import ( "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/service" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/flag" + "k8s.io/kubernetes/pkg/util/logs" "k8s.io/kubernetes/pkg/version/verflag" ) @@ -33,8 +34,8 @@ func main() { s.AddStandaloneFlags(pflag.CommandLine) flag.InitFlags() - util.InitLogs() - defer util.FlushLogs() + logs.InitLogs() + defer logs.FlushLogs() verflag.PrintAndExitIfRequested() diff --git a/contrib/mesos/cmd/km/hyperkube.go b/contrib/mesos/cmd/km/hyperkube.go index bb90278a25d..ff21788834d 100644 --- a/contrib/mesos/cmd/km/hyperkube.go +++ b/contrib/mesos/cmd/km/hyperkube.go @@ -27,6 +27,7 @@ import ( "path" "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/logs" "k8s.io/kubernetes/pkg/version/verflag" "github.com/spf13/pflag" @@ -163,8 +164,8 @@ func (hk *HyperKube) Run(args []string) error { verflag.PrintAndExitIfRequested() - util.InitLogs() - defer util.FlushLogs() + logs.InitLogs() + defer logs.FlushLogs() err = s.Run(s, s.Flags().Args()) if err != nil { diff --git a/federation/cmd/federation-apiserver/apiserver.go b/federation/cmd/federation-apiserver/apiserver.go index 7a65dca8670..ae892776f98 100644 --- a/federation/cmd/federation-apiserver/apiserver.go +++ b/federation/cmd/federation-apiserver/apiserver.go @@ -26,8 +26,8 @@ import ( "k8s.io/kubernetes/federation/cmd/federation-apiserver/app" genericoptions "k8s.io/kubernetes/pkg/genericapiserver/options" - "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/flag" + "k8s.io/kubernetes/pkg/util/logs" "k8s.io/kubernetes/pkg/version/verflag" "github.com/spf13/pflag" @@ -40,8 +40,8 @@ func main() { s.AddFlags(pflag.CommandLine) flag.InitFlags() - util.InitLogs() - defer util.FlushLogs() + logs.InitLogs() + defer logs.FlushLogs() verflag.PrintAndExitIfRequested() diff --git a/federation/cmd/federation-controller-manager/controller-manager.go b/federation/cmd/federation-controller-manager/controller-manager.go index bee83bebcb4..ea2c6cac9cc 100644 --- a/federation/cmd/federation-controller-manager/controller-manager.go +++ b/federation/cmd/federation-controller-manager/controller-manager.go @@ -24,8 +24,8 @@ import ( "k8s.io/kubernetes/federation/cmd/federation-controller-manager/app" "k8s.io/kubernetes/federation/cmd/federation-controller-manager/app/options" "k8s.io/kubernetes/pkg/healthz" - "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/flag" + "k8s.io/kubernetes/pkg/util/logs" "k8s.io/kubernetes/pkg/version/verflag" ) @@ -38,8 +38,8 @@ func main() { s.AddFlags(pflag.CommandLine) flag.InitFlags() - util.InitLogs() - defer util.FlushLogs() + logs.InitLogs() + defer logs.FlushLogs() verflag.PrintAndExitIfRequested() diff --git a/pkg/util/logs.go b/pkg/util/logs/logs.go similarity index 99% rename from pkg/util/logs.go rename to pkg/util/logs/logs.go index ea27f484f02..c355dcff0aa 100644 --- a/pkg/util/logs.go +++ b/pkg/util/logs/logs.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package util +package logs import ( "flag" diff --git a/plugin/cmd/kube-scheduler/scheduler.go b/plugin/cmd/kube-scheduler/scheduler.go index 54ea65958ba..34d3371c4a1 100644 --- a/plugin/cmd/kube-scheduler/scheduler.go +++ b/plugin/cmd/kube-scheduler/scheduler.go @@ -18,8 +18,8 @@ package main import ( "k8s.io/kubernetes/pkg/healthz" - "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/flag" + "k8s.io/kubernetes/pkg/util/logs" "k8s.io/kubernetes/pkg/version/verflag" "k8s.io/kubernetes/plugin/cmd/kube-scheduler/app" "k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/options" @@ -36,8 +36,8 @@ func main() { s.AddFlags(pflag.CommandLine) flag.InitFlags() - util.InitLogs() - defer util.FlushLogs() + logs.InitLogs() + defer logs.FlushLogs() verflag.PrintAndExitIfRequested()