Don't use server and token values from config file for etcd-snapshot commands

Fixes an issue where running etcd-snapshot commands on a node that has a server address set in the config will manage snapshots on that server, instead of on the local node as intended. Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

Don't use server and token values from config file for etcd-snapshot commands
37830fe1 · Brad Davidson · Brad Davidson · cb6bf74b · 37830fe1 · 37830fe1
Commit 37830fe1 authored Jul 14, 2024 by Brad Davidson Committed by Brad Davidson Jul 15, 2024
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

etcd_snapshot.go pkg/cli/cmds/etcd_snapshot.go +7 -4

defaultparser_test.go pkg/configfilearg/defaultparser_test.go +1 -1

No files found.
--- a/pkg/cli/cmds/etcd_snapshot.go
+++ b/pkg/cli/cmds/etcd_snapshot.go
@@ -21,11 +21,14 @@ var EtcdSnapshotFlags = []cli.Flag{
 		Destination: &AgentConfig.NodeName,
 	},
 	DataDirFlag,
-	ServerToken,
 	&cli.StringFlag{
-		Name:        "server, s",
+		Name:        "etcd-token,t",
-		Usage:       "(cluster) Server to connect to",
+		Usage:       "(cluster) Shared secret used to authenticate to etcd server",
-		EnvVar:      version.ProgramUpper + "_URL",
+		Destination: &ServerConfig.Token,
+	},
+	&cli.StringFlag{
+		Name:        "etcd-server, s",
+		Usage:       "(cluster) Server with etcd role to connect to for snapshot management operations",
 		Value:       "https://127.0.0.1:6443",
 		Destination: &ServerConfig.ServerURL,
 	},

--- a/pkg/configfilearg/defaultparser_test.go
+++ b/pkg/configfilearg/defaultparser_test.go
@@ -48,7 +48,7 @@ func Test_UnitMustParse(t *testing.T) {
 			name:   "Etcd-snapshot with config with known and unknown flags",
 			args:   []string{"k3s", "etcd-snapshot", "save"},
 			config: "./testdata/defaultdata.yaml",
-			want:   []string{"k3s", "etcd-snapshot", "save", "--token=12345", "--etcd-s3=true", "--etcd-s3-bucket=my-backup"},
+			want:   []string{"k3s", "etcd-snapshot", "save", "--etcd-s3=true", "--etcd-s3-bucket=my-backup"},
 		},
 		{
 			name: "Agent with known flags",