Set ETCD_UNSUPPORTED_ARCH on ARM controller nodes

cmd/apply.go

@@ -76,6 +76,7 @@ var applyCommand = &cli.Command{
 			&phase.GatherK0sFacts{},
 			&phase.ValidateFacts{SkipDowngradeCheck: ctx.Bool("disable-downgrade-check")},
 			&phase.RunHooks{Stage: "before", Action: "apply"},
+			&phase.PrepareArm{},
 			&phase.ConfigureK0s{},
 			&phase.Restore{
 				RestoreFrom: ctx.String("restore-from"),

config/cluster/host.go

@@ -71,6 +71,8 @@ type configurer interface {
 	PrivateInterface(os.Host) (string, error)
 	PrivateAddress(os.Host, string, string) (string, error)
 	TempDir(os.Host) (string, error)
+	UpdateServiceEnvironment(os.Host, string, map[string]string) error
+	CleanupServiceEnvironment(os.Host, string) error
 }
 
 // HostMetadata resolved metadata for host

go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/go-playground/validator/v10 v10.4.1
 	github.com/hashicorp/go-version v1.2.1
 	github.com/k0sproject/dig v0.2.0
-	github.com/k0sproject/rig v0.3.23
+	github.com/k0sproject/rig v0.3.24
 	github.com/logrusorgru/aurora v2.0.3+incompatible
 	github.com/mattn/go-isatty v0.0.12
 	github.com/segmentio/analytics-go v3.1.0+incompatible

go.sum

@@ -149,8 +149,8 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/k0sproject/dig v0.2.0 h1:cNxEIl96g9kqSMfPSZLhpnZ0P8bWXKv08nxvsMHop5w=
 github.com/k0sproject/dig v0.2.0/go.mod h1:rBcqaQlJpcKdt2x/OE/lPvhGU50u/e95CSm5g/r4s78=
-github.com/k0sproject/rig v0.3.23 h1:jmGxX8nuT0GNrjmjCCQIASaSPg5g26gYJjdPMo6Mu2Y=
-github.com/k0sproject/rig v0.3.23/go.mod h1:6BgqiLQMw5SCMrysZ42ORzyXd3NOyr9KDEa2UGYphdY=
+github.com/k0sproject/rig v0.3.24 h1:P2HszKpslV/pRt12dHRalnNC6eI5t/ZsFlxvUI4Ey8g=
+github.com/k0sproject/rig v0.3.24/go.mod h1:6BgqiLQMw5SCMrysZ42ORzyXd3NOyr9KDEa2UGYphdY=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=

phase/arm_prepare.go

@@ -0,0 +1,59 @@
+package phase
+
+import (
+	"strings"
+
+	log "github.com/sirupsen/logrus"
+
+	"github.com/k0sproject/k0sctl/config"
+	"github.com/k0sproject/k0sctl/config/cluster"
+)
+
+// PrepareArm implements a phase which fixes arm quirks
+type PrepareArm struct {
+	GenericPhase
+
+	hosts cluster.Hosts
+}
+
+// Title for the phase
+func (p *PrepareArm) Title() string {
+	return "Prepare ARM nodes"
+}
+
+// Prepare the phase
+func (p *PrepareArm) Prepare(config *config.Cluster) error {
+	p.Config = config
+
+	p.hosts = p.Config.Spec.Hosts.Filter(func(h *cluster.Host) bool {
+		arch := h.Metadata.Arch
+		return h.Role != "worker" && (strings.HasPrefix(arch, "arm") || strings.HasPrefix(arch, "aarch"))
+	})
+
+	return nil
+}
+
+// ShouldRun is true when there are arm controllers
+func (p *PrepareArm) ShouldRun() bool {
+	return len(p.hosts) > 0
+}
+
+// Run the phase
+func (p *PrepareArm) Run() error {
+	return p.hosts.ParallelEach(p.etcdUnsupportedArch)
+}
+
+func (p *PrepareArm) etcdUnsupportedArch(h *cluster.Host) error {
+	var arch string
+	switch h.Metadata.Arch {
+	case "aarch32", "arm32", "armv7l", "armhfp", "arm-32":
+		arch = "arm32"
+	default:
+		arch = "arm64"
+	}
+
+	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/initialize_k0s.go

@@ -42,6 +42,13 @@ func (p *InitializeK0s) Run() error {
 		return err
 	}
 
+	if len(h.Environment) > 0 {
+		log.Infof("%s: updating service environment", h)
+		if err := h.Configurer.UpdateServiceEnvironment(h, h.K0sServiceName(), h.Environment); err != nil {
+			return err
+		}
+	}
+
 	if err := h.Configurer.StartService(h, h.K0sServiceName()); err != nil {
 		return err
 	}

phase/install_controllers.go

@@ -60,6 +60,13 @@ func (p *InstallControllers) Run() error {
 			return err
 		}
 
+		if len(h.Environment) > 0 {
+			log.Infof("%s: updating service environment", h)
+			if err := h.Configurer.UpdateServiceEnvironment(h, h.K0sServiceName(), h.Environment); err != nil {
+				return err
+			}
+		}
+
 		log.Infof("%s: starting service", h)
 		if err := h.Configurer.StartService(h, h.K0sServiceName()); err != nil {
 			return err

phase/reset.go

@@ -52,6 +52,10 @@ func (p *Reset) Run() error {
 			if err := h.Configurer.StopService(h, h.K0sServiceName()); err != nil {
 				return err
 			}
+			log.Infof("%s: cleaning up service environment", h)
+			if err := h.Configurer.CleanupServiceEnvironment(h, h.K0sServiceName()); err != nil {
+				return err
+			}
 		}
 
 		log.Infof("%s: running k0s reset", h)

phase/upgrade_controllers.go

@@ -56,6 +56,14 @@ func (p *UpgradeControllers) Run() error {
 		if err := h.UpdateK0sBinary(p.Config.Spec.K0s.Version); err != nil {
 			return err
 		}
+
+		if len(h.Environment) > 0 {
+			log.Infof("%s: updating service environment", h)
+			if err := h.Configurer.UpdateServiceEnvironment(h, h.K0sServiceName(), h.Environment); err != nil {
+				return err
+			}
+		}
+
 		if err := h.Configurer.StartService(h, h.K0sServiceName()); err != nil {
 			return err
 		}