Refactor: pkg/util into sub-pkgs

This commit is contained in:
xiangpengzhao
2017-06-29 16:39:26 +08:00
parent 50ec4384ff
commit 01daf707c5
47 changed files with 313 additions and 284 deletions

View File

@@ -60,7 +60,7 @@ go_library(
"//pkg/client/metrics/prometheus:go_default_library",
"//pkg/kubectl/cmd:go_default_library",
"//pkg/kubectl/cmd/util:go_default_library",
"//pkg/util:go_default_library",
"//pkg/util/template:go_default_library",
"//pkg/version/prometheus:go_default_library",
"//pkg/version/verflag:go_default_library",
"//plugin/cmd/kube-scheduler/app:go_default_library",

View File

@@ -27,7 +27,7 @@ import (
utilflag "k8s.io/apiserver/pkg/util/flag"
"k8s.io/apiserver/pkg/util/logs"
"k8s.io/kubernetes/pkg/util"
utiltemplate "k8s.io/kubernetes/pkg/util/template"
"k8s.io/kubernetes/pkg/version/verflag"
"github.com/spf13/pflag"
@@ -205,7 +205,7 @@ Servers
Call '{{.Name}} --make-symlinks' to create symlinks for each server in the local directory.
Call '{{.Name}} <server> --help' for help on a specific server.
`
util.ExecuteTemplate(hk.Out(), tt, hk)
utiltemplate.ExecuteTemplate(hk.Out(), tt, hk)
}
// MakeSymlinks will create a symlink for each registered hyperkube server in the local directory.

View File

@@ -21,7 +21,7 @@ import (
"strings"
"k8s.io/apiserver/pkg/util/flag"
"k8s.io/kubernetes/pkg/util"
utiltemplate "k8s.io/kubernetes/pkg/util/template"
"github.com/spf13/pflag"
)
@@ -49,7 +49,7 @@ func (s *Server) Usage() error {
Available Flags:
{{.Flags.FlagUsages}}`
return util.ExecuteTemplate(s.hk.Out(), tt, s)
return utiltemplate.ExecuteTemplate(s.hk.Out(), tt, s)
}
// Name returns the name of the command as derived from the usage line.