Skip to content

Commit be345dc

Browse files
committed
Don't error on duplicate IPs
As long as the other node is down with same IP (which it will be), this should be safe-ish.
1 parent d3333a9 commit be345dc

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

node/pkg/lifecycle/startup/startup.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,14 +1073,10 @@ func checkConflictingNodes(ctx context.Context, client client.Interface, node *l
10731073
// This is an error condition.
10741074
if theirIPv4.IP != nil && ourIPv4.IP != nil && theirIPv4.IP.Equal(ourIPv4.IP) {
10751075
log.Warnf("Calico node '%s' is already using the IPv4 address %s.", theirNode.Name, ourIPv4.String())
1076-
retErr = fmt.Errorf("IPv4 address conflict")
1077-
v4conflict = true
10781076
}
10791077

10801078
if theirIPv6.IP != nil && ourIPv6.IP != nil && theirIPv6.IP.Equal(ourIPv6.IP) {
10811079
log.Warnf("Calico node '%s' is already using the IPv6 address %s.", theirNode.Name, ourIPv6.String())
1082-
retErr = fmt.Errorf("IPv6 address conflict")
1083-
v6conflict = true
10841080
}
10851081
}
10861082
return

0 commit comments

Comments
 (0)