controller: fix vpc egress gateway not working for targets within the internal subnet's cidr (#6218)

Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>

Author: zhangzujian

pkg/controller/vpc_egress_gateway.go

@@ -311,6 +311,7 @@ func (c *Controller) reconcileVpcEgressGatewayWorkload(gw *kubeovnv1.VpcEgressGa
 	internalCIDRv4, internalCIDRv6 := util.SplitStringIP(intSubnet.Spec.CIDRBlock)
 
 	// collect egress policies
+	ipv4Src, ipv6Src := set.New[string](), set.New[string]()
 	ipv4ForwardSrc, ipv6ForwardSrc := set.New[string](), set.New[string]()
 	ipv4SNATSrc, ipv6SNATSrc := set.New[string](), set.New[string]()
 	fnFilter := func(internalCIDR string, ipBlocks []string) set.Set[string] {
@@ -329,6 +330,8 @@ func (c *Controller) reconcileVpcEgressGatewayWorkload(gw *kubeovnv1.VpcEgressGa
 
 	for _, policy := range gw.Spec.Policies {
 		ipv4, ipv6 := util.SplitIpsByProtocol(policy.IPBlocks)
+		ipv4Src = ipv4Src.Insert(ipv4...)
+		ipv6Src = ipv6Src.Insert(ipv6...)
 		filteredV4 := fnFilter(internalCIDRv4, ipv4)
 		filteredV6 := fnFilter(internalCIDRv6, ipv6)
 		if policy.SNAT {
@@ -339,11 +342,6 @@ func (c *Controller) reconcileVpcEgressGatewayWorkload(gw *kubeovnv1.VpcEgressGa
 			ipv6ForwardSrc = ipv6ForwardSrc.Union(filteredV6)
 		}
 		for _, subnetName := range policy.Subnets {
-			if subnetName == internalSubnet {
-				// skip the internal subnet
-				continue
-			}
-
 			subnet, err := c.subnetsLister.Get(subnetName)
 			if err != nil {
 				klog.Error(err)
@@ -356,6 +354,8 @@ func (c *Controller) reconcileVpcEgressGatewayWorkload(gw *kubeovnv1.VpcEgressGa
 			}
 			// TODO: check subnet's vpc and vlan
 			ipv4, ipv6 := util.SplitStringIP(subnet.Spec.CIDRBlock)
+			ipv4Src = ipv4Src.Insert(ipv4)
+			ipv6Src = ipv6Src.Insert(ipv6)
 			if policy.SNAT {
 				ipv4SNATSrc.Insert(ipv4)
 				ipv6SNATSrc.Insert(ipv6)
@@ -367,6 +367,8 @@ func (c *Controller) reconcileVpcEgressGatewayWorkload(gw *kubeovnv1.VpcEgressGa
 	}
 
 	// calculate internal route destinations and forward source CIDR blocks
+	ipv4Src.Delete("")
+	ipv6Src.Delete("")
 	ipv4ForwardSrc.Delete("")
 	ipv6ForwardSrc.Delete("")
 	ipv4SNATSrc.Delete("")
@@ -565,7 +567,7 @@ func (c *Controller) reconcileVpcEgressGatewayWorkload(gw *kubeovnv1.VpcEgressGa
 
 	// return the source CIDR blocks for later OVN resources reconciliation
 	deploy.APIVersion, deploy.Kind = deploymentGroupVersion, deploymentKind
-	return attachmentNetworkName, intRouteDstIPv4, intRouteDstIPv6, deploy, nil
+	return attachmentNetworkName, ipv4Src, ipv6Src, deploy, nil
 }
 
 func (c *Controller) reconcileVpcEgressGatewayOVNRoutes(gw *kubeovnv1.VpcEgressGateway, af int, lrName, lrpName, bfdIP string, nextHops map[string]string, sources set.Set[string]) error {