fix del bridge error

Signed-off-by: wangs <[email protected]>
kubeovn · Sep 4, 2024 · ed5cbb2 · ed5cbb2
1 parent f2e6827
commit ed5cbb2
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/pkg/daemon/gateway_linux.go b/pkg/daemon/gateway_linux.go
@@ -1422,6 +1422,7 @@ func (c *Controller) setExGateway() error {
 		klog.Errorf("failed to get node, %v", err)
 		return err
 	}
+	var isUserspaceDP bool
 	enable := node.Labels[util.ExGatewayLabel]
 	externalBridge := util.ExternalBridgeName(c.config.ExternalGatewaySwitch)
 	if enable == "true" {
@@ -1438,7 +1439,7 @@ func (c *Controller) setExGateway() error {
 			return err
 		}
 
-		isUserspaceDP, err := ovs.IsUserspaceDataPath()
+		isUserspaceDP, err = ovs.IsUserspaceDataPath()
 		if err != nil {
 			klog.Error(err)
 			return err
@@ -1523,13 +1524,15 @@ func (c *Controller) setExGateway() error {
 			}
 		}
 
-		if !keepExternalSubnet {
-			klog.Infof("delete external bridge %s", externalBridge)
-			if _, err := ovs.Exec(
-				ovs.IfExists, "del-br", externalBridge); err != nil {
-				err = fmt.Errorf("failed to disable external gateway, %w", err)
-				klog.Error(err)
-				return err
+		if !isUserspaceDP {
+			if !keepExternalSubnet {
+				klog.Infof("delete external bridge %s", externalBridge)
+				if _, err := ovs.Exec(
+					ovs.IfExists, "del-br", externalBridge); err != nil {
+					err = fmt.Errorf("failed to disable external gateway, %w", err)
+					klog.Error(err)
+					return err
+				}
 			}
 		}
 	}