Merge pull request #485 from twz123/fix-priv-addr-validation

Don't count empty private addresses during validation
k0sproject · Jun 6, 2023 · 5300b1c · 5300b1c
2 parents 102ec99 + 7959d6e
commit 5300b1c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/phase/validate_hosts.go b/phase/validate_hosts.go
@@ -28,7 +28,9 @@ func (p *ValidateHosts) Run() error {
 	for _, h := range p.Config.Spec.Hosts {
 		p.hncount[h.Metadata.Hostname]++
 		p.machineidcount[h.Metadata.MachineID]++
-		p.privateaddrcount[h.PrivateAddress]++
+		if h.PrivateAddress != "" {
+			p.privateaddrcount[h.PrivateAddress]++
+		}
 	}
 
 	return p.parallelDo(
@@ -50,7 +52,7 @@ func (p *ValidateHosts) validateUniqueHostname(h *cluster.Host) error {
 
 func (p *ValidateHosts) validateUniquePrivateAddress(h *cluster.Host) error {
 	if p.privateaddrcount[h.PrivateAddress] > 1 {
-		return fmt.Errorf("privateAddress %s is not unique: %s", h.PrivateAddress, h.Metadata.Hostname)
+		return fmt.Errorf("privateAddress %q is not unique: %s", h.PrivateAddress, h.Metadata.Hostname)
 	}
 
 	return nil