Skip to content

Commit 4c08bfe

Browse files
committed
do not set device unmanaged if NetworkManager is not running (#2549)
1 parent 39c99c6 commit 4c08bfe

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ require (
66
github.com/Mellanox/sriovnet v1.1.0
77
github.com/Microsoft/go-winio v0.6.0
88
github.com/Microsoft/hcsshim v0.9.6
9-
github.com/Wifx/gonetworkmanager v0.5.0
109
github.com/alauda/felix v3.6.6-0.20201207121355-187332daf314+incompatible
1110
github.com/bhendo/go-powershell v0.0.0-20190719160123-219e7fb4e41e
1211
github.com/cenkalti/backoff/v4 v4.2.0
@@ -19,6 +18,7 @@ require (
1918
github.com/evanphx/json-patch/v5 v5.6.0
2019
github.com/greenpau/ovsdb v1.0.3
2120
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.4.0
21+
github.com/kubeovn/gonetworkmanager/v2 v2.0.0-20230324083932-9703e27202aa
2222
github.com/mdlayher/arp v0.0.0-20220512170110-6706a2966875
2323
github.com/moby/sys/mountinfo v0.6.2
2424
github.com/neverlee/keymutex v0.0.0-20171121013845-f593aa834bf9

go.sum

+2-3
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,6 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdko
149149
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
150150
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
151151
github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
152-
github.com/Wifx/gonetworkmanager v0.5.0 h1:P209z0yj705bl5tmyHTlpXPSv3QzjPtIM4X0SyDAqWA=
153-
github.com/Wifx/gonetworkmanager v0.5.0/go.mod h1:EdhHf2O00IZXfMv9LC6CS6SgTwcMTg/ZSDhGvch0cs8=
154152
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
155153
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
156154
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
@@ -598,7 +596,6 @@ github.com/gobuffalo/flect v0.1.5/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7
598596
github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
599597
github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
600598
github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
601-
github.com/godbus/dbus/v5 v5.0.2/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
602599
github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
603600
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
604601
github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
@@ -899,6 +896,8 @@ github.com/kubeovn/arp v0.0.0-20230101053045-8a0772d9c34c h1:AcOKlV+lInNlGO3o3+1
899896
github.com/kubeovn/arp v0.0.0-20230101053045-8a0772d9c34c/go.mod h1:Ce8lvkopTGXfPmeb5AY3/umEOmoFVV3HlCPGfGk0+Y0=
900897
github.com/kubeovn/felix v0.0.0-20220325073257-c8a0f705d139 h1:MaLC8/dohKHU8nkfglfE2oikefB6urJG75yZDOcKTRU=
901898
github.com/kubeovn/felix v0.0.0-20220325073257-c8a0f705d139/go.mod h1:ulxnUH9cbIOtCH+exhJPeV2mleh+bDv67WKsl/MVU/g=
899+
github.com/kubeovn/gonetworkmanager/v2 v2.0.0-20230324083932-9703e27202aa h1:qkH9upUJaWqbtCNOO+AJZ7TQ7E4VmfZ6sS2KfQ49J7w=
900+
github.com/kubeovn/gonetworkmanager/v2 v2.0.0-20230324083932-9703e27202aa/go.mod h1:CFDIM8UHDd7v7MVB41VzMW8FB03yOD7huzQlPsl5elw=
902901
github.com/kubeovn/kubevirt-client-go v0.0.0-20221209084839-9c2ed1f0604d h1:sM7V2MhONBa10zYQA1yg/UbPm/Y7JqVqymtgoDiGqMo=
903902
github.com/kubeovn/kubevirt-client-go v0.0.0-20221209084839-9c2ed1f0604d/go.mod h1:FjHUGVwls5NE1q8rsSL0LsRU46p35cwgnwSItkr8oXs=
904903
github.com/kubeovn/libovsdb v0.0.0-20221208095821-f8830e1998e8 h1:gkYOU8DJQJeDef9hYETOf0D270zVS3xYuytjFLEi0rc=

pkg/daemon/init_linux.go

+12-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ package daemon
33
import (
44
"time"
55

6-
"k8s.io/klog/v2"
7-
8-
"github.com/Wifx/gonetworkmanager"
6+
"github.com/kubeovn/gonetworkmanager/v2"
97
"github.com/vishvananda/netlink"
8+
"k8s.io/klog/v2"
109

1110
"github.com/kubeovn/kube-ovn/pkg/util"
1211
)
@@ -25,6 +24,16 @@ func nmSetManaged(device string, managed bool) error {
2524
return nil
2625
}
2726

27+
running, err := nm.Running()
28+
if err != nil {
29+
klog.Warningf("failed to check NetworkManager running state: %v", err)
30+
return nil
31+
}
32+
if !running {
33+
klog.V(5).Info("NetworkManager is not running, ignore")
34+
return nil
35+
}
36+
2837
d, err := nm.GetDeviceByIpIface(device)
2938
if err != nil {
3039
klog.Errorf("failed to get device by IP iface %s: %v", device, err)

0 commit comments

Comments
 (0)