diff --git a/libcontainer/cgroups/fs/memory.go b/libcontainer/cgroups/fs/memory.go index f867b9e2f8f..fdea5d8f707 100644 --- a/libcontainer/cgroups/fs/memory.go +++ b/libcontainer/cgroups/fs/memory.go @@ -282,11 +282,11 @@ func getPageUsageByNUMA(path string) (cgroups.PageUsageByNUMA, error) { line := scanner.Text() columns := strings.SplitN(line, " ", maxColumns) for i, column := range columns { - key, val, isValidNumaStats := strings.Cut(column, "=") + key, val, ok := strings.Cut(column, "=") // Some custom kernels have non-standard fields, like // numa_locality 0 0 0 0 0 0 0 0 0 0 // numa_exectime 0 - if !isValidNumaStats { + if !ok { if i != 0 { // The first column was already validated, // so be strict to the rest. diff --git a/libcontainer/cgroups/systemd/cpuset.go b/libcontainer/cgroups/systemd/cpuset.go index a3dfea71c67..c6f5642dcd2 100644 --- a/libcontainer/cgroups/systemd/cpuset.go +++ b/libcontainer/cgroups/systemd/cpuset.go @@ -21,13 +21,13 @@ func RangeToBits(str string) ([]byte, error) { if r == "" { continue } - startRange, endRange, doesHaveEnd := strings.Cut(r, "-") - if doesHaveEnd { - start, err := strconv.ParseUint(startRange, 10, 32) + startr, endr, ok := strings.Cut(r, "-") + if ok { + start, err := strconv.ParseUint(startr, 10, 32) if err != nil { return nil, err } - end, err := strconv.ParseUint(endRange, 10, 32) + end, err := strconv.ParseUint(endr, 10, 32) if err != nil { return nil, err } @@ -38,7 +38,7 @@ func RangeToBits(str string) ([]byte, error) { bits.SetBit(bits, int(i), 1) } } else { - val, err := strconv.ParseUint(startRange, 10, 32) + val, err := strconv.ParseUint(startr, 10, 32) if err != nil { return nil, err } diff --git a/libcontainer/init_linux.go b/libcontainer/init_linux.go index 70c731be73c..5123314516d 100644 --- a/libcontainer/init_linux.go +++ b/libcontainer/init_linux.go @@ -259,8 +259,8 @@ func containerInit(t initType, config *initConfig, pipe *syncSocket, consoleSock // current processes's environment. func populateProcessEnvironment(env []string) error { for _, pair := range env { - name, val, isValidEnv := strings.Cut(pair, "=") - if !isValidEnv { + name, val, ok := strings.Cut(pair, "=") + if !ok { return errors.New("invalid environment variable: missing '='") } if name == "" { diff --git a/libcontainer/utils/utils.go b/libcontainer/utils/utils.go index cf006ca7dc1..db420ea688d 100644 --- a/libcontainer/utils/utils.go +++ b/libcontainer/utils/utils.go @@ -101,8 +101,8 @@ func SearchLabels(labels []string, key string) (string, bool) { func Annotations(labels []string) (bundle string, userAnnotations map[string]string) { userAnnotations = make(map[string]string) for _, l := range labels { - name, value, isValidAnnotation := strings.Cut(l, "=") - if !isValidAnnotation { + name, value, ok := strings.Cut(l, "=") + if !ok { continue } if name == "bundle" {