Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

do not set device unmanaged if NetworkManager is not running #2549

Merged
merged 2 commits into from
Mar 27, 2023
Merged

do not set device unmanaged if NetworkManager is not running #2549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c03b615
do not set device unmanaged if NetworkManager is not running
zhangzujian Mar 24, 2023
085d1d5
minor fixes
zhangzujian Mar 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ require (
github.com/Mellanox/sriovnet v1.1.0
github.com/Microsoft/go-winio v0.6.0
github.com/Microsoft/hcsshim v0.9.8
github.com/Wifx/gonetworkmanager v0.5.0
github.com/alauda/felix v3.6.6-0.20201207121355-187332daf314+incompatible
github.com/bhendo/go-powershell v0.0.0-20190719160123-219e7fb4e41e
github.com/cenkalti/backoff/v4 v4.2.0
Expand All @@ -21,6 +20,7 @@ require (
github.com/golang/mock v1.6.0
github.com/greenpau/ovsdb v1.0.3
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.4.0
github.com/kubeovn/gonetworkmanager/v2 v2.0.0-20230324083932-9703e27202aa
github.com/mdlayher/arp v0.0.0-20220512170110-6706a2966875
github.com/moby/sys/mountinfo v0.6.2
github.com/neverlee/keymutex v0.0.0-20171121013845-f593aa834bf9
Expand Down
5 changes: 2 additions & 3 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,6 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdko
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
github.com/Wifx/gonetworkmanager v0.5.0 h1:P209z0yj705bl5tmyHTlpXPSv3QzjPtIM4X0SyDAqWA=
github.com/Wifx/gonetworkmanager v0.5.0/go.mod h1:EdhHf2O00IZXfMv9LC6CS6SgTwcMTg/ZSDhGvch0cs8=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
Expand Down Expand Up @@ -616,7 +614,6 @@ github.com/gobuffalo/flect v0.1.5/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7
github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
github.com/godbus/dbus/v5 v5.0.2/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
Expand Down Expand Up @@ -927,6 +924,8 @@ github.com/kubeovn/arp v0.0.0-20230101053045-8a0772d9c34c h1:AcOKlV+lInNlGO3o3+1
github.com/kubeovn/arp v0.0.0-20230101053045-8a0772d9c34c/go.mod h1:Ce8lvkopTGXfPmeb5AY3/umEOmoFVV3HlCPGfGk0+Y0=
github.com/kubeovn/felix v0.0.0-20220325073257-c8a0f705d139 h1:MaLC8/dohKHU8nkfglfE2oikefB6urJG75yZDOcKTRU=
github.com/kubeovn/felix v0.0.0-20220325073257-c8a0f705d139/go.mod h1:ulxnUH9cbIOtCH+exhJPeV2mleh+bDv67WKsl/MVU/g=
github.com/kubeovn/gonetworkmanager/v2 v2.0.0-20230324083932-9703e27202aa h1:qkH9upUJaWqbtCNOO+AJZ7TQ7E4VmfZ6sS2KfQ49J7w=
github.com/kubeovn/gonetworkmanager/v2 v2.0.0-20230324083932-9703e27202aa/go.mod h1:CFDIM8UHDd7v7MVB41VzMW8FB03yOD7huzQlPsl5elw=
github.com/kubeovn/kubevirt-client-go v0.0.0-20230301060230-5aae21a9918b h1:lTSeHcqlNKqoeqsaDLGb2iyFcIC0EaT+AtXD+Rzdpi0=
github.com/kubeovn/kubevirt-client-go v0.0.0-20230301060230-5aae21a9918b/go.mod h1:X7WhI5GBZys91c4WWeoOQemxydZw1eaHdC+9jqo2kyY=
github.com/kubeovn/libovsdb v0.0.0-20230208064641-36b813e450dd h1:fPdrmrfxkFEzVoh1mo2kafDI6tW1lJhUHx0uioYKANM=
Expand Down
15 changes: 12 additions & 3 deletions pkg/daemon/init_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ package daemon
import (
"time"

"k8s.io/klog/v2"

"github.com/Wifx/gonetworkmanager"
"github.com/kubeovn/gonetworkmanager/v2"
"github.com/vishvananda/netlink"
"k8s.io/klog/v2"

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

running, err := nm.Running()
if err != nil {
klog.Warningf("failed to check NetworkManager running state: %v", err)
return nil
}
if !running {
klog.V(5).Info("NetworkManager is not running, ignore")
return nil
}

d, err := nm.GetDeviceByIpIface(device)
if err != nil {
klog.Errorf("failed to get device by IP iface %s: %v", device, err)
Expand Down