apps/kubevpn
1
0
Fork 0
mirror of https://github.com/kubenetworks/kubevpn.git synced 2025-12-24 11:51:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove deprecated options of config flags (#560)

Browse Source
This commit is contained in:
naison
2025-04-24 22:44:20 +08:00
committed by GitHub
parent 6a8a197f48
commit 28657e3832
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubevpn/cmds/root.go
View File

@@ -31,7 +31,7 @@ func NewKubeVPNCommand() *cobra.Command {
} }
flags := cmd.PersistentFlags() flags := cmd.PersistentFlags()
configFlags := genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag() configFlags := genericclioptions.NewConfigFlags(true)
configFlags.WrapConfigFn = func(c *rest.Config) *rest.Config { configFlags.WrapConfigFn = func(c *rest.Config) *rest.Config {
if path, ok := os.LookupEnv(config.EnvSSHJump); ok { if path, ok := os.LookupEnv(config.EnvSSHJump); ok {
kubeconfigBytes, err := os.ReadFile(path) kubeconfigBytes, err := os.ReadFile(path)

2
cmd/kubevpn/cmds/status.go
View File

@@ -236,7 +236,7 @@ func GetClusterIDByConfig(cmd *cobra.Command, config Config) (string, error) {
var sshConf = &pkgssh.SshConfig{} var sshConf = &pkgssh.SshConfig{}
pkgssh.AddSshFlags(flags, sshConf) pkgssh.AddSshFlags(flags, sshConf)
handler.AddExtraRoute(flags, &handler.ExtraRouteInfo{}) handler.AddExtraRoute(flags, &handler.ExtraRouteInfo{})
configFlags := genericclioptions.NewConfigFlags(false).WithDeprecatedPasswordFlag() configFlags := genericclioptions.NewConfigFlags(true)
configFlags.AddFlags(flags) configFlags.AddFlags(flags)
matchVersionFlags := cmdutil.NewMatchVersionFlags(&warp{ConfigFlags: configFlags}) matchVersionFlags := cmdutil.NewMatchVersionFlags(&warp{ConfigFlags: configFlags})
matchVersionFlags.AddFlags(flags) matchVersionFlags.AddFlags(flags)

2
pkg/handler/clone.go
View File

@@ -107,7 +107,7 @@ func (d *CloneOptions) InitClient(f cmdutil.Factory) (err error) {
} }
return return
} }
configFlags := genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag() configFlags := genericclioptions.NewConfigFlags(true)
configFlags.KubeConfig = pointer.String(d.TargetKubeconfig) configFlags.KubeConfig = pointer.String(d.TargetKubeconfig)
configFlags.Namespace = pointer.String(d.TargetNamespace) configFlags.Namespace = pointer.String(d.TargetNamespace)
matchVersionFlags := cmdutil.NewMatchVersionFlags(configFlags) matchVersionFlags := cmdutil.NewMatchVersionFlags(configFlags)

2
pkg/ssh/ssh.go
View File

@@ -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")) { if conf.RemoteKubeconfig != "" || (flags != nil && flags.Changed("remote-kubeconfig")) {
var stdout []byte var stdout []byte

2
pkg/util/cidr_test.go
View File

@@ -30,7 +30,7 @@ var (
func before() { func before() {
var err error var err error
configFlags := genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag() configFlags := genericclioptions.NewConfigFlags(true)
f = util.NewFactory(util.NewMatchVersionFlags(configFlags)) f = util.NewFactory(util.NewMatchVersionFlags(configFlags))
if restconfig, err = f.ToRESTConfig(); err != nil { if restconfig, err = f.ToRESTConfig(); err != nil {

4
pkg/util/ns.go
View File

@@ -144,7 +144,7 @@ func ConvertToTempKubeconfigFile(kubeconfigBytes []byte) (string, error) {
} }
func InitFactory(kubeconfigBytes string, ns string) cmdutil.Factory { 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 { configFlags.WrapConfigFn = func(c *rest.Config) *rest.Config {
if path, ok := os.LookupEnv(config.EnvSSHJump); ok { if path, ok := os.LookupEnv(config.EnvSSHJump); ok {
bytes, err := os.ReadFile(path) 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 { func InitFactoryByPath(kubeconfig string, ns string) cmdutil.Factory {
configFlags := genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag() configFlags := genericclioptions.NewConfigFlags(true)
configFlags.KubeConfig = pointer.String(kubeconfig) configFlags.KubeConfig = pointer.String(kubeconfig)
configFlags.Namespace = pointer.String(ns) configFlags.Namespace = pointer.String(ns)
matchVersionFlags := cmdutil.NewMatchVersionFlags(configFlags) matchVersionFlags := cmdutil.NewMatchVersionFlags(configFlags)

2
pkg/util/ns_test.go
View File

@@ -68,7 +68,7 @@ current-context: localhost`
} }
for _, data := range testData { for _, data := range testData {
configFlags := genericclioptions.NewConfigFlags(false) configFlags := genericclioptions.NewConfigFlags(true)
configFlags.KubeConfig = ptr.To(temp.Name()) configFlags.KubeConfig = ptr.To(temp.Name())
configFlags.Context = ptr.To(data.Context) configFlags.Context = ptr.To(data.Context)
matchVersionFlags := cmdutil.NewMatchVersionFlags(configFlags) matchVersionFlags := cmdutil.NewMatchVersionFlags(configFlags)