Skip to content

Commit 265392c

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

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

pkg/daemon/ovs.go

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

0 commit comments

Comments
 (0)