Skip to content

Commit 7959d6e

Browse files
committed
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 <[email protected]>
1 parent 102ec99 commit 7959d6e

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

phase/validate_hosts.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ func (p *ValidateHosts) Run() error {
2828
for _, h := range p.Config.Spec.Hosts {
2929
p.hncount[h.Metadata.Hostname]++
3030
p.machineidcount[h.Metadata.MachineID]++
31-
p.privateaddrcount[h.PrivateAddress]++
31+
if h.PrivateAddress != "" {
32+
p.privateaddrcount[h.PrivateAddress]++
33+
}
3234
}
3335

3436
return p.parallelDo(
@@ -50,7 +52,7 @@ func (p *ValidateHosts) validateUniqueHostname(h *cluster.Host) error {
5052

5153
func (p *ValidateHosts) validateUniquePrivateAddress(h *cluster.Host) error {
5254
if p.privateaddrcount[h.PrivateAddress] > 1 {
53-
return fmt.Errorf("privateAddress %s is not unique: %s", h.PrivateAddress, h.Metadata.Hostname)
55+
return fmt.Errorf("privateAddress %q is not unique: %s", h.PrivateAddress, h.Metadata.Hostname)
5456
}
5557

5658
return nil

0 commit comments

Comments
 (0)