Clean..

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

Author: kke

configurer/linux.go

@@ -21,6 +21,11 @@ type Linux struct {
 	pathMu sync.Mutex
 }
 
+// OSKind returns the identifier for Linux hosts
+func (l *Linux) OSKind() string {
+	return "linux"
+}
+
 // NOTE The Linux struct does not embed rig/os.Linux because it will confuse
 // go as the distro-configurers' parents embed it too. This means you can't
 // add functions to base Linux package that call functions in the rig/os.Linux package,
@@ -168,12 +173,6 @@ func (l *Linux) DownloadURL(h os.Host, url, destination string, opts ...exec.Opt
 	return nil
 }
 
-// K0sDownloadURL returns the release URL for the requested k0s binary
-func (l *Linux) K0sDownloadURL(_ os.Host, version *version.Version, arch string) (string, error) {
-	v := strings.ReplaceAll(strings.TrimPrefix(version.String(), "v"), "+", "%2B")
-	return fmt.Sprintf("https://github.com/k0sproject/k0s/releases/download/v%[1]s/k0s-v%[1]s-%[2]s", v, arch), nil
-}
-
 // ReplaceK0sTokenPath replaces the config path in the service stub
 func (l *Linux) ReplaceK0sTokenPath(h os.Host, spath string) error {
 	return h.Exec(fmt.Sprintf("sed -i 's^REPLACEME^%s^g' %s", l.K0sJoinTokenPath(), spath))
@@ -198,17 +197,6 @@ func (l *Linux) Chown(h os.Host, path, owner string, opts ...exec.Option) error
 	return h.Exec(cmd, opts...)
 }
 
-func (l *Linux) Chmod(h os.Host, path, perm string, opts ...exec.Option) error {
-	if _, err := strconv.ParseUint(perm, 8, 32); err != nil {
-		return fmt.Errorf("invalid file mode %q: %w", perm, err)
-	}
-	if len(opts) == 0 {
-		opts = []exec.Option{exec.Sudo(h)}
-	}
-	cmd := fmt.Sprintf(`chmod %s %s`, perm, shellescape.Quote(path))
-	return h.Exec(cmd, opts...)
-}
-
 // KubeconfigPath returns the path to a kubeconfig on the host
 func (l *Linux) KubeconfigPath(h os.Host, dataDir string) string {
 	linux := &os.Linux{}

configurer/windows.go

@@ -21,6 +21,11 @@ type BaseWindows struct {
 	pathMu sync.Mutex
 }
 
+// OSKind returns the identifier for Windows hosts
+func (w *BaseWindows) OSKind() string {
+	return "windows"
+}
+
 func (w *BaseWindows) initPaths() {
 	if w.paths != nil {
 		return
@@ -139,12 +144,6 @@ func (w *BaseWindows) DownloadURL(h os.Host, url, destination string, opts ...ex
 	return nil
 }
 
-// K0sDownloadURL returns the release URL for the requested k0s binary
-func (w *BaseWindows) K0sDownloadURL(_ os.Host, versionV *version.Version, arch string) (string, error) {
-	v := strings.ReplaceAll(strings.TrimPrefix(versionV.String(), "v"), "+", "%2B")
-	return fmt.Sprintf("https://github.com/k0sproject/k0s/releases/download/v%[1]s/k0s-v%[1]s-%[2]s.exe", v, arch), nil
-}
-
 // ReplaceK0sTokenPath replaces the config path in the service stub
 func (w *BaseWindows) ReplaceK0sTokenPath(h os.Host, spath string) error {
 	// Replace literal REPLACEME with actual token path
@@ -168,11 +167,6 @@ func (w *BaseWindows) Chown(h os.Host, path, owner string, _ ...exec.Option) err
 	return nil
 }
 
-// Chmod is a no-op on Windows
-func (w *BaseWindows) Chmod(h os.Host, path, perm string, _ ...exec.Option) error {
-	return nil
-}
-
 // KubeconfigPath returns the path to a kubeconfig on the host
 func (w *BaseWindows) KubeconfigPath(h os.Host, dataDir string) string {
 	win := &os.Windows{}

phase/arm_prepare.go

@@ -38,7 +38,11 @@ func (p *PrepareArm) Prepare(config *v1beta1.Cluster) error {
 			return false
 		}
 
-		arch := h.Metadata.Arch
+		arch, err := h.Arch()
+		if err != nil {
+			log.Warnf("%s: failed to detect architecture: %v", h, err)
+			return false
+		}
 
 		if !strings.HasPrefix(arch, "arm") && !strings.HasPrefix(arch, "aarch") {
 			return false
@@ -68,8 +72,12 @@ func (p *PrepareArm) Run(ctx context.Context) error {
 }
 
 func (p *PrepareArm) etcdUnsupportedArch(_ context.Context, h *cluster.Host) error {
-	log.Warnf("%s: enabling ETCD_UNSUPPORTED_ARCH=%s override - you may encounter problems with etcd", h, h.Metadata.Arch)
-	h.Environment["ETCD_UNSUPPORTED_ARCH"] = h.Metadata.Arch
+	arch, err := h.Arch()
+	if err != nil {
+		return err
+	}
+	log.Warnf("%s: enabling ETCD_UNSUPPORTED_ARCH=%s override - you may encounter problems with etcd", h, arch)
+	h.Environment["ETCD_UNSUPPORTED_ARCH"] = arch
 
 	return nil
 }

phase/download_binaries.go

@@ -46,15 +46,24 @@ func (p *DownloadBinaries) Run(_ context.Context) error {
 	var bins binaries
 
 	for _, h := range p.hosts {
-		if bin := bins.find(h.Configurer.Kind(), h.Metadata.Arch); bin != nil {
+		arch, err := h.Arch()
+		if err != nil {
+			return err
+		}
+		osKind := h.Configurer.Kind()
+		if bin := bins.find(osKind, arch); bin != nil {
 			continue
 		}
 
-		bin := &binary{arch: h.Metadata.Arch, os: h.Configurer.Kind(), version: p.Config.Spec.K0s.Version}
+		bin := &binary{arch: arch, os: osKind, version: p.Config.Spec.K0s.Version}
 
 		// find configuration defined binpaths and use instead of downloading a new one
 		for _, v := range p.hosts {
-			if v.Metadata.Arch == bin.arch && v.Configurer.Kind() == bin.os && v.K0sBinaryPath != "" {
+			vArch, err := v.Arch()
+			if err != nil {
+				return err
+			}
+			if vArch == bin.arch && v.Configurer.Kind() == bin.os && v.K0sBinaryPath != "" {
 				bin.path = h.K0sBinaryPath
 			}
 		}
@@ -72,8 +81,12 @@ func (p *DownloadBinaries) Run(_ context.Context) error {
 	}
 
 	for _, h := range p.hosts {
+		arch, err := h.Arch()
+		if err != nil {
+			return err
+		}
 		if h.K0sBinaryPath == "" {
-			if bin := bins.find(h.Configurer.Kind(), h.Metadata.Arch); bin != nil {
+			if bin := bins.find(h.Configurer.Kind(), arch); bin != nil {
 				h.UploadBinaryPath = bin.path
 			}
 		} else {

phase/download_k0s.go

@@ -73,29 +73,23 @@ func (p *DownloadK0s) downloadK0s(_ context.Context, h *cluster.Host) error {
 	}
 
 	log.Infof("%s: downloading k0s %s", h, p.Config.Spec.K0s.Version)
-	if h.K0sDownloadURL != "" {
-		expandedURL := h.ExpandTokens(h.K0sDownloadURL, p.Config.Spec.K0s.Version)
-		log.Infof("%s: downloading k0s binary from %s", h, expandedURL)
-		if err := h.Configurer.DownloadURL(h, expandedURL, tmp, exec.Sudo(h)); err != nil {
-			return fmt.Errorf("failed to download k0s binary: %w", err)
-		}
-	} else {
-		url, err := h.Configurer.K0sDownloadURL(h, p.Config.Spec.K0s.Version, h.Metadata.Arch)
-		if err != nil {
-			return fmt.Errorf("failed to determine k0s download url: %w", err)
-		}
-		if err := h.Configurer.DownloadURL(h, url, tmp, exec.Sudo(h)); err != nil {
-			return fmt.Errorf("failed to download k0s binary: %w", err)
-		}
+	url, err := h.K0sDownloadURL(p.Config.Spec.K0s.Version)
+	if err != nil {
+		return fmt.Errorf("failed to determine k0s download url: %w", err)
+	}
+	if err := h.Configurer.DownloadURL(h, url, tmp, exec.Sudo(h)); err != nil {
+		return fmt.Errorf("failed to download k0s binary: %w", err)
+	}
+	h.Metadata.K0sBinaryTempFile = tmp
+
+	if h.IsWindows() {
+		return nil
 	}
 
-	// Make executable on POSIX; no-op on Windows
 	if err := chmodWithMode(h, tmp, fs.FileMode(0o755)); err != nil {
 		log.Debugf("%s: chmod %s failed: %v", h, tmp, err)
 	}
 
-	h.Metadata.K0sBinaryTempFile = tmp
-
 	return nil
 }
 

phase/gather_facts.go

@@ -35,11 +35,11 @@ func (p *GatherFacts) Run(ctx context.Context) error {
 }
 
 func (p *GatherFacts) investigateHost(_ context.Context, h *cluster.Host) error {
-	output, err := h.Configurer.Arch(h)
+	arch, err := h.Arch()
 	if err != nil {
 		return err
 	}
-	h.Metadata.Arch = output
+	log.Infof("%s: detected %s architecture", h, arch)
 
 	if !p.SkipMachineIDs && p.Config.Spec.K0s.Version.LessThan(uniqueMachineIDSince) {
 		id, err := h.Configurer.MachineID(h)

phase/lock.go

@@ -81,7 +81,7 @@ func (p *Lock) startTicker(ctx context.Context, h *cluster.Host) error {
 		for {
 			select {
 			case <-ticker.C:
-				if err := touchWithTime(h, lfp, time.Now()); err != nil {
+				if err := h.Configurer.Touch(h, lfp, time.Now()); err != nil {
 					log.Debugf("%s: failed to touch lock file: %s", h, err)
 				}
 			case <-ctx.Done():

phase/upload_k0s.go

@@ -82,7 +82,7 @@ func (p *UploadK0s) uploadBinary(_ context.Context, h *cluster.Host) error {
 		return fmt.Errorf("stat %s: %w", h.UploadBinaryPath, err)
 	}
 
-	if err := touchWithTime(h, tmp, stat.ModTime()); err != nil {
+	if err := h.Configurer.Touch(h, tmp, stat.ModTime()); err != nil {
 		return fmt.Errorf("failed to touch %s: %w", tmp, err)
 	}
 	if err := chmodWithMode(h, tmp, fs.FileMode(0o755)); err != nil {

phase/uploadfiles.go

@@ -256,7 +256,7 @@ func (p *UploadFiles) applyFileMetadata(h *cluster.Host, dest, owner, perm strin
 	if timestamp != nil {
 		err := p.Wet(h, fmt.Sprintf("set timestamp for %s to %s", dest, timestamp.String()), func() error {
 			log.Debugf("%s: touching %s", h, dest)
-			return touchWithTime(h, dest, *timestamp)
+			return h.Configurer.Touch(h, dest, *timestamp, exec.Sudo(h))
 		})
 		if err != nil {
 			return fmt.Errorf("failed to touch %s: %w", dest, err)
@@ -277,23 +277,3 @@ func chmodWithMode(h *cluster.Host, path string, mode fs.FileMode) error {
 	perm := fmt.Sprintf("%04o", uint32(mode)&0o7777)
 	return h.Configurer.Chmod(h, path, perm, exec.Sudo(h))
 }
-
-func touchWithTime(h *cluster.Host, path string, ts time.Time) error {
-	if fsys := h.SudoFsys(); fsys != nil {
-		if t, ok := fsys.(interface{ TouchT(string, time.Time) error }); ok {
-			return t.TouchT(path, ts)
-		}
-		if t, ok := fsys.(interface{ Touch(string) error }); ok {
-			return t.Touch(path)
-		}
-	}
-	if fsys := h.Fsys(); fsys != nil {
-		if t, ok := fsys.(interface{ TouchT(string, time.Time) error }); ok {
-			return t.TouchT(path, ts)
-		}
-		if t, ok := fsys.(interface{ Touch(string) error }); ok {
-			return t.Touch(path)
-		}
-	}
-	return nil
-}

phase/validate_hosts.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster"
+	"github.com/k0sproject/version"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -110,9 +111,19 @@ func (p *ValidateHosts) validateSudo(_ context.Context, h *cluster.Host) error {
 	return nil
 }
 
+var k0sWindowsWorkerSupportSince = version.MustConstraint(">= 1.34.0-0")
+
 func (p *ValidateHosts) validateOS(_ context.Context, h *cluster.Host) error {
-	if h.IsController() && h.IsWindows() {
-		return fmt.Errorf("windows is not supported for controller nodes")
+	if !h.IsWindows() || p.Config.Spec.K0s.Version == nil {
+		return nil
+	}
+
+	if h.IsController() {
+		return fmt.Errorf("windows is not supported on k0s controller nodes")
+	}
+
+	if !k0sWindowsWorkerSupportSince.Check(p.Config.Spec.K0s.Version) {
+		return fmt.Errorf("windows workers require k0s version %s", k0sWindowsWorkerSupportSince)
 	}
 	return nil
 }