nm not managed only in the change provide nic name case (#2754)

kubeovn · May 5, 2023 · c77f368 · c77f368
1 parent cc1be3e
commit c77f368
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/pkg/daemon/init.go b/pkg/daemon/init.go
@@ -40,6 +40,7 @@ func InitOVSBridges() (map[string]string, error) {
 					return nil, fmt.Errorf("failed to check vendor of port %s: %v", port, err)
 				}
 				if ok {
+					klog.Infof("config provider nic %s on bridge %s", port, brName)
 					if _, err = configProviderNic(port, brName); err != nil {
 						return nil, err
 					}
@@ -125,6 +126,7 @@ func ovsInitProviderNetwork(provider, nic string, exchangeLinkName, macLearningF
 	}
 
 	// add host nic to the external bridge
+	klog.Infof("config provider nic %s on bridge %s", nic, brName)
 	mtu, err := configProviderNic(nic, brName)
 	if err != nil {
 		errMsg := fmt.Errorf("failed to add nic %s to external bridge %s: %v", nic, brName, err)

diff --git a/pkg/daemon/ovs_linux.go b/pkg/daemon/ovs_linux.go
@@ -911,12 +911,6 @@ func configProviderNic(nicName, brName string) (int, error) {
 		return 0, fmt.Errorf("failed to get routes on nic %s: %v", nicName, err)
 	}
 
-	// set link unmanaged by NetworkManager
-	if err = nmSetManaged(nicName, false); err != nil {
-		klog.Errorf("failed set device %s unmanaged by NetworkManager: %v", nicName, err)
-		return 0, err
-	}
-
 	for _, addr := range addrs {
 		if addr.IP.IsLinkLocalUnicast() {
 			// skip 169.254.0.0/16 and fe80::/10