From b837f8d96f44babc5a79f65e011b04aee24cb899 Mon Sep 17 00:00:00 2001 From: SataQiu Date: Wed, 10 Jul 2019 18:45:28 +0800 Subject: [PATCH] kubeadm: cleanup the code about cobra --- cmd/kubeadm/app/cmd/cmd.go | 12 ++---------- cmd/kubeadm/app/cmd/config.go | 2 +- cmd/kubeadm/app/cmd/options/generic.go | 8 ++++++++ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmd/kubeadm/app/cmd/cmd.go b/cmd/kubeadm/app/cmd/cmd.go index c27a8691e1d..a67087dd63c 100644 --- a/cmd/kubeadm/app/cmd/cmd.go +++ b/cmd/kubeadm/app/cmd/cmd.go @@ -21,8 +21,8 @@ import ( "github.com/lithammer/dedent" "github.com/spf13/cobra" - "github.com/spf13/pflag" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/alpha" + "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/upgrade" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" // Register the kubeadm configuration types because CLI flag generation @@ -90,15 +90,7 @@ func NewKubeadmCommand(in io.Reader, out, err io.Writer) *cobra.Command { cmds.AddCommand(upgrade.NewCmdUpgrade(out)) cmds.AddCommand(alpha.NewCmdAlpha(in, out)) - AddKubeadmOtherFlags(cmds.PersistentFlags(), &rootfsPath) + options.AddKubeadmOtherFlags(cmds.PersistentFlags(), &rootfsPath) return cmds } - -// AddKubeadmOtherFlags adds flags that are not bound to a configuration file to the given flagset -func AddKubeadmOtherFlags(flagSet *pflag.FlagSet, rootfsPath *string) { - flagSet.StringVar( - rootfsPath, "rootfs", *rootfsPath, - "[EXPERIMENTAL] The path to the 'real' host root filesystem.", - ) -} diff --git a/cmd/kubeadm/app/cmd/config.go b/cmd/kubeadm/app/cmd/config.go index dd0ff2a168f..b8265bca9fc 100644 --- a/cmd/kubeadm/app/cmd/config.go +++ b/cmd/kubeadm/app/cmd/config.go @@ -538,5 +538,5 @@ func AddImagesCommonConfigFlags(flagSet *flag.FlagSet, cfg *kubeadmapiv1beta2.Cl options.AddKubernetesVersionFlag(flagSet, &cfg.KubernetesVersion) options.AddFeatureGatesStringFlag(flagSet, featureGatesString) options.AddImageMetaFlags(flagSet, &cfg.ImageRepository) - flagSet.StringVar(cfgPath, "config", *cfgPath, "Path to kubeadm config file.") + options.AddConfigFlag(flagSet, cfgPath) } diff --git a/cmd/kubeadm/app/cmd/options/generic.go b/cmd/kubeadm/app/cmd/options/generic.go index b1120783c43..ce960ea7d25 100644 --- a/cmd/kubeadm/app/cmd/options/generic.go +++ b/cmd/kubeadm/app/cmd/options/generic.go @@ -80,3 +80,11 @@ func AddKubernetesVersionFlag(fs *pflag.FlagSet, kubernetesVersion *string) { `Choose a specific Kubernetes version for the control plane.`, ) } + +// AddKubeadmOtherFlags adds flags that are not bound to a configuration file to the given flagset +func AddKubeadmOtherFlags(flagSet *pflag.FlagSet, rootfsPath *string) { + flagSet.StringVar( + rootfsPath, "rootfs", *rootfsPath, + "[EXPERIMENTAL] The path to the 'real' host root filesystem.", + ) +}