WIP Remove global StatusSocket variable

...and use the canonical persistent flag set in the status sub-command.

The shared usage of the variable makes the registration order of the
commands change the flag for all of them. This way, the status-socket
flag is no longer the empty string, even if it hasn't been set, which
breaks the sane defaulting.

Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com>

cmd/status/status.go

@@ -22,7 +22,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"path/filepath"
 
 	"github.com/k0sproject/k0s/pkg/component/status"
 	"github.com/k0sproject/k0s/pkg/config"
@@ -57,7 +56,7 @@ func NewStatusCmd() *cobra.Command {
 	}
 
 	cmd.PersistentFlags().StringVarP(&output, "out", "o", "", "sets type of output to json or yaml")
-	cmd.PersistentFlags().StringVar(&config.StatusSocket, "status-socket", filepath.Join(config.K0sVars.RunDir, "status.sock"), "Full file path to the socket file.")
+	cmd.PersistentFlags().AddFlagSet(config.GetPersistentFlagSet())
 	cmd.AddCommand(NewStatusSubCmdComponents())
 	return cmd
 }

cmd/token/create.go

@@ -91,8 +91,8 @@ k0s token create --role worker --expiry 10m  //sets expiration time to 10 minute
 			if err != nil {
 				return err
 			}
-			fmt.Fprintln(cmd.OutOrStdout(), bootstrapToken)
-			return nil
+			_, err = fmt.Fprintln(cmd.OutOrStdout(), bootstrapToken)
+			return err
 		},
 	}
 	// append flags

pkg/config/cli.go

@@ -36,7 +36,6 @@ var (
 	CfgFile        string
 	Debug          bool
 	DebugListenOn  string
-	StatusSocket   string
 	K0sVars        CfgVars
 	workerOpts     WorkerOptions
 	Verbose        bool
@@ -199,7 +198,7 @@ func GetPersistentFlagSet() *pflag.FlagSet {
 	flagset.BoolVarP(&Debug, "debug", "d", false, "Debug logging (default: false)")
 	flagset.BoolVarP(&Verbose, "verbose", "v", false, "Verbose logging (default: false)")
 	flagset.String("data-dir", constant.DataDirDefault, "Data Directory for k0s. DO NOT CHANGE for an existing setup, things will break!")
-	flagset.StringVar(&StatusSocket, "status-socket", "", "Full file path to the socket file. (default: <rundir>/status.sock)")
+	flagset.String("status-socket", "", "Full file path to the socket file. (default: <rundir>/status.sock)")
 	flagset.StringVar(&DebugListenOn, "debugListenOn", ":6060", "Http listenOn for Debug pprof handler")
 	return flagset
 }