Skip to content

Commit d15874e

Browse files
committed
Revert "nm not managed only in the change provide nic name case (#2754)" (#2944)
1 parent 168863c commit d15874e

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

pkg/daemon/ovs_linux.go

+6
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,12 @@ 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+
596602
for _, addr := range addrs {
597603
if addr.IP.IsLinkLocalUnicast() {
598604
// skip 169.254.0.0/16 and fe80::/10

0 commit comments

Comments
 (0)