perf: only enqueue subnet when necessary

Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>

Author: oilbeater

pkg/controller/subnet.go

@@ -493,6 +493,15 @@ func (c *Controller) handleAddOrUpdateSubnet(key string) error {
 		return err
 	}
 
+	subnet, deleted, err := c.handleSubnetFinalizer(subnet)
+	if err != nil {
+		klog.Errorf("handle subnet finalizer failed %v", err)
+		return err
+	}
+	if deleted {
+		return nil
+	}
+
 	err = c.validateSubnetVlan(subnet)
 	if err != nil {
 		err := fmt.Errorf("failed to validate vlan for subnet %s, %w", key, err)
@@ -529,15 +538,6 @@ func (c *Controller) handleAddOrUpdateSubnet(key string) error {
 		return err
 	}
 
-	subnet, deleted, err := c.handleSubnetFinalizer(subnet)
-	if err != nil {
-		klog.Errorf("handle subnet finalizer failed %v", err)
-		return err
-	}
-	if deleted {
-		return nil
-	}
-
 	if !isOvnSubnet(subnet) {
 		// subnet provider is not ovn, and vpc is empty, should not reconcile
 		if err = c.patchSubnetStatus(subnet, "SetNonOvnSubnetSuccess", ""); err != nil {
@@ -1526,10 +1526,12 @@ func (c *Controller) reconcileOvnDefaultVpcRoute(subnet *kubeovnv1.Subnet) error
 			}
 		}
 
-		if subnet.Spec.U2OInterconnection && subnet.Status.U2OInterconnectionIP != "" {
-			if err := c.addPolicyRouteForU2OInterconn(subnet); err != nil {
-				klog.Errorf("failed to add policy route for underlay to overlay subnet interconnection %s %v", subnet.Name, err)
-				return err
+		if subnet.Spec.U2OInterconnection {
+			if subnet.Status.U2OInterconnectionIP != "" {
+				if err := c.addPolicyRouteForU2OInterconn(subnet); err != nil {
+					klog.Errorf("failed to add policy route for underlay to overlay subnet interconnection %s %v", subnet.Name, err)
+					return err
+				}
 			}
 		} else {
 			if err := c.deletePolicyRouteForU2OInterconn(subnet); err != nil {
@@ -1538,11 +1540,12 @@ func (c *Controller) reconcileOvnDefaultVpcRoute(subnet *kubeovnv1.Subnet) error
 			}
 		}
 
-		if (!c.config.EnableLb || (subnet.Spec.EnableLb == nil || !*subnet.Spec.EnableLb)) &&
-			subnet.Spec.U2OInterconnection && subnet.Status.U2OInterconnectionIP != "" {
-			if err := c.addPolicyRouteForU2ONoLoadBalancer(subnet); err != nil {
-				klog.Errorf("failed to add policy route for underlay to overlay subnet interconnection without enabling loadbalancer %s %v", subnet.Name, err)
-				return err
+		if (!c.config.EnableLb || (subnet.Spec.EnableLb == nil || !*subnet.Spec.EnableLb)) && subnet.Spec.U2OInterconnection {
+			if subnet.Status.U2OInterconnectionIP != "" {
+				if err := c.addPolicyRouteForU2ONoLoadBalancer(subnet); err != nil {
+					klog.Errorf("failed to add policy route for underlay to overlay subnet interconnection without enabling loadbalancer %s %v", subnet.Name, err)
+					return err
+				}
 			}
 		} else {
 			if err := c.deletePolicyRouteForU2ONoLoadBalancer(subnet); err != nil {
@@ -1734,11 +1737,6 @@ func (c *Controller) reconcileSubnetSpecialIPs(subnet *kubeovnv1.Subnet) (bool,
 			}
 			isU2OIPChanged = true
 		}
-
-		if isU2OIPChanged {
-			klog.Infof("reconcile underlay subnet %s to overlay interconnection with U2OInterconnection %v U2OInterconnectionIP %s",
-				subnet.Name, subnet.Spec.U2OInterconnection, subnet.Status.U2OInterconnectionIP)
-		}
 	}
 
 	// reconcile mcast querier IP

pkg/controller/vpc.go

@@ -594,7 +594,11 @@ func (c *Controller) handleAddOrUpdateVpc(key string) error {
 	custVpcEnableExternalEcmp := false
 	for _, subnet := range subnets {
 		if subnet.Spec.Vpc == key {
-			c.addOrUpdateSubnetQueue.Add(subnet.Name)
+			// Accelerate subnet update when vpc config is updated.
+			// In case VPC not set namespaces, subnet will backoff and may take long time to back to ready.
+			if subnet.Status.IsNotReady() {
+				c.addOrUpdateSubnetQueue.Add(subnet.Name)
+			}
 			if vpc.Name != util.DefaultVpc && vpc.Spec.EnableBfd && subnet.Spec.EnableEcmp {
 				custVpcEnableExternalEcmp = true
 			}