diff --git a/cmd/kubevpn/cmds/root.go b/cmd/kubevpn/cmds/root.go index f8900d49..868b3f4d 100644 --- a/cmd/kubevpn/cmds/root.go +++ b/cmd/kubevpn/cmds/root.go @@ -31,7 +31,7 @@ func NewKubeVPNCommand() *cobra.Command { } flags := cmd.PersistentFlags() - configFlags := genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag() + configFlags := genericclioptions.NewConfigFlags(true) configFlags.WrapConfigFn = func(c *rest.Config) *rest.Config { if path, ok := os.LookupEnv(config.EnvSSHJump); ok { kubeconfigBytes, err := os.ReadFile(path) diff --git a/cmd/kubevpn/cmds/status.go b/cmd/kubevpn/cmds/status.go index 91312ba3..38cd27a8 100644 --- a/cmd/kubevpn/cmds/status.go +++ b/cmd/kubevpn/cmds/status.go @@ -236,7 +236,7 @@ func GetClusterIDByConfig(cmd *cobra.Command, config Config) (string, error) { var sshConf = &pkgssh.SshConfig{} pkgssh.AddSshFlags(flags, sshConf) handler.AddExtraRoute(flags, &handler.ExtraRouteInfo{}) - configFlags := genericclioptions.NewConfigFlags(false).WithDeprecatedPasswordFlag() + configFlags := genericclioptions.NewConfigFlags(true) configFlags.AddFlags(flags) matchVersionFlags := cmdutil.NewMatchVersionFlags(&warp{ConfigFlags: configFlags}) matchVersionFlags.AddFlags(flags) diff --git a/pkg/handler/clone.go b/pkg/handler/clone.go index f28b1007..4f87af4f 100644 --- a/pkg/handler/clone.go +++ b/pkg/handler/clone.go @@ -107,7 +107,7 @@ func (d *CloneOptions) InitClient(f cmdutil.Factory) (err error) { } return } - configFlags := genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag() + configFlags := genericclioptions.NewConfigFlags(true) configFlags.KubeConfig = pointer.String(d.TargetKubeconfig) configFlags.Namespace = pointer.String(d.TargetNamespace) matchVersionFlags := cmdutil.NewMatchVersionFlags(configFlags) diff --git a/pkg/ssh/ssh.go b/pkg/ssh/ssh.go index de2e41a9..3126560c 100644 --- a/pkg/ssh/ssh.go +++ b/pkg/ssh/ssh.go @@ -162,7 +162,7 @@ func SshJump(ctx context.Context, conf *SshConfig, flags *pflag.FlagSet, print b } }() - configFlags := genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag() + configFlags := genericclioptions.NewConfigFlags(true) if conf.RemoteKubeconfig != "" || (flags != nil && flags.Changed("remote-kubeconfig")) { var stdout []byte diff --git a/pkg/util/cidr_test.go b/pkg/util/cidr_test.go index f2d3399a..53216f55 100644 --- a/pkg/util/cidr_test.go +++ b/pkg/util/cidr_test.go @@ -30,7 +30,7 @@ var ( func before() { var err error - configFlags := genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag() + configFlags := genericclioptions.NewConfigFlags(true) f = util.NewFactory(util.NewMatchVersionFlags(configFlags)) if restconfig, err = f.ToRESTConfig(); err != nil { diff --git a/pkg/util/ns.go b/pkg/util/ns.go index 64f705ed..4a2fa738 100644 --- a/pkg/util/ns.go +++ b/pkg/util/ns.go @@ -144,7 +144,7 @@ func ConvertToTempKubeconfigFile(kubeconfigBytes []byte) (string, error) { } func InitFactory(kubeconfigBytes string, ns string) cmdutil.Factory { - configFlags := genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag() + configFlags := genericclioptions.NewConfigFlags(true) configFlags.WrapConfigFn = func(c *rest.Config) *rest.Config { if path, ok := os.LookupEnv(config.EnvSSHJump); ok { bytes, err := os.ReadFile(path) @@ -175,7 +175,7 @@ func InitFactory(kubeconfigBytes string, ns string) cmdutil.Factory { } func InitFactoryByPath(kubeconfig string, ns string) cmdutil.Factory { - configFlags := genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag() + configFlags := genericclioptions.NewConfigFlags(true) configFlags.KubeConfig = pointer.String(kubeconfig) configFlags.Namespace = pointer.String(ns) matchVersionFlags := cmdutil.NewMatchVersionFlags(configFlags) diff --git a/pkg/util/ns_test.go b/pkg/util/ns_test.go index f313703d..3b0c0bb0 100644 --- a/pkg/util/ns_test.go +++ b/pkg/util/ns_test.go @@ -68,7 +68,7 @@ current-context: localhost` } for _, data := range testData { - configFlags := genericclioptions.NewConfigFlags(false) + configFlags := genericclioptions.NewConfigFlags(true) configFlags.KubeConfig = ptr.To(temp.Name()) configFlags.Context = ptr.To(data.Context) matchVersionFlags := cmdutil.NewMatchVersionFlags(configFlags)