github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move pkg/util/ files to their own package to reduce client-go dependencies

Browse Source
This commit is contained in:
Chao Xu
2016-08-05 22:54:13 -07:00
parent 4d70d9f3de
commit a771578a1c
15 changed files with 42 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/hyperkube/hyperkube.go
View File

@@ -29,6 +29,7 @@ import (
"k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util"
utilflag "k8s.io/kubernetes/pkg/util/flag" utilflag "k8s.io/kubernetes/pkg/util/flag"
"k8s.io/kubernetes/pkg/util/logs"
"k8s.io/kubernetes/pkg/version/verflag" "k8s.io/kubernetes/pkg/version/verflag"
"github.com/spf13/pflag" "github.com/spf13/pflag"
@@ -174,8 +175,8 @@ func (hk *HyperKube) Run(args []string) error {
verflag.PrintAndExitIfRequested() verflag.PrintAndExitIfRequested()
util.InitLogs() logs.InitLogs()
defer util.FlushLogs() defer logs.FlushLogs()
err = s.Run(s, s.Flags().Args()) err = s.Run(s, s.Flags().Args())
if err != nil { if err != nil {

6
cmd/kube-apiserver/apiserver.go
View File

@@ -26,8 +26,8 @@ import (
"k8s.io/kubernetes/cmd/kube-apiserver/app" "k8s.io/kubernetes/cmd/kube-apiserver/app"
"k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/cmd/kube-apiserver/app/options"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/flag"
"k8s.io/kubernetes/pkg/util/logs"
"k8s.io/kubernetes/pkg/version/verflag" "k8s.io/kubernetes/pkg/version/verflag"
"github.com/spf13/pflag" "github.com/spf13/pflag"
@@ -40,8 +40,8 @@ func main() {
s.AddFlags(pflag.CommandLine) s.AddFlags(pflag.CommandLine)
flag.InitFlags() flag.InitFlags()
util.InitLogs() logs.InitLogs()
defer util.FlushLogs() defer logs.FlushLogs()
verflag.PrintAndExitIfRequested() verflag.PrintAndExitIfRequested()

6
cmd/kube-controller-manager/controller-manager.go
View File

@@ -27,8 +27,8 @@ import (
"k8s.io/kubernetes/cmd/kube-controller-manager/app" "k8s.io/kubernetes/cmd/kube-controller-manager/app"
"k8s.io/kubernetes/cmd/kube-controller-manager/app/options" "k8s.io/kubernetes/cmd/kube-controller-manager/app/options"
"k8s.io/kubernetes/pkg/healthz" "k8s.io/kubernetes/pkg/healthz"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/flag"
"k8s.io/kubernetes/pkg/util/logs"
"k8s.io/kubernetes/pkg/version/verflag" "k8s.io/kubernetes/pkg/version/verflag"
"github.com/spf13/pflag" "github.com/spf13/pflag"
@@ -43,8 +43,8 @@ func main() {
s.AddFlags(pflag.CommandLine) s.AddFlags(pflag.CommandLine)
flag.InitFlags() flag.InitFlags()
util.InitLogs() logs.InitLogs()
defer util.FlushLogs() defer logs.FlushLogs()
verflag.PrintAndExitIfRequested() verflag.PrintAndExitIfRequested()

6
cmd/kube-dns/dns.go
View File

@@ -20,8 +20,8 @@ import (
"github.com/spf13/pflag" "github.com/spf13/pflag"
"k8s.io/kubernetes/cmd/kube-dns/app" "k8s.io/kubernetes/cmd/kube-dns/app"
"k8s.io/kubernetes/cmd/kube-dns/app/options" "k8s.io/kubernetes/cmd/kube-dns/app/options"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/flag"
"k8s.io/kubernetes/pkg/util/logs"
"k8s.io/kubernetes/pkg/version/verflag" "k8s.io/kubernetes/pkg/version/verflag"
) )
@@ -30,8 +30,8 @@ func main() {
config.AddFlags(pflag.CommandLine) config.AddFlags(pflag.CommandLine)
flag.InitFlags() flag.InitFlags()
util.InitLogs() logs.InitLogs()
defer util.FlushLogs() defer logs.FlushLogs()
verflag.PrintAndExitIfRequested() verflag.PrintAndExitIfRequested()
server := app.NewKubeDNSServerDefault(config) server := app.NewKubeDNSServerDefault(config)

6
cmd/kube-proxy/proxy.go
View File

@@ -23,8 +23,8 @@ import (
"k8s.io/kubernetes/cmd/kube-proxy/app" "k8s.io/kubernetes/cmd/kube-proxy/app"
"k8s.io/kubernetes/cmd/kube-proxy/app/options" "k8s.io/kubernetes/cmd/kube-proxy/app/options"
"k8s.io/kubernetes/pkg/healthz" "k8s.io/kubernetes/pkg/healthz"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/flag"
"k8s.io/kubernetes/pkg/util/logs"
"k8s.io/kubernetes/pkg/version/verflag" "k8s.io/kubernetes/pkg/version/verflag"
"github.com/spf13/pflag" "github.com/spf13/pflag"
@@ -39,8 +39,8 @@ func main() {
config.AddFlags(pflag.CommandLine) config.AddFlags(pflag.CommandLine)
flag.InitFlags() flag.InitFlags()
util.InitLogs() logs.InitLogs()
defer util.FlushLogs() defer logs.FlushLogs()
verflag.PrintAndExitIfRequested() verflag.PrintAndExitIfRequested()

6
cmd/kubelet/kubelet.go
View File

@@ -26,8 +26,8 @@ import (
"k8s.io/kubernetes/cmd/kubelet/app" "k8s.io/kubernetes/cmd/kubelet/app"
"k8s.io/kubernetes/cmd/kubelet/app/options" "k8s.io/kubernetes/cmd/kubelet/app/options"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/flag"
"k8s.io/kubernetes/pkg/util/logs"
"k8s.io/kubernetes/pkg/version/verflag" "k8s.io/kubernetes/pkg/version/verflag"
"github.com/spf13/pflag" "github.com/spf13/pflag"
@@ -38,8 +38,8 @@ func main() {
s.AddFlags(pflag.CommandLine) s.AddFlags(pflag.CommandLine)
flag.InitFlags() flag.InitFlags()
util.InitLogs() logs.InitLogs()
defer util.FlushLogs() defer logs.FlushLogs()
verflag.PrintAndExitIfRequested() verflag.PrintAndExitIfRequested()

4
cmd/libs/go2idl/args/args.go
View File

@@ -31,8 +31,8 @@ import (
"k8s.io/kubernetes/cmd/libs/go2idl/namer" "k8s.io/kubernetes/cmd/libs/go2idl/namer"
"k8s.io/kubernetes/cmd/libs/go2idl/parser" "k8s.io/kubernetes/cmd/libs/go2idl/parser"
"k8s.io/kubernetes/cmd/libs/go2idl/types" "k8s.io/kubernetes/cmd/libs/go2idl/types"
"k8s.io/kubernetes/pkg/util"
utilflag "k8s.io/kubernetes/pkg/util/flag" utilflag "k8s.io/kubernetes/pkg/util/flag"
"k8s.io/kubernetes/pkg/util/logs"
"github.com/spf13/pflag" "github.com/spf13/pflag"
) )
@@ -146,7 +146,7 @@ func DefaultSourceTree() string {
// args.Default().Execute(...) // args.Default().Execute(...)
func (g *GeneratorArgs) Execute(nameSystems namer.NameSystems, defaultSystem string, pkgs func(*generator.Context, *GeneratorArgs) generator.Packages) error { func (g *GeneratorArgs) Execute(nameSystems namer.NameSystems, defaultSystem string, pkgs func(*generator.Context, *GeneratorArgs) generator.Packages) error {
utilflag.InitFlags() utilflag.InitFlags()
util.InitLogs() logs.InitLogs()
b, err := g.NewBuilder() b, err := g.NewBuilder()
if err != nil { if err != nil {

5
contrib/mesos/cmd/k8sm-controller-manager/main.go
View File

@@ -23,6 +23,7 @@ import (
"k8s.io/kubernetes/pkg/healthz" "k8s.io/kubernetes/pkg/healthz"
"k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/flag"
"k8s.io/kubernetes/pkg/util/logs"
"k8s.io/kubernetes/pkg/version/verflag" "k8s.io/kubernetes/pkg/version/verflag"
"k8s.io/kubernetes/contrib/mesos/pkg/controllermanager" "k8s.io/kubernetes/contrib/mesos/pkg/controllermanager"
@@ -40,8 +41,8 @@ func main() {
s.AddFlags(pflag.CommandLine) s.AddFlags(pflag.CommandLine)
flag.InitFlags() flag.InitFlags()
util.InitLogs() logs.InitLogs()
defer util.FlushLogs() defer logs.FlushLogs()
verflag.PrintAndExitIfRequested() verflag.PrintAndExitIfRequested()

5
contrib/mesos/cmd/k8sm-executor/main.go
View File

@@ -25,6 +25,7 @@ import (
"k8s.io/kubernetes/contrib/mesos/pkg/hyperkube" "k8s.io/kubernetes/contrib/mesos/pkg/hyperkube"
"k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/flag"
"k8s.io/kubernetes/pkg/util/logs"
"k8s.io/kubernetes/pkg/version/verflag" "k8s.io/kubernetes/pkg/version/verflag"
) )
@@ -34,8 +35,8 @@ func main() {
s.AddFlags(pflag.CommandLine) s.AddFlags(pflag.CommandLine)
flag.InitFlags() flag.InitFlags()
util.InitLogs() logs.InitLogs()
defer util.FlushLogs() defer logs.FlushLogs()
verflag.PrintAndExitIfRequested() verflag.PrintAndExitIfRequested()

5
contrib/mesos/cmd/k8sm-scheduler/main.go
View File

@@ -25,6 +25,7 @@ import (
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/service" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/service"
"k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/flag"
"k8s.io/kubernetes/pkg/util/logs"
"k8s.io/kubernetes/pkg/version/verflag" "k8s.io/kubernetes/pkg/version/verflag"
) )
@@ -33,8 +34,8 @@ func main() {
s.AddStandaloneFlags(pflag.CommandLine) s.AddStandaloneFlags(pflag.CommandLine)
flag.InitFlags() flag.InitFlags()
util.InitLogs() logs.InitLogs()
defer util.FlushLogs() defer logs.FlushLogs()
verflag.PrintAndExitIfRequested() verflag.PrintAndExitIfRequested()

5
contrib/mesos/cmd/km/hyperkube.go
View File

@@ -27,6 +27,7 @@ import (
"path" "path"
"k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/logs"
"k8s.io/kubernetes/pkg/version/verflag" "k8s.io/kubernetes/pkg/version/verflag"
"github.com/spf13/pflag" "github.com/spf13/pflag"
@@ -163,8 +164,8 @@ func (hk *HyperKube) Run(args []string) error {
verflag.PrintAndExitIfRequested() verflag.PrintAndExitIfRequested()
util.InitLogs() logs.InitLogs()
defer util.FlushLogs() defer logs.FlushLogs()
err = s.Run(s, s.Flags().Args()) err = s.Run(s, s.Flags().Args())
if err != nil { if err != nil {

6
federation/cmd/federation-apiserver/apiserver.go
View File

@@ -26,8 +26,8 @@ import (
"k8s.io/kubernetes/federation/cmd/federation-apiserver/app" "k8s.io/kubernetes/federation/cmd/federation-apiserver/app"
genericoptions "k8s.io/kubernetes/pkg/genericapiserver/options" genericoptions "k8s.io/kubernetes/pkg/genericapiserver/options"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/flag"
"k8s.io/kubernetes/pkg/util/logs"
"k8s.io/kubernetes/pkg/version/verflag" "k8s.io/kubernetes/pkg/version/verflag"
"github.com/spf13/pflag" "github.com/spf13/pflag"
@@ -40,8 +40,8 @@ func main() {
s.AddFlags(pflag.CommandLine) s.AddFlags(pflag.CommandLine)
flag.InitFlags() flag.InitFlags()
util.InitLogs() logs.InitLogs()
defer util.FlushLogs() defer logs.FlushLogs()
verflag.PrintAndExitIfRequested() verflag.PrintAndExitIfRequested()

6
federation/cmd/federation-controller-manager/controller-manager.go
View File

@@ -24,8 +24,8 @@ import (
"k8s.io/kubernetes/federation/cmd/federation-controller-manager/app" "k8s.io/kubernetes/federation/cmd/federation-controller-manager/app"
"k8s.io/kubernetes/federation/cmd/federation-controller-manager/app/options" "k8s.io/kubernetes/federation/cmd/federation-controller-manager/app/options"
"k8s.io/kubernetes/pkg/healthz" "k8s.io/kubernetes/pkg/healthz"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/flag"
"k8s.io/kubernetes/pkg/util/logs"
"k8s.io/kubernetes/pkg/version/verflag" "k8s.io/kubernetes/pkg/version/verflag"
) )
@@ -38,8 +38,8 @@ func main() {
s.AddFlags(pflag.CommandLine) s.AddFlags(pflag.CommandLine)
flag.InitFlags() flag.InitFlags()
util.InitLogs() logs.InitLogs()
defer util.FlushLogs() defer logs.FlushLogs()
verflag.PrintAndExitIfRequested() verflag.PrintAndExitIfRequested()

2
pkg/util/logs.go → pkg/util/logs/logs.go
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package util package logs
import ( import (
"flag" "flag"

6
plugin/cmd/kube-scheduler/scheduler.go
View File

@@ -18,8 +18,8 @@ package main
import ( import (
"k8s.io/kubernetes/pkg/healthz" "k8s.io/kubernetes/pkg/healthz"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/flag"
"k8s.io/kubernetes/pkg/util/logs"
"k8s.io/kubernetes/pkg/version/verflag" "k8s.io/kubernetes/pkg/version/verflag"
"k8s.io/kubernetes/plugin/cmd/kube-scheduler/app" "k8s.io/kubernetes/plugin/cmd/kube-scheduler/app"
"k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/options" "k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/options"
@@ -36,8 +36,8 @@ func main() {
s.AddFlags(pflag.CommandLine) s.AddFlags(pflag.CommandLine)
flag.InitFlags() flag.InitFlags()
util.InitLogs() logs.InitLogs()
defer util.FlushLogs() defer logs.FlushLogs()
verflag.PrintAndExitIfRequested() verflag.PrintAndExitIfRequested()