From 2e7b5adc5e291a5b3f1a5b366f5e5efc9855e7fb Mon Sep 17 00:00:00 2001 From: Paul Johnston Date: Tue, 6 Jun 2023 10:15:11 -0700 Subject: [PATCH] Remove redundant routes in overlay for windows nodes --- network/network_windows.go | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/network/network_windows.go b/network/network_windows.go index 55f8c5dc9b..b6a86ac88f 100644 --- a/network/network_windows.go +++ b/network/network_windows.go @@ -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") @@ -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 { @@ -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) - } } }