From 7959d6e48fc64237734e74f90c016f038dcb7816 Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Tue, 6 Jun 2023 13:56:14 +0200 Subject: [PATCH] Don't count empty private addresses during validation This would fail as soon as there are more than one hosts without a private address. Fixes: 0280b8b ("Validate host private address uniqueness") Signed-off-by: Tom Wieczorek --- phase/validate_hosts.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/phase/validate_hosts.go b/phase/validate_hosts.go index 3abf758a..eca1c8a5 100644 --- 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