Reinstall already installed k0s to reconfigure installFlags

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

phase/gather_k0s_facts.go

@@ -271,9 +271,14 @@ func (p *GatherK0sFacts) investigateK0s(h *cluster.Host) error {
 
 	h.Metadata.NeedsUpgrade = p.needsUpgrade(h)
 
+	if len(status.Args) > 2 {
+		// status.Args contains the binary path and the role as the first two elements, which we can ignore here.
+		h.Metadata.K0sStatusArgs = status.Args[2:]
+	}
+
 	log.Infof("%s: is running k0s %s version %s", h, h.Role, h.Metadata.K0sRunningVersion)
 	if h.IsController() {
-		for _, a := range status.Args {
+		for _, a := range h.Metadata.K0sStatusArgs {
 			if strings.HasPrefix(a, "--enable-dynamic-config") && !strings.HasSuffix(a, "false") {
 				if !p.Config.Spec.K0s.DynamicConfig {
 					log.Warnf("%s: controller has dynamic config enabled, but spec.k0s.dynamicConfig was not set in configuration, proceeding in dynamic config mode", h)

phase/install_controllers.go

@@ -77,7 +77,6 @@ func (p *InstallControllers) After() error {
 			log.Warnf("%s: failed to invalidate worker join token: %v", p.leader, err)
 		}
 		_ = p.Wet(h, "overwrite k0s join token file", func() error {
-
 			if err := h.Configurer.WriteFile(h, h.K0sJoinTokenPath(), "# overwritten by k0sctl after join\n", "0600"); err != nil {
 				log.Warnf("%s: failed to overwrite the join token file at %s", h, h.K0sJoinTokenPath())
 			}
@@ -105,7 +104,6 @@ func (p *InstallControllers) Run() error {
 		}
 		return nil
 	})
-
 	if err != nil {
 		return err
 	}
@@ -162,6 +160,7 @@ func (p *InstallControllers) Run() error {
 			return err
 		}
 		h.Metadata.K0sInstalled = true
+		h.Metadata.K0sRunningVersion = p.Config.Spec.K0s.Version
 
 		if p.IsWet() {
 			if len(h.Environment) > 0 {

phase/upgrade_controllers.go

@@ -119,6 +119,8 @@ func (p *UpgradeControllers) Run() error {
 				return fmt.Errorf("kube api did not become ready: %w", err)
 			}
 		}
+
+		h.Metadata.K0sRunningVersion = p.Config.Spec.K0s.Version
 	}
 
 	leader := p.Config.Spec.K0sLeader()

pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/host.go

@@ -6,6 +6,7 @@ import (
 	gos "os"
 	gopath "path"
 	"regexp"
+	"sort"
 	"strconv"
 	"strings"
 	"time"
@@ -23,7 +24,7 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-var k0sForceFlagSince = version.MustConstraint(">= v1.27.4+k0s.0")
+var K0sForceFlagSince = version.MustConstraint(">= v1.27.4+k0s.0")
 
 // Host contains all the needed details to work with hosts
 type Host struct {
@@ -183,6 +184,7 @@ type HostMetadata struct {
 	K0sNewConfig      string
 	K0sJoinToken      string
 	K0sJoinTokenID    string
+	K0sStatusArgs     []string
 	Arch              string
 	IsK0sLeader       bool
 	Hostname          string
@@ -334,7 +336,7 @@ func (h *Host) K0sInstallCommand() (string, error) {
 		}
 	}
 
-	if flags.Include("--force") && h.Metadata.K0sBinaryVersion != nil && !k0sForceFlagSince.Check(h.Metadata.K0sBinaryVersion) {
+	if flags.Include("--force") && h.Metadata.K0sBinaryVersion != nil && !K0sForceFlagSince.Check(h.Metadata.K0sBinaryVersion) {
 		log.Warnf("%s: k0s version %s does not support the --force flag, ignoring it", h, h.Metadata.K0sBinaryVersion)
 		flags.Delete("--force")
 	}
@@ -569,3 +571,48 @@ func (h *Host) ExpandTokens(input string, k0sVersion *version.Version) string {
 	}
 	return builder.String()
 }
+
+var flagParseRe = regexp.MustCompile(`--?([\w\-]+)(?:[=\s](\S+))?`)
+
+// FlagsChanged returns true when the flags have changed by comparing the host.Metadata.K0sStatusArgs to what host.InstallFlags would produce
+func (h *Host) FlagsChanged() bool {
+	var formattedFlags []string
+
+	// format the flags the same way as spf13/cobra does in k0s
+	for _, flag := range h.InstallFlags {
+		var key string
+		var value string
+		match := flagParseRe.FindStringSubmatch(flag)
+		if len(match) > 1 {
+			key = match[1]
+		}
+		if key == "f" || key == "force" {
+			// --force is stripped by k0s so it does not end up in status.Args
+			continue
+		}
+		if len(match) > 2 {
+			if s, err := strconv.Unquote(match[2]); err == nil {
+				value = s
+			} else {
+				value = match[2]
+			}
+		} else {
+			value = "true"
+		}
+		formattedFlags = append(formattedFlags, fmt.Sprintf("--%s=%s", key, value))
+	}
+
+	k0sArgs := h.Metadata.K0sStatusArgs
+	if len(k0sArgs) != len(formattedFlags) {
+		return true
+	}
+	sort.Strings(formattedFlags)
+	sort.Strings(k0sArgs)
+	for i := range formattedFlags {
+		if formattedFlags[i] != k0sArgs[i] {
+			return true
+		}
+	}
+
+	return false
+}