From 42bc5612ff84be571efca888819dc0878599fb55 Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Tue, 1 Feb 2022 10:45:00 -0800 Subject: [PATCH] [Release-1.21] Add `--server flag` to `k3s secrets-encrypt` (#5054) * Add server flag to access nonlocal/nondefault k3s server (#5016) Signed-off-by: Derek Nola * Update gitignore Signed-off-by: Derek Nola --- .gitignore | 2 +- pkg/cli/cmds/secrets_encrypt.go | 8 ++++++++ pkg/cli/secretsencrypt/secrets_encrypt.go | 3 --- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1d249ea28f..c223606b34 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ /.tags /.idea /.trash-cache -/.vagrant +.vagrant/ /.kube /.cache /.docker diff --git a/pkg/cli/cmds/secrets_encrypt.go b/pkg/cli/cmds/secrets_encrypt.go index e507e95306..337fe50594 100644 --- a/pkg/cli/cmds/secrets_encrypt.go +++ b/pkg/cli/cmds/secrets_encrypt.go @@ -1,6 +1,7 @@ package cmds import ( + "github.com/rancher/k3s/pkg/version" "github.com/urfave/cli" ) @@ -9,6 +10,13 @@ const SecretsEncryptCommand = "secrets-encrypt" var EncryptFlags = []cli.Flag{ DataDirFlag, ServerToken, + cli.StringFlag{ + Name: "server, s", + Usage: "(cluster) Server to connect to", + EnvVar: version.ProgramUpper + "_URL", + Value: "https://127.0.0.1:6443", + Destination: &ServerConfig.ServerURL, + }, } func NewSecretsEncryptCommand(action func(*cli.Context) error, subcommands []cli.Command) cli.Command { diff --git a/pkg/cli/secretsencrypt/secrets_encrypt.go b/pkg/cli/secretsencrypt/secrets_encrypt.go index e49d7b3b54..034e9eaff5 100644 --- a/pkg/cli/secretsencrypt/secrets_encrypt.go +++ b/pkg/cli/secretsencrypt/secrets_encrypt.go @@ -31,9 +31,6 @@ func commandPrep(app *cli.Context, cfg *cmds.Server) (config.Control, *clientacc if err != nil { return controlConfig, nil, err } - if cfg.ServerURL == "" { - cfg.ServerURL = "https://127.0.0.1:6443" - } if cfg.Token == "" { fp := filepath.Join(controlConfig.DataDir, "token")