From b9816b12315d5fd7330c96f88338547ad94cd48a Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Tue, 5 Feb 2019 03:06:25 +0200 Subject: [PATCH] kubeadm: remove warning about config usage --- cmd/kubeadm/app/cmd/alpha/selfhosting.go | 2 +- cmd/kubeadm/app/cmd/config.go | 2 +- cmd/kubeadm/app/cmd/init.go | 5 +---- cmd/kubeadm/app/cmd/token.go | 4 ++-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/cmd/kubeadm/app/cmd/alpha/selfhosting.go b/cmd/kubeadm/app/cmd/alpha/selfhosting.go index 8b56bf9a93..31329bb4cb 100644 --- a/cmd/kubeadm/app/cmd/alpha/selfhosting.go +++ b/cmd/kubeadm/app/cmd/alpha/selfhosting.go @@ -141,7 +141,7 @@ func getSelfhostingSubCommand(in io.Reader) *cobra.Command { // Add flags to the command // flags bound to the configuration object cmd.Flags().StringVar(&cfg.CertificatesDir, "cert-dir", cfg.CertificatesDir, `The path where certificates are stored`) - cmd.Flags().StringVar(&cfgPath, "config", cfgPath, "Path to a kubeadm config file. WARNING: Usage of a configuration file is experimental") + options.AddConfigFlag(cmd.Flags(), &cfgPath) cmd.Flags().BoolVarP( &certsInSecrets, "store-certs-in-secrets", "s", diff --git a/cmd/kubeadm/app/cmd/config.go b/cmd/kubeadm/app/cmd/config.go index 0f7e43c66a..5fa6acbde4 100644 --- a/cmd/kubeadm/app/cmd/config.go +++ b/cmd/kubeadm/app/cmd/config.go @@ -329,7 +329,7 @@ func NewCmdConfigUploadFromFile(out io.Writer, kubeConfigFile *string) *cobra.Co kubeadmutil.CheckErr(err) }, } - cmd.Flags().StringVar(&cfgPath, "config", "", "Path to a kubeadm config file. WARNING: Usage of a configuration file is experimental.") + options.AddConfigFlag(cmd.Flags(), &cfgPath) return cmd } diff --git a/cmd/kubeadm/app/cmd/init.go b/cmd/kubeadm/app/cmd/init.go index 45ac714402..32633ee382 100644 --- a/cmd/kubeadm/app/cmd/init.go +++ b/cmd/kubeadm/app/cmd/init.go @@ -238,10 +238,7 @@ func AddInitConfigFlags(flagSet *flag.FlagSet, cfg *kubeadmapiv1beta1.InitConfig // AddInitOtherFlags adds init flags that are not bound to a configuration file to the given flagset func AddInitOtherFlags(flagSet *flag.FlagSet, cfgPath *string, skipTokenPrint, dryRun *bool, ignorePreflightErrors *[]string) { - flagSet.StringVar( - cfgPath, options.CfgPath, *cfgPath, - "Path to kubeadm config file. WARNING: Usage of a configuration file is experimental.", - ) + options.AddConfigFlag(flagSet, cfgPath) flagSet.StringSliceVar( ignorePreflightErrors, options.IgnorePreflightErrors, *ignorePreflightErrors, "A list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedUser,Swap'. Value 'all' ignores errors from all checks.", diff --git a/cmd/kubeadm/app/cmd/token.go b/cmd/kubeadm/app/cmd/token.go index abba6fab10..4c3933f4de 100644 --- a/cmd/kubeadm/app/cmd/token.go +++ b/cmd/kubeadm/app/cmd/token.go @@ -129,8 +129,8 @@ func NewCmdToken(out io.Writer, errW io.Writer) *cobra.Command { kubeadmutil.CheckErr(err) }, } - createCmd.Flags().StringVar(&cfgPath, - "config", cfgPath, "Path to kubeadm config file (WARNING: Usage of a configuration file is experimental)") + + options.AddConfigFlag(createCmd.Flags(), &cfgPath) createCmd.Flags().BoolVar(&printJoinCommand, "print-join-command", false, "Instead of printing only the token, print the full 'kubeadm join' flag needed to join the cluster using the token.") bto.AddTTLFlagWithName(createCmd.Flags(), "ttl")