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.

Sign up for GitHub

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

Jump to bottom

Don't delete the routes which are added for the peer IPv6 gateways #3336

Merged
merged 1 commit into from Mar 10, 2022
Merged

Don't delete the routes which are added for the peer IPv6 gateways #3336

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions pkg/agent/route/route_linux.go
View file
Open in desktop
Expand Up @@ -683,6 +683,8 @@ func (c *Client) initServiceIPRoutes() error {
// based on the desired podCIDRs. svcIPs are used for Windows only.
func (c *Client) Reconcile(podCIDRs []string, svcIPs map[string]bool) error {
desiredPodCIDRs := sets.NewString(podCIDRs...)
// Get the peer IPv6 gateways from pod CIDRs
desiredIPv6GWs := getIPv6Gateways(podCIDRs)

// Remove orphaned podCIDRs from ipset.
for _, ipsetName := range []string{antreaPodIPSet, antreaPodIP6Set} {
Expand Down Expand Up @@ -722,6 +724,11 @@ func (c *Client) Reconcile(podCIDRs []string, svcIPs map[string]bool) error {
if desiredPodCIDRs.Has(route.Dst.String()) {
continue
}
// IPv6 doesn't support "on-link" route, routes to the peer IPv6 gateways need to
// be added separately. So don't delete such routes.
if desiredIPv6GWs.Has(route.Dst.IP.String()) {
continue
}
// Don't delete the routes which are added by AntreaProxy.
if c.isServiceRoute(&route) {
continue
Expand All @@ -733,19 +740,18 @@ func (c *Client) Reconcile(podCIDRs []string, svcIPs map[string]bool) error {
}
}

// Remove any unknown IPv6 neighbors on Antrea gateway.
desiredGWs := getIPv6Gateways(podCIDRs)
// Return immediately if there is no IPv6 gateway address configured on the Nodes.
if desiredGWs.Len() == 0 {
if desiredIPv6GWs.Len() == 0 {
return nil
}
// Remove orphaned IPv6 Neighbors from host network.
actualNeighbors, err := c.listIPv6NeighborsOnGateway()
if err != nil {
return err
}
// Remove any unknown IPv6 neighbors on Antrea gateway.
for neighIP, actualNeigh := range actualNeighbors {
if desiredGWs.Has(neighIP) {
if desiredIPv6GWs.Has(neighIP) {
continue
}
// Don't delete the virtual Service IP neighbor which is added by AntreaProxy.
Expand Down