Updates

antrea-io · Jun 21, 2022 · 50c1db6 · 50c1db6
1 parent 58c9cc3
commit 50c1db6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/pkg/agent/route/interfaces.go b/pkg/agent/route/interfaces.go
@@ -27,7 +27,7 @@ type Interface interface {
 	// It should be idempotent and can be safely called on every startup.
 	Initialize(nodeConfig *config.NodeConfig, done func()) error
 
-	// Reconcile should remove orphaned routes and related configuration based on the desired podCIDRs and Service IPs.
+	// Reconcile should remove orphaned routes and related configuration based on the desired podCIDRs.
 	// If IPv6 is enabled in the cluster, Reconcile should also remove the orphaned IPv6 neighbors.
 	Reconcile(podCIDRs []string) error
 

diff --git a/pkg/agent/route/route_windows.go b/pkg/agent/route/route_windows.go
@@ -53,7 +53,6 @@ type Client struct {
 	nodeConfig      *config.NodeConfig
 	networkConfig   *config.NetworkConfig
 	nodeRoutes      *sync.Map
-	serviceRoutes   *sync.Map
 	fwClient        *winfirewall.Client
 	bridgeInfIndex  int
 	noSNAT          bool
@@ -66,7 +65,6 @@ func NewClient(networkConfig *config.NetworkConfig, noSNAT, proxyAll, connectUpl
 	return &Client{
 		networkConfig: networkConfig,
 		nodeRoutes:    &sync.Map{},
-		serviceRoutes: &sync.Map{},
 		fwClient:      winfirewall.NewClient(),
 		noSNAT:        noSNAT,
 		proxyAll:      proxyAll,
@@ -232,7 +230,6 @@ func (c *Client) addVirtualServiceIPRoute(isIPv6 bool) error {
 	if err := util.ReplaceNetRoute(route); err != nil {
 		return fmt.Errorf("failed to install route for virtual Service IP %s: %w", svcIP.String(), err)
 	}
-	c.serviceRoutes.Store(svcIP.String(), route)
 	klog.InfoS("Added virtual Service IP route", "route", route)
 
 	return nil
@@ -321,7 +318,6 @@ func (c *Client) addVirtualNodePortDNATIPRoute(isIPv6 bool) error {
 	if err := util.ReplaceNetRoute(route); err != nil {
 		return fmt.Errorf("failed to install route for virtual Service IP %s: %w", vIP.String(), err)
 	}
-	c.serviceRoutes.Store(vIP.String(), route)
 	klog.InfoS("Added virtual Service IP route", "route", route)
 
 	// For NodePort Service, a new NetNat for NetNatStaticMapping is needed.
@@ -347,8 +343,8 @@ func (c *Client) Run(stopCh <-chan struct{}) {
 }
 
 func (c *Client) isServiceRoute(route *util.Route) bool {
-	// If the destination IP or gateway IP is virtual Service IP , then it is a route which is added by AntreaProxy.
-	if route.DestinationSubnet.IP.Equal(config.VirtualServiceIPv4) || route.GatewayAddress.Equal(config.VirtualServiceIPv4) {
+	// If the gateway IP is the virtual Service IP , then it is a route which is added by AntreaProxy.
+	if route.GatewayAddress.Equal(config.VirtualServiceIPv4) {
 		return true
 	}
 	return false
@@ -429,7 +425,6 @@ func (c *Client) addLoadBalancerIngressIPRoute(svcIPStr string) error {
 		return fmt.Errorf("failed to install routing entry for LoadBalancer ingress IP %s: %w", svcIPStr, err)
 	}
 	klog.V(4).InfoS("Added LoadBalancer ingress IP route", "route", route)
-	c.serviceRoutes.Store(svcIPStr, route)
 
 	return nil
 }
@@ -451,7 +446,6 @@ func (c *Client) deleteLoadBalancerIngressIPRoute(svcIPStr string) error {
 		}
 	}
 	klog.V(4).InfoS("Uninstalled stale ClusterIP route successfully", "stale route", route)
-	c.serviceRoutes.Delete(svcIPStr)
 
 	return nil
 }