fix setting LR option always_learn_from_arp_request (kubeovn#5426)

Signed-off-by: zhangzujian <[email protected]>

Author: zhangzujian

pkg/controller/subnet.go

@@ -92,6 +92,11 @@ func (c *Controller) enqueueUpdateSubnet(oldObj, newObj any) {
 		c.updateVpcStatusQueue.Add(oldSubnet.Spec.Vpc)
 	}
 
+	if oldSubnet.Spec.U2OInterconnection != newSubnet.Spec.U2OInterconnection {
+		klog.Infof("enqueue update vpc %s triggered by u2o interconnection change of subnet %s", newSubnet.Spec.Vpc, key)
+		c.addOrUpdateVpcQueue.Add(newSubnet.Spec.Vpc)
+	}
+
 	if oldSubnet.Spec.Private != newSubnet.Spec.Private ||
 		oldSubnet.Spec.CIDRBlock != newSubnet.Spec.CIDRBlock ||
 		!slices.Equal(oldSubnet.Spec.AllowSubnets, newSubnet.Spec.AllowSubnets) ||
@@ -188,6 +193,11 @@ func (c *Controller) formatSubnet(subnet *kubeovnv1.Subnet) (*kubeovnv1.Subnet,
 		changed = true
 	}
 
+	if subnet.Spec.Vlan == "" && subnet.Spec.U2OInterconnection {
+		subnet.Spec.U2OInterconnection = false
+		changed = true
+	}
+
 	klog.Infof("format subnet %v, changed %v", subnet.Name, changed)
 	if changed {
 		newSubnet, err := c.config.KubeOvnClient.KubeovnV1().Subnets().Update(context.Background(), subnet, metav1.UpdateOptions{})

pkg/controller/vpc.go

@@ -61,7 +61,8 @@ func (c *Controller) enqueueUpdateVpc(oldObj, newObj any) {
 		oldVpc.Spec.EnableExternal != newVpc.Spec.EnableExternal ||
 		oldVpc.Spec.EnableBfd != newVpc.Spec.EnableBfd ||
 		vpcBFDPortChanged(oldVpc.Spec.BFDPort, newVpc.Spec.BFDPort) ||
-		oldVpc.Labels[util.VpcExternalLabel] != newVpc.Labels[util.VpcExternalLabel] {
+		oldVpc.Labels[util.VpcExternalLabel] != newVpc.Labels[util.VpcExternalLabel] ||
+		!slices.Equal(oldVpc.Status.Subnets, newVpc.Status.Subnets) {
 		// TODO:// label VpcExternalLabel replace with spec enable external
 
 		if newVpc.Annotations == nil {
@@ -268,7 +269,25 @@ func (c *Controller) handleAddOrUpdateVpc(key string) error {
 		return err
 	}
 
-	if err = c.createVpcRouter(key, vpc.Spec.EnableExternal); err != nil {
+	learnFromARPRequest := vpc.Spec.EnableExternal
+	if !learnFromARPRequest {
+		for _, subnetName := range vpc.Status.Subnets {
+			subnet, err := c.subnetsLister.Get(subnetName)
+			if err != nil {
+				if k8serrors.IsNotFound(err) {
+					continue
+				}
+				klog.Errorf("failed to get subnet %s for vpc %s: %v", subnetName, key, err)
+				return err
+			}
+			if subnet.Spec.Vlan != "" && subnet.Spec.U2OInterconnection {
+				learnFromARPRequest = true
+				break
+			}
+		}
+	}
+
+	if err = c.createVpcRouter(key, learnFromARPRequest); err != nil {
 		klog.Errorf("failed to create vpc router for vpc %s: %v", key, err)
 		return err
 	}
@@ -1231,11 +1250,12 @@ func (c *Controller) getVpcSubnets(vpc *kubeovnv1.Vpc) (subnets []string, defaul
 			defaultSubnet = vpc.Spec.DefaultSubnet
 		}
 	}
+	sort.Strings(subnets)
 	return
 }
 
 // createVpcRouter create router to connect logical switches in vpc
-func (c *Controller) createVpcRouter(lr string, enableExternal bool) error {
+func (c *Controller) createVpcRouter(lr string, learnFromARPRequest bool) error {
 	if err := c.OVNNbClient.CreateLogicalRouter(lr); err != nil {
 		klog.Errorf("create logical router %s failed: %v", lr, err)
 		return err
@@ -1251,7 +1271,7 @@ func (c *Controller) createVpcRouter(lr string, enableExternal bool) error {
 		"mac_binding_age_threshold": "300",
 		"dynamic_neigh_routers":     "true",
 	}
-	if !enableExternal {
+	if !learnFromARPRequest {
 		lrOptions["always_learn_from_arp_request"] = "false"
 	}
 	if !maps.Equal(vpcRouter.Options, lrOptions) {