Merge pull request #366 from Random-Liu/fix-bridge-race

Fix: failed to set bridge addr: could not add IP address to \"cni0\": file exists
This commit is contained in:
Casey Callendrello
2019-08-12 13:08:32 +02:00
committed by GitHub

View File

@ -175,7 +175,7 @@ func ensureAddr(br netlink.Link, family int, ipn *net.IPNet, forceAddress bool)
}
addr := &netlink.Addr{IPNet: ipn, Label: ""}
if err := netlink.AddrAdd(br, addr); err != nil {
if err := netlink.AddrAdd(br, addr); err != nil && err != syscall.EEXIST {
return fmt.Errorf("could not add IP address to %q: %v", br.Attrs().Name, err)
}