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

Merge pull request #954 from cyclinder/improve_cmd_del

Browse Source 
macvlan cmdDel: replace the loadConf function with json.unmarshal
This commit is contained in:
Casey Callendrello 2023-11-16 19:06:11 +01:00 committed by GitHub
commit abee8ccc0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -383,13 +383,13 @@ func cmdAdd(args *skel.CmdArgs) error {
} }
func cmdDel(args *skel.CmdArgs) error { func cmdDel(args *skel.CmdArgs) error {
n, _, err := loadConf(args, args.Args) var n NetConf
err := json.Unmarshal(args.StdinData, &n)
if err != nil { if err != nil {
return err return fmt.Errorf("failed to load netConf: %v", err)
} }
isLayer3 := n.IPAM.Type != "" isLayer3 := n.IPAM.Type != ""
if isLayer3 { if isLayer3 {
err = ipam.ExecDel(n.IPAM.Type, args.StdinData) err = ipam.ExecDel(n.IPAM.Type, args.StdinData)
if err != nil { if err != nil {