Skip to content

Commit 944f304

Browse files
zbb88888zhangzujian
authored andcommitted
nm not managed only in the change provide nic name case (#2754)
1 parent a55db01 commit 944f304

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
@@ -40,6 +40,7 @@ func InitOVSBridges() (map[string]string, error) {
4040
return nil, fmt.Errorf("failed to check vendor of port %s: %v", port, err)
4141
}
4242
if ok {
43+
klog.Infof("config provider nic %s on bridge %s", port, brName)
4344
if _, err = configProviderNic(port, brName); err != nil {
4445
return nil, err
4546
}
@@ -124,6 +125,7 @@ func ovsInitProviderNetwork(provider, nic string, exchangeLinkName, macLearningF
124125
}
125126

126127
// add host nic to the external bridge
128+
klog.Infof("config provider nic %s on bridge %s", nic, brName)
127129
mtu, err := configProviderNic(nic, brName)
128130
if err != nil {
129131
errMsg := fmt.Errorf("failed to add nic %s to external bridge %s: %v", nic, brName, err)

pkg/daemon/ovs_linux.go

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

596-
// set link unmanaged by NetworkManager
597-
if err = nmSetManaged(nicName, false); err != nil {
598-
klog.Errorf("failed set device %s unmanaged by NetworkManager: %v", nicName, err)
599-
return 0, err
600-
}
601-
602596
for _, addr := range addrs {
603597
if addr.IP.IsLinkLocalUnicast() {
604598
// skip 169.254.0.0/16 and fe80::/10

0 commit comments

Comments
 (0)