From c77f368187b5be35fe27a97ef60a09375e8ca226 Mon Sep 17 00:00:00 2001 From: bobz965 Date: Fri, 5 May 2023 14:53:07 +0800 Subject: [PATCH] nm not managed only in the change provide nic name case (#2754) --- pkg/daemon/init.go | 2 ++ pkg/daemon/ovs_linux.go | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/daemon/init.go b/pkg/daemon/init.go index 237cff8da59..51f5a1c6c68 100644 --- 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 index dad3cb2d1a2..c797d928472 100644 --- 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