Revert "Validate MachineID existence & uniqueness (k0sproject#435)"

This reverts commit b0cd9d9.

Signed-off-by: Tom Wieczorek <[email protected]>

configurer/linux.go

@@ -300,7 +300,3 @@ func (l *Linux) UpsertFile(h os.Host, path, content string) error {
 func (l *Linux) DeleteDir(h os.Host, path string, opts ...exec.Option) error {
 	return h.Exec(fmt.Sprintf(`rmdir %s`, shellescape.Quote(path)), opts...)
 }
-
-func (l *Linux) MachineID(h os.Host) (string, error) {
-	return h.ExecOutput(`cat /etc/machine-id || cat /var/lib/dbus/machine-id`)
-}

phase/gather_facts.go

@@ -32,13 +32,6 @@ func (p *GatherFacts) investigateHost(h *cluster.Host) error {
 		return err
 	}
 	h.Metadata.Arch = output
-
-	id, err := h.Configurer.MachineID(h)
-	if err != nil {
-		return err
-	}
-	h.Metadata.MachineID = id
-
 	p.IncProp(h.Metadata.Arch)
 
 	if extra := h.InstallFlags.GetValue("--kubelet-extra-args"); extra != "" {

phase/validate_hosts.go

@@ -10,7 +10,6 @@ import (
 type ValidateHosts struct {
 	GenericPhase
 	hncount          map[string]int
-	machineidcount   map[string]int
 	privateaddrcount map[string]int
 }
 
@@ -22,14 +21,12 @@ func (p *ValidateHosts) Title() string {
 // Run the phase
 func (p *ValidateHosts) Run() error {
 	p.hncount = make(map[string]int, len(p.Config.Spec.Hosts))
-	p.machineidcount = make(map[string]int, len(p.Config.Spec.Hosts))
 	p.privateaddrcount = make(map[string]int, len(p.Config.Spec.Hosts))
 
 	controllerCount := len(p.Config.Spec.Hosts.Controllers())
 	var resetControllerCount int
 	for _, h := range p.Config.Spec.Hosts {
 		p.hncount[h.Metadata.Hostname]++
-		p.machineidcount[h.Metadata.MachineID]++
 		if h.PrivateAddress != "" {
 			p.privateaddrcount[h.PrivateAddress]++
 		}
@@ -45,7 +42,6 @@ func (p *ValidateHosts) Run() error {
 	return p.parallelDo(
 		p.Config.Spec.Hosts,
 		p.validateUniqueHostname,
-		p.validateUniqueMachineID,
 		p.validateUniquePrivateAddress,
 		p.validateSudo,
 	)
@@ -67,14 +63,6 @@ func (p *ValidateHosts) validateUniquePrivateAddress(h *cluster.Host) error {
 	return nil
 }
 
-func (p *ValidateHosts) validateUniqueMachineID(h *cluster.Host) error {
-	if p.machineidcount[h.Metadata.MachineID] > 1 {
-		return fmt.Errorf("machine id %s is not unique: %s", h.Metadata.MachineID, h.Metadata.Hostname)
-	}
-
-	return nil
-}
-
 func (p *ValidateHosts) validateSudo(h *cluster.Host) error {
 	if err := h.Configurer.CheckPrivilege(h); err != nil {
 		return err

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

@@ -169,7 +169,6 @@ type configurer interface {
 	DeleteDir(os.Host, string, ...exec.Option) error
 	K0sctlLockFilePath(os.Host) string
 	UpsertFile(os.Host, string, string) error
-	MachineID(os.Host) (string, error)
 	SetPath(string, string)
 }
 
@@ -188,7 +187,6 @@ type HostMetadata struct {
 	Hostname          string
 	Ready             bool
 	NeedsUpgrade      bool
-	MachineID         string
 	DryRunFakeLeader  bool
 }