Skip to content

Commit 5eef52a

Browse files
zbb88888zhangzujian
authored andcommitted
nm not managed only in the change provide nic name case (#2754)
1 parent 635c57b commit 5eef52a

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

pkg/daemon/init.go

+2
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ func InitOVSBridges() (map[string]string, error) {
5252
return nil, fmt.Errorf("failed to check vendor of port %s: %v", port, err)
5353
}
5454
if ok {
55+
klog.Infof("config provider nic %s on bridge %s", port, brName)
5556
if _, err = configProviderNic(port, brName); err != nil {
5657
return nil, err
5758
}
@@ -303,6 +304,7 @@ func ovsInitProviderNetwork(provider, nic string, exchangeLinkName, macLearningF
303304
}
304305

305306
// add host nic to the external bridge
307+
klog.Infof("config provider nic %s on bridge %s", nic, brName)
306308
mtu, err := configProviderNic(nic, brName)
307309
if err != nil {
308310
errMsg := fmt.Errorf("failed to add nic %s to external bridge %s: %v", nic, brName, err)

pkg/daemon/ovs.go

-6
Original file line numberDiff line numberDiff line change
@@ -729,12 +729,6 @@ func configProviderNic(nicName, brName string) (int, error) {
729729
return 0, fmt.Errorf("failed to get routes on nic %s: %v", nicName, err)
730730
}
731731

732-
// set link unmanaged by NetworkManager
733-
if err = nmSetManaged(nicName, false); err != nil {
734-
klog.Errorf("failed set device %s unmanaged by NetworkManager: %v", nicName, err)
735-
return 0, err
736-
}
737-
738732
for _, addr := range addrs {
739733
if addr.IP.IsLinkLocalUnicast() {
740734
// skip 169.254.0.0/16 and fe80::/10

0 commit comments

Comments
 (0)