Expose status sub-command on all platforms

Signed-off-by: Kimmo Lehto <[email protected]>

Author: kke

cmd/root.go

@@ -15,6 +15,7 @@ import (
 	"github.com/k0sproject/k0s/cmd/kubeconfig"
 	"github.com/k0sproject/k0s/cmd/kubectl"
 	"github.com/k0sproject/k0s/cmd/start"
+	"github.com/k0sproject/k0s/cmd/status"
 	"github.com/k0sproject/k0s/cmd/stop"
 	"github.com/k0sproject/k0s/cmd/sysinfo"
 	"github.com/k0sproject/k0s/cmd/token"
@@ -46,6 +47,7 @@ func NewRootCmd() *cobra.Command {
 	cmd.AddCommand(kubectl.NewK0sKubectlCmd())
 	cmd.AddCommand(start.NewStartCmd())
 	cmd.AddCommand(stop.NewStopCmd())
+	cmd.AddCommand(status.NewStatusCmd())
 	cmd.AddCommand(sysinfo.NewSysinfoCmd())
 	cmd.AddCommand(token.NewTokenCmd())
 	cmd.AddCommand(validate.NewValidateCmd()) // hidden+deprecated

cmd/root_linux.go

@@ -9,7 +9,6 @@ import (
 	"github.com/k0sproject/k0s/cmd/keepalived"
 	"github.com/k0sproject/k0s/cmd/reset"
 	"github.com/k0sproject/k0s/cmd/restore"
-	"github.com/k0sproject/k0s/cmd/status"
 
 	"github.com/spf13/cobra"
 )
@@ -20,5 +19,4 @@ func addPlatformSpecificCommands(root *cobra.Command) {
 	root.AddCommand(keepalived.NewKeepalivedSetStateCmd()) // hidden
 	root.AddCommand(reset.NewResetCmd())
 	root.AddCommand(restore.NewRestoreCmd())
-	root.AddCommand(status.NewStatusCmd())
 }

cmd/status/status.go

@@ -1,5 +1,3 @@
-//go:build unix
-
 // SPDX-FileCopyrightText: 2021 k0s authors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -9,6 +7,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"runtime"
 
 	"github.com/k0sproject/k0s/cmd/internal"
 	"github.com/k0sproject/k0s/pkg/component/status"
@@ -51,7 +50,14 @@ func NewStatusCmd() *cobra.Command {
 
 	pflags := cmd.PersistentFlags()
 	debugFlags.AddToFlagSet(pflags)
-	pflags.String("status-socket", "", "Full file path to the socket file. (default: <rundir>/status.sock)")
+	var socketDefault string
+	if runtime.GOOS == "windows" {
+		socketDefault = status.DefaultSocketPath
+	} else {
+		socketDefault = "<rundir>/status.sock"
+	}
+
+	pflags.String("status-socket", "", "Full path to the k0s status socket (default: "+socketDefault+")")
 
 	cmd.AddCommand(NewStatusSubCmdComponents())
 

pkg/config/cfgvars.go

@@ -141,9 +141,18 @@ func NewCfgVars(cobraCmd command, dirs ...string) (*CfgVars, error) {
 		runDir = filepath.Join(dataDir, "run")
 	}
 
-	statusSocketPath := filepath.Join(runDir, "status.sock")
-	if runtime.GOOS != "windows" && euid == 0 {
-		statusSocketPath = constant.StatusSocketPathDefault
+	var statusSocketPath string
+	if cobraCmd != nil {
+		if val, err := cobraCmd.Flags().GetString("status-socket"); err == nil {
+			statusSocketPath = val
+		}
+	}
+	if statusSocketPath == "" {
+		if runtime.GOOS == "windows" || euid == 0 {
+			statusSocketPath = constant.StatusSocketPathDefault
+		} else {
+			statusSocketPath = filepath.Join(runDir, "status.sock")
+		}
 	}
 
 	certDir := filepath.Join(dataDir, "pki")