ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

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

Browse Source 
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
commit 2d6d4b260a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/main/bridge/bridge.go
View File

@ -175,7 +175,7 @@ func ensureAddr(br netlink.Link, family int, ipn *net.IPNet, forceAddress bool)
} }
addr := &netlink.Addr{IPNet: ipn, Label: ""} 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) return fmt.Errorf("could not add IP address to %q: %v", br.Attrs().Name, err)
} }