github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Move flag into sub pkg

Browse Source
This commit is contained in:
harry 2016-03-11 13:33:16 +08:00 committed by Harry Zhang
parent 5b359213b1
commit f19d59cf35
17 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/addons/dns/kube2sky/kube2sky.go
View File

@ -46,7 +46,7 @@ import (
kframework "k8s.io/kubernetes/pkg/controller/framework"
kselector "k8s.io/kubernetes/pkg/fields"
etcdutil "k8s.io/kubernetes/pkg/storage/etcd/util"
"k8s.io/kubernetes/pkg/util"
utilflag "k8s.io/kubernetes/pkg/util/flag"
"k8s.io/kubernetes/pkg/util/validation"
"k8s.io/kubernetes/pkg/util/wait"
)
@ -634,7 +634,7 @@ func setupHealthzHandlers(ks *kube2sky) {
}
func main() {
flag.CommandLine.SetNormalizeFunc(util.WarnWordSepNormalizeFunc)
flag.CommandLine.SetNormalizeFunc(utilflag.WarnWordSepNormalizeFunc)
flag.Parse()
var err error
setupSignalHandlers()

3
cmd/hyperkube/hyperkube.go
View File

@ -29,6 +29,7 @@ import (
"runtime"
"k8s.io/kubernetes/pkg/util"
utilflag "k8s.io/kubernetes/pkg/util/flag"
"k8s.io/kubernetes/pkg/version/verflag"
"github.com/spf13/pflag"
@ -72,7 +73,7 @@ func (hk *HyperKube) Flags() *pflag.FlagSet {
if hk.baseFlags == nil {
hk.baseFlags = pflag.NewFlagSet(hk.Name, pflag.ContinueOnError)
hk.baseFlags.SetOutput(ioutil.Discard)
hk.baseFlags.SetNormalizeFunc(util.WordSepNormalizeFunc)
hk.baseFlags.SetNormalizeFunc(utilflag.WordSepNormalizeFunc)
hk.baseFlags.BoolVarP(&hk.helpFlagVal, "help", "h", false, "help for "+hk.Name)
// These will add all of the "global" flags (defined with both the

3
cmd/hyperkube/server.go
View File

@ -23,6 +23,7 @@ import (
"strings"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/flag"
"github.com/spf13/pflag"
)
@ -70,7 +71,7 @@ func (s *Server) Flags() *pflag.FlagSet {
if s.flags == nil {
s.flags = pflag.NewFlagSet(s.Name(), pflag.ContinueOnError)
s.flags.SetOutput(ioutil.Discard)
s.flags.SetNormalizeFunc(util.WordSepNormalizeFunc)
s.flags.SetNormalizeFunc(flag.WordSepNormalizeFunc)
}
return s.flags
}

3
cmd/integration/integration.go
View File

@ -55,6 +55,7 @@ import (
"k8s.io/kubernetes/pkg/master"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/flag"
utilnet "k8s.io/kubernetes/pkg/util/net"
utilruntime "k8s.io/kubernetes/pkg/util/runtime"
"k8s.io/kubernetes/pkg/util/sets"
@ -972,7 +973,7 @@ func main() {
gruntime.GOMAXPROCS(gruntime.NumCPU())
addFlags(pflag.CommandLine)
util.InitFlags()
flag.InitFlags()
utilruntime.ReallyCrash = true
util.InitLogs()
defer util.FlushLogs()

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

@ -28,6 +28,7 @@ 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/version/verflag"
"github.com/spf13/pflag"
@ -40,7 +41,7 @@ func main() {
s := options.NewAPIServer()
s.AddFlags(pflag.CommandLine)
util.InitFlags()
flag.InitFlags()
util.InitLogs()
defer util.FlushLogs()

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

@ -29,6 +29,7 @@ import (
"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/version/verflag"
"github.com/spf13/pflag"
@ -43,7 +44,7 @@ func main() {
s := options.NewCMServer()
s.AddFlags(pflag.CommandLine)
util.InitFlags()
flag.InitFlags()
util.InitLogs()
defer util.FlushLogs()

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

@ -25,6 +25,7 @@ import (
"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/version/verflag"
"github.com/spf13/pflag"
@ -39,7 +40,7 @@ func main() {
config := options.NewProxyConfig()
config.AddFlags(pflag.CommandLine)
util.InitFlags()
flag.InitFlags()
util.InitLogs()
defer util.FlushLogs()

3
cmd/kubelet/kubelet.go
View File

@ -28,6 +28,7 @@ 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/version/verflag"
"github.com/spf13/pflag"
@ -38,7 +39,7 @@ func main() {
s := options.NewKubeletServer()
s.AddFlags(pflag.CommandLine)
util.InitFlags()
flag.InitFlags()
util.InitLogs()
defer util.FlushLogs()

4
cmd/kubemark/hollow-node.go
View File

@ -32,7 +32,7 @@ import (
"k8s.io/kubernetes/pkg/kubelet/dockertools"
"k8s.io/kubernetes/pkg/kubemark"
proxyconfig "k8s.io/kubernetes/pkg/proxy/config"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/flag"
fakeiptables "k8s.io/kubernetes/pkg/util/iptables/testing"
"k8s.io/kubernetes/pkg/util/sets"
@ -85,7 +85,7 @@ func main() {
config := HollowNodeConfig{}
config.addFlags(pflag.CommandLine)
util.InitFlags()
flag.InitFlags()
if !knownMorphs.Has(config.Morph) {
glog.Fatalf("Unknown morph: %v. Allowed values: %v", config.Morph, knownMorphs.List())

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

@ -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/version/verflag"
"k8s.io/kubernetes/contrib/mesos/pkg/controllermanager"
@ -40,7 +41,7 @@ func main() {
s := controllermanager.NewCMServer()
s.AddFlags(pflag.CommandLine)
util.InitFlags()
flag.InitFlags()
util.InitLogs()
defer util.FlushLogs()

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

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

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

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

4
pkg/kubectl/cmd/cmd.go
View File

@ -23,7 +23,7 @@ import (
cmdconfig "k8s.io/kubernetes/pkg/kubectl/cmd/config"
"k8s.io/kubernetes/pkg/kubectl/cmd/rollout"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/flag"
"github.com/spf13/cobra"
)
@ -156,7 +156,7 @@ Find more information at https://github.com/kubernetes/kubernetes.`,
f.BindExternalFlags(cmds.PersistentFlags())
// From this point and forward we get warnings on flags that contain "_" separators
cmds.SetGlobalNormalizationFunc(util.WarnWordSepNormalizeFunc)
cmds.SetGlobalNormalizationFunc(flag.WarnWordSepNormalizeFunc)
cmds.AddCommand(NewCmdGet(f, out))
cmds.AddCommand(NewCmdDescribe(f, out))

6
pkg/kubectl/cmd/util/factory.go
View File

@ -53,7 +53,7 @@ import (
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime/serializer/json"
"k8s.io/kubernetes/pkg/util"
utilflag "k8s.io/kubernetes/pkg/util/flag"
)
const (
@ -186,7 +186,7 @@ func NewFactory(optionalClientConfig clientcmd.ClientConfig) *Factory {
mapper := kubectl.ShortcutExpander{RESTMapper: api.RESTMapper}
flags := pflag.NewFlagSet("", pflag.ContinueOnError)
flags.SetNormalizeFunc(util.WarnWordSepNormalizeFunc) // Warn for "_" flags
flags.SetNormalizeFunc(utilflag.WarnWordSepNormalizeFunc) // Warn for "_" flags
clientConfig := optionalClientConfig
if optionalClientConfig == nil {
@ -639,7 +639,7 @@ func (f *Factory) BindFlags(flags *pflag.FlagSet) {
// Normalize all flags that are coming from other packages or pre-configurations
// a.k.a. change all "_" to "-". e.g. glog package
flags.SetNormalizeFunc(util.WordSepNormalizeFunc)
flags.SetNormalizeFunc(utilflag.WordSepNormalizeFunc)
}
// BindCommonFlags adds any flags defined by external projects (not part of pflags)

4
pkg/kubectl/cmd/util/factory_test.go
View File

@ -38,7 +38,7 @@ import (
"k8s.io/kubernetes/pkg/client/unversioned/fake"
"k8s.io/kubernetes/pkg/kubectl"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/flag"
)
func TestNewFactoryDefaultFlagBindings(t *testing.T) {
@ -198,7 +198,7 @@ func TestCanBeExposed(t *testing.T) {
func TestFlagUnderscoreRenaming(t *testing.T) {
factory := NewFactory(nil)
factory.flags.SetNormalizeFunc(util.WordSepNormalizeFunc)
factory.flags.SetNormalizeFunc(flag.WordSepNormalizeFunc)
factory.flags.Bool("valid_flag", false, "bool value")
// In case of failure of this test check this PR: spf13/pflag#23

2
pkg/util/flags.go → pkg/util/flag/flags.go
View File

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

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

@ -21,6 +21,7 @@ import (
"k8s.io/kubernetes/pkg/healthz"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/flag"
"k8s.io/kubernetes/pkg/version/verflag"
"k8s.io/kubernetes/plugin/cmd/kube-scheduler/app"
"k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/options"
@ -37,7 +38,7 @@ func main() {
s := options.NewSchedulerServer()
s.AddFlags(pflag.CommandLine)
util.InitFlags()
flag.InitFlags()
util.InitLogs()
defer util.FlushLogs()