ci, go.mod: bump to go 1.23 (#1094)
* ci, go.mod: bump to go 1.23 Now that go.mod matches our go version, we can stop setting go version in CI separately. Signed-off-by: Casey Callendrello <c1@caseyc.net> * minor: fix lint errors Bumping golangci-lint to v1.61 introduced some new reasonable checks; fix the errors they found. Signed-off-by: Casey Callendrello <c1@caseyc.net> * ci: bump golangci-lint to v1.61.0 Also, fix some deprecated config directives. Signed-off-by: Casey Callendrello <c1@caseyc.net> --------- Signed-off-by: Casey Callendrello <c1@caseyc.net>
This commit is contained in:

committed by
GitHub

parent
cc8b1bd80c
commit
e5df283ab3
@ -15,6 +15,7 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"net"
|
||||
"strings"
|
||||
@ -130,7 +131,7 @@ func cmdAdd(args *skel.CmdArgs) error {
|
||||
for _, ip := range requestedIPs {
|
||||
errstr = errstr + " " + ip.String()
|
||||
}
|
||||
return fmt.Errorf(errstr)
|
||||
return errors.New(errstr)
|
||||
}
|
||||
|
||||
result.Routes = ipamConf.Routes
|
||||
@ -151,18 +152,18 @@ func cmdDel(args *skel.CmdArgs) error {
|
||||
defer store.Close()
|
||||
|
||||
// Loop through all ranges, releasing all IPs, even if an error occurs
|
||||
var errors []string
|
||||
var errs []string
|
||||
for idx, rangeset := range ipamConf.Ranges {
|
||||
ipAllocator := allocator.NewIPAllocator(&rangeset, store, idx)
|
||||
|
||||
err := ipAllocator.Release(args.ContainerID, args.IfName)
|
||||
if err != nil {
|
||||
errors = append(errors, err.Error())
|
||||
errs = append(errs, err.Error())
|
||||
}
|
||||
}
|
||||
|
||||
if errors != nil {
|
||||
return fmt.Errorf(strings.Join(errors, ";"))
|
||||
if errs != nil {
|
||||
return errors.New(strings.Join(errs, ";"))
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
Reference in New Issue
Block a user