From 70b33409de675577f4e44d81f0deeb3bf48e2dfb Mon Sep 17 00:00:00 2001 From: SataQiu Date: Mon, 27 Feb 2023 12:19:31 +0800 Subject: [PATCH] kubeadm: modify '--config' flag from required to optional for 'kubeadm kubeconfig user' --- cmd/kubeadm/app/cmd/kubeconfig.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cmd/kubeadm/app/cmd/kubeconfig.go b/cmd/kubeadm/app/cmd/kubeconfig.go index db39637c961..baf1bc16bec 100644 --- a/cmd/kubeadm/app/cmd/kubeconfig.go +++ b/cmd/kubeadm/app/cmd/kubeconfig.go @@ -20,7 +20,6 @@ import ( "io" "time" - "github.com/pkg/errors" "github.com/spf13/cobra" "k8s.io/klog/v2" @@ -43,6 +42,9 @@ var ( `) userKubeconfigExample = cmdutil.Examples(` + # Output a kubeconfig file for an additional user named foo + kubeadm kubeconfig user --client-name=foo + # Output a kubeconfig file for an additional user named foo using a kubeadm config file bar kubeadm kubeconfig user --client-name=foo --config=bar `) @@ -79,9 +81,6 @@ func newCmdUserKubeConfig(out io.Writer) *cobra.Command { Long: userKubeconfigLongDesc, Example: userKubeconfigExample, RunE: func(cmd *cobra.Command, args []string) error { - if len(cfgPath) == 0 { - return errors.New("the kubeadm configuration path cannot be empty") - } // This call returns the ready-to-use configuration based on the defaults populated by flags internalCfg, err := configutil.LoadOrDefaultInitConfiguration(cfgPath, initCfg, clusterCfg) if err != nil { @@ -114,7 +113,6 @@ func newCmdUserKubeConfig(out io.Writer) *cobra.Command { cmd.Flags().StringSliceVar(&organizations, "org", organizations, "The organizations of the client certificate. It will be used as the O if client certificates are created") cmd.Flags().DurationVar(&validityPeriod, "validity-period", kubeadmconstants.CertificateValidity, "The validity period of the client certificate. It is an offset from the current time.") - cmd.MarkFlagRequired(options.CfgPath) cmd.MarkFlagRequired("client-name") return cmd }