Skip to content

Remove redundant routes in dualstackoverlay for windows nodes #2002

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

Merged
merged 2 commits into from
Jun 7, 2023
Merged

Remove redundant routes in dualstackoverlay for windows nodes #2002

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e7b5ad
Remove redundant routes in overlay for windows nodes
pjohnst5 Jun 6, 2023
a0db8fb
Merge branch 'master' into paujohns/remove-redundant-route-overlay
pjohnst5 Jun 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions network/network_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ func (nm *networkManager) addNewNetRules(nwInfo *NetworkInfo) error {
if subnet.Gateway == nil {
return fmt.Errorf("[net] failed to get subnet gateway") // nolint
}
gateway := subnet.Gateway.String()

log.Printf("[net] Adding ipv4 and ipv6 net rules to windows node")

Expand All @@ -244,17 +243,6 @@ func (nm *networkManager) addNewNetRules(nwInfo *NetworkInfo) error {
if out, err = nm.plClient.ExecuteCommand(addNetshV4DefaultRoute); err != nil {
log.Printf("[net] Adding ipv4 default route failed: %v:%v", out, err)
}

deleteNetshV4GatewayRoute := fmt.Sprintf(netRouteCmd, "ipv4", "delete", prefix, ifName, gateway)
if _, delErr := nm.plClient.ExecuteCommand(deleteNetshV4GatewayRoute); delErr != nil {
log.Printf("[net] Deleting ipv4 gateway route failed: %v", delErr)
}

// netsh interface ipv4 add route $subnetV4 $hostInterfaceAlias $gatewayV4
addNetshV4GatewayRoute := fmt.Sprintf(netRouteCmd, "ipv4", "add", prefix, ifName, gateway)
if out, err = nm.plClient.ExecuteCommand(addNetshV4GatewayRoute); err != nil {
log.Printf("[net] Adding ipv4 gateway route failed: %v:%v", out, err)
}
} else {
deleteNetshV6DefaultRoute := fmt.Sprintf(netRouteCmd, "ipv6", "delete", prefix, ifName, ipv6DefaultHop)
if _, delErr := nm.plClient.ExecuteCommand(deleteNetshV6DefaultRoute); delErr != nil {
Expand All @@ -266,17 +254,6 @@ func (nm *networkManager) addNewNetRules(nwInfo *NetworkInfo) error {
if out, err = nm.plClient.ExecuteCommand(addNetshV6DefaultRoute); err != nil {
log.Printf("[net] Adding ipv6 default route failed: %v:%v", out, err)
}

deleteNetshV6GatewayRoute := fmt.Sprintf(netRouteCmd, "ipv6", "delete", prefix, ifName, gateway)
if _, delErr := nm.plClient.ExecuteCommand(deleteNetshV6GatewayRoute); delErr != nil {
log.Printf("[net] Deleting ipv6 gateway route failed: %v", delErr)
}

// netsh interface ipv6 add route $subnetV6 $hostInterfaceAlias $gatewayV6
addNetshV6GatewayRoute := fmt.Sprintf(netRouteCmd, "ipv6", "add", prefix, ifName, gateway)
if out, err = nm.plClient.ExecuteCommand(addNetshV6GatewayRoute); err != nil {
log.Printf("[net] Adding ipv6 gateway route failed: %v:%v", out, err)
}
}
}

Expand Down