Skip to content

Commit

Permalink
improve macvlan cmdDel: ignore link not found
Browse files Browse the repository at this point in the history
Signed-off-by: cyclinder <qifeng.guo@daocloud.io>
  • Loading branch information
cyclinder committed Oct 11, 2023
1 parent f955052 commit 2cd6d82
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions plugins/main/macvlan/macvlan.go
Original file line number Diff line number Diff line change
Expand Up @@ -382,13 +382,13 @@ func cmdAdd(args *skel.CmdArgs) error {
}

func cmdDel(args *skel.CmdArgs) error {
n, _, err := loadConf(args, args.Args)
if err != nil {
return err
var n NetConf
var err error
if err := json.Unmarshal(args.StdinData, &n); err != nil {
return fmt.Errorf("failed to unmarshal net conf: %v", err)
}

isLayer3 := n.IPAM.Type != ""

if isLayer3 {
err = ipam.ExecDel(n.IPAM.Type, args.StdinData)
if err != nil {
Expand Down

0 comments on commit 2cd6d82

Please sign in to comment.