Skip to content

K
k3s
Commit 6af50b95 authored by Marques Johansson's avatar Marques Johansson Committed by Lubomir I. Ivanov
Browse files
Options

Restore machine readability to the print-join-command output

The output of `kubeadm token create --print-join-command` should be usable by batch scripts. This issue was pointed out in: https://github.com/kubernetes/kubeadm/issues/1454
parent 5052da0e
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
cmd/kubeadm/app/cmd/token.go
View file @ 6af50b95
...@@ -225,7 +225,7 @@ func RunCreateToken(out io.Writer, client clientset.Interface, cfgPath string, c ...@@ -225,7 +225,7 @@ func RunCreateToken(out io.Writer, client clientset.Interface, cfgPath string, c
return err return err
} }
// if --print-join-command was specified, print the full `kubeadm join` command // if --print-join-command was specified, print a machine-readable full `kubeadm join` command
// otherwise, just print the token // otherwise, just print the token
if printJoinCommand { if printJoinCommand {
skipTokenPrint := false skipTokenPrint := false
...@@ -233,6 +233,8 @@ func RunCreateToken(out io.Writer, client clientset.Interface, cfgPath string, c ...@@ -233,6 +233,8 @@ func RunCreateToken(out io.Writer, client clientset.Interface, cfgPath string, c
if err != nil { if err != nil {
return errors.Wrap(err, "failed to get join command") return errors.Wrap(err, "failed to get join command")
} }
joinCommand = strings.ReplaceAll(joinCommand, "\\\n", "")
joinCommand = strings.ReplaceAll(joinCommand, "\t", "")
fmt.Fprintln(out, joinCommand) fmt.Fprintln(out, joinCommand)
} else { } else {
fmt.Fprintln(out, internalcfg.BootstrapTokens[0].Token.String()) fmt.Fprintln(out, internalcfg.BootstrapTokens[0].Token.String())
......
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