Merge pull request #22784 from danwinship/macvlan-ifindex-workaround

Bug 1705686: Work around a kernel bug in the assign-macvlan code

Author: openshift-merge-robot

cmd/sdn-cni-plugin/openshift-sdn_linux.go

@@ -206,7 +206,13 @@ func (p *cniPlugin) CmdAdd(args *skel.CmdArgs) error {
 			// add a route to that via the SDN
 			var addrs []netlink.Addr
 			err = hostNS.Do(func(ns.NetNS) error {
-				parent, err := netlink.LinkByIndex(link.Attrs().ParentIndex)
+				// workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1705686
+				parentIndex := link.Attrs().ParentIndex
+				if parentIndex == 0 {
+					parentIndex = link.Attrs().Index
+				}
+
+				parent, err := netlink.LinkByIndex(parentIndex)
 				if err != nil {
 					return err
 				}