Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 1888352: Fix IPv6 neighbor discovery hack #313

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions go-controller/pkg/node/gateway_localnet.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ func initLocalnetGateway(nodeName string, subnet *net.IPNet, wf *factory.WatchFa
", stderr:%s (%v)", localnetBridgeName, stderr, err)
}

ifaceID, macAddress, err := bridgedGatewayNodeSetup(nodeName, localnetBridgeName, localnetBridgeName, true)
ifaceID, _, err := bridgedGatewayNodeSetup(nodeName, localnetBridgeName, localnetBridgeName, true)
if err != nil {
return fmt.Errorf("failed to set up shared interface gateway: %v", err)
}
Expand Down Expand Up @@ -204,7 +204,7 @@ func initLocalnetGateway(nodeName string, subnet *net.IPNet, wf *factory.WatchFa
if utilnet.IsIPv6CIDR(subnet) {
// TODO - IPv6 hack ... for some reason neighbor discovery isn't working here, so hard code a
// MAC binding for the gateway IP address for now - need to debug this further
err = util.LinkNeighAdd(link, gatewayIP, macAddress)
err = util.LinkNeighAdd(link, gatewayIP, gwMacAddress)
if err == nil {
klog.Infof("Added MAC binding for %s on %s", gatewayIP, localnetGatewayNextHopPort)
} else {
Expand Down