fix NB Global not updated after OVN IC is disabled (#5511)

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

Author: zhangzujian

pkg/ovn_ic_controller/ovn_ic_controller.go

@@ -52,12 +52,12 @@ func (c *Controller) disableOVNIC(azName string) error {
 	return nil
 }
 
-func (c *Controller) setAutoRoute(autoRoute bool) {
+func (c *Controller) setAutoRoute(autoRoute bool) error {
 	var blackList []string
 	subnets, err := c.subnetsLister.List(labels.Everything())
 	if err != nil {
 		klog.Errorf("failed to list subnets, %v", err)
-		return
+		return err
 	}
 	for _, subnet := range subnets {
 		if subnet.Spec.DisableInterConnection || subnet.Name == c.config.NodeSwitch {
@@ -67,7 +67,7 @@ func (c *Controller) setAutoRoute(autoRoute bool) {
 	nodes, err := c.nodesLister.List(labels.Everything())
 	if err != nil {
 		klog.Errorf("failed to list node, %v", err)
-		return
+		return err
 	}
 	for _, node := range nodes {
 		ipv4, ipv6 := util.GetNodeInternalIP(*node)
@@ -80,8 +80,10 @@ func (c *Controller) setAutoRoute(autoRoute bool) {
 	}
 	if err := c.OVNNbClient.SetICAutoRoute(autoRoute, blackList); err != nil {
 		klog.Errorf("failed to config auto route, %v", err)
-		return
+		return err
 	}
+
+	return nil
 }
 
 func (c *Controller) DeleteICResources(azName string) error {
@@ -178,14 +180,22 @@ func (c *Controller) resyncInterConnection() {
 			klog.Errorf("Disable az %s OVN IC failed: %v", azName, err)
 			return
 		}
+		if err = c.setAutoRoute(false); err != nil {
+			klog.Errorf("failed to disable auto route: %v", err)
+			return
+		}
+
 		icEnabled = "false"
 		lastIcCm = nil
 
 		klog.Info("finish removing ovn-ic")
 		return
 	}
 
-	c.setAutoRoute(cm.Data["auto-route"] == "true")
+	if err = c.setAutoRoute(cm.Data["auto-route"] == "true"); err != nil {
+		klog.Errorf("failed to set auto route: %v", err)
+		return
+	}
 
 	switch c.getICState(cm.Data, lastIcCm) {
 	case icNoAction:

pkg/ovs/ovn-nb_global.go

@@ -173,7 +173,6 @@ func (c *OVNNbClient) SetICAutoRoute(enable bool, blackList []string) error {
 		delete(options, "ic-route-blacklist")
 	}
 	if maps.Equal(options, nbGlobal.Options) {
-		nbGlobal.Options = options
 		return nil
 	}