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

Merge pull request #301 from mars1024/bugfix/ipam_revert

Browse Source 
fix bug on ip revert if cmdAdd fails on macvlan and host-device
This commit is contained in:
Dan Williams 2019-04-24 10:36:40 -05:00 committed by GitHub
commit 827a4bd843
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/main/host-device/host-device.go
View File

@ -21,6 +21,7 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"net" "net"
"os"
"path/filepath" "path/filepath"
"runtime" "runtime"
"strings" "strings"
@ -96,7 +97,9 @@ func cmdAdd(args *skel.CmdArgs) error {
// Invoke ipam del if err to avoid ip leak // Invoke ipam del if err to avoid ip leak
defer func() { defer func() {
if err != nil { if err != nil {
os.Setenv("CNI_COMMAND", "DEL")
ipam.ExecDel(cfg.IPAM.Type, args.StdinData) ipam.ExecDel(cfg.IPAM.Type, args.StdinData)
os.Setenv("CNI_COMMAND", "ADD")
} }
}() }()

3
plugins/main/macvlan/macvlan.go
View File

@ -19,6 +19,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"net" "net"
"os"
"runtime" "runtime"
"github.com/j-keck/arping" "github.com/j-keck/arping"
@ -197,7 +198,9 @@ func cmdAdd(args *skel.CmdArgs) error {
// Invoke ipam del if err to avoid ip leak // Invoke ipam del if err to avoid ip leak
defer func() { defer func() {
if err != nil { if err != nil {
os.Setenv("CNI_COMMAND", "DEL")
ipam.ExecDel(n.IPAM.Type, args.StdinData) ipam.ExecDel(n.IPAM.Type, args.StdinData)
os.Setenv("CNI_COMMAND", "ADD")
} }
}() }()