Skip to content

Commit

Permalink
Revert "nm not managed only in the change provide nic name case (#2754)…
Browse files Browse the repository at this point in the history
…" (#2944)
  • Loading branch information
zhangzujian committed Jun 16, 2023
1 parent 765dc8d commit e13c200
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions pkg/daemon/ovs_linux.go
Expand Up @@ -914,6 +914,12 @@ 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
Expand Down

0 comments on commit e13c200

Please sign in to comment.