Skip to content

Commit f44ec54

Browse files
committed
underlay: get address/route before setting nm managed to no (#2592)
1 parent 250f340 commit f44ec54

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

pkg/daemon/init.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -198,13 +198,6 @@ func changeProvideNicName(current, target string) (bool, error) {
198198
return true, nil
199199
}
200200

201-
// set link unmanaged by NetworkManager
202-
if err = nmSetManaged(current, false); err != nil {
203-
klog.Errorf("failed set device %s unmanaged by NetworkManager: %v", current, err)
204-
return false, err
205-
}
206-
207-
klog.Infof("renaming link %s as %s", current, target)
208201
addresses, err := netlink.AddrList(link, netlink.FAMILY_ALL)
209202
if err != nil {
210203
klog.Errorf("failed to list addresses of link %s: %v", current, err)
@@ -216,6 +209,13 @@ func changeProvideNicName(current, target string) (bool, error) {
216209
return false, err
217210
}
218211

212+
// set link unmanaged by NetworkManager
213+
if err = nmSetManaged(current, false); err != nil {
214+
klog.Errorf("failed set device %s unmanaged by NetworkManager: %v", current, err)
215+
return false, err
216+
}
217+
218+
klog.Infof("renaming link %s as %s", current, target)
219219
if err = netlink.LinkSetDown(link); err != nil {
220220
klog.Errorf("failed to set link %s down: %v", current, err)
221221
return false, err

0 commit comments

Comments
 (0)