Skip to content

K
k3s
Commit 391e61bd authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson
Browse files
Options

Use admin kubeconfig instead of supervisor for etcd snapshot CLI

Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent bd9dad87
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
pkg/cli/etcdsnapshot/etcd_snapshot.go
View file @ 391e61bd
...@@ -64,7 +64,7 @@ func commandSetup(app *cli.Context, cfg *cmds.Server, sc *server.Config) error { ...@@ -64,7 +64,7 @@ func commandSetup(app *cli.Context, cfg *cmds.Server, sc *server.Config) error {
sc.ControlConfig.Runtime.ETCDServerCA = filepath.Join(dataDir, "tls", "etcd", "server-ca.crt") sc.ControlConfig.Runtime.ETCDServerCA = filepath.Join(dataDir, "tls", "etcd", "server-ca.crt")
sc.ControlConfig.Runtime.ClientETCDCert = filepath.Join(dataDir, "tls", "etcd", "client.crt") sc.ControlConfig.Runtime.ClientETCDCert = filepath.Join(dataDir, "tls", "etcd", "client.crt")
sc.ControlConfig.Runtime.ClientETCDKey = filepath.Join(dataDir, "tls", "etcd", "client.key") sc.ControlConfig.Runtime.ClientETCDKey = filepath.Join(dataDir, "tls", "etcd", "client.key")
sc.ControlConfig.Runtime.KubeConfigSupervisor = filepath.Join(dataDir, "cred", "supervisor.kubeconfig") sc.ControlConfig.Runtime.KubeConfigAdmin = filepath.Join(dataDir, "cred", "admin.kubeconfig")
return nil return nil
} }
...@@ -110,7 +110,7 @@ func save(app *cli.Context, cfg *cmds.Server) error { ...@@ -110,7 +110,7 @@ func save(app *cli.Context, cfg *cmds.Server) error {
return err return err
} }
sc, err := server.NewContext(ctx, serverConfig.ControlConfig.Runtime.KubeConfigSupervisor) sc, err := server.NewContext(ctx, serverConfig.ControlConfig.Runtime.KubeConfigAdmin)
if err != nil { if err != nil {
return err return err
} }
...@@ -144,7 +144,7 @@ func delete(app *cli.Context, cfg *cmds.Server) error { ...@@ -144,7 +144,7 @@ func delete(app *cli.Context, cfg *cmds.Server) error {
return err return err
} }
sc, err := server.NewContext(ctx, serverConfig.ControlConfig.Runtime.KubeConfigSupervisor) sc, err := server.NewContext(ctx, serverConfig.ControlConfig.Runtime.KubeConfigAdmin)
if err != nil { if err != nil {
return err return err
} }
...@@ -250,7 +250,7 @@ func prune(app *cli.Context, cfg *cmds.Server) error { ...@@ -250,7 +250,7 @@ func prune(app *cli.Context, cfg *cmds.Server) error {
return err return err
} }
sc, err := server.NewContext(ctx, serverConfig.ControlConfig.Runtime.KubeConfigSupervisor) sc, err := server.NewContext(ctx, serverConfig.ControlConfig.Runtime.KubeConfigAdmin)
if err != nil { if err != nil {
return err return err
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment