DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix lint errors

Browse source
This commit is contained in:
Nicholas Orlowsky 2024-05-18 02:44:18 +02:00
parent 9e79a36020
commit ac0f6fcd39
No known key found for this signature in database
GPG key ID: 838827D8C4611687
2 changed files with 38 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkg/util/runtime/cpu_linux.go
View file

@ -64,14 +64,13 @@ func GetCgroupVersion() int64 {
// /sys/fs/cgroup/cgroup.controllers will not exist with cgroupsv1 // /sys/fs/cgroup/cgroup.controllers will not exist with cgroupsv1
if _, err := os.Stat("/sys/fs/cgroup/cgroup.controllers"); err == nil { if _, err := os.Stat("/sys/fs/cgroup/cgroup.controllers"); err == nil {
return 2 return 2
} else {
return 1
} }
return 1
} }
func readCgroup2FileToInt64Tuple(cgroupFile string) (int64, int64) { func readCgroup2FileToInt64Tuple(cgroupFile string) (quota, period int64) {
contents, err := os.ReadFile(filepath.Join("/sys/fs/cgroup/", cgroupFile)) contents, err := os.ReadFile(filepath.Join(string(os.PathSeparator), "sys", "fs", "cgroup", cgroupFile))
if err != nil { if err != nil {
return -1, -1 return -1, -1
} }
@ -87,7 +86,6 @@ func readCgroup2FileToInt64Tuple(cgroupFile string) (int64, int64) {
} }
cpuQuota, err := strconv.ParseInt(values[0], 10, 64) cpuQuota, err := strconv.ParseInt(values[0], 10, 64)
if err != nil { if err != nil {
return -1, -1 return -1, -1
} }
@ -97,7 +95,6 @@ func readCgroup2FileToInt64Tuple(cgroupFile string) (int64, int64) {
} }
cpuPeriod, err := strconv.ParseInt(values[1], 10, 64) cpuPeriod, err := strconv.ParseInt(values[1], 10, 64)
if err != nil { if err != nil {
return -1, -1 return -1, -1
} }

46
test/e2e/cgroups/cgroups.go
View file

@ -19,6 +19,7 @@ package cgroups
import ( import (
"log" "log"
"os" "os"
"path/filepath"
"github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
@ -26,7 +27,6 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework" "k8s.io/ingress-nginx/test/e2e/framework"
"k8s.io/ingress-nginx/pkg/util/runtime" "k8s.io/ingress-nginx/pkg/util/runtime"
"path/filepath"
libcontainercgroups "github.com/opencontainers/runc/libcontainer/cgroups" libcontainercgroups "github.com/opencontainers/runc/libcontainer/cgroups"
) )
@ -46,22 +46,34 @@ var _ = framework.IngressNginxDescribeSerial("[CGroups] cgroups", func() {
} }
quotaFile, err := os.Create(filepath.Join(cgroupPath, "cpu.cfs_quota_us")) quotaFile, err := os.Create(filepath.Join(cgroupPath, "cpu.cfs_quota_us"))
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
periodFile, err := os.Create(filepath.Join(cgroupPath, "cpu.cfs_period_us")) periodFile, err := os.Create(filepath.Join(cgroupPath, "cpu.cfs_period_us"))
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
quotaFile.WriteString("4") _, err = quotaFile.WriteString("4")
quotaFile.Sync() if err != nil {
log.Fatal(err)
}
periodFile.WriteString("2") err = quotaFile.Sync()
periodFile.Sync() if err != nil {
log.Fatal(err)
}
_, err = periodFile.WriteString("2")
if err != nil {
log.Fatal(err)
}
err = periodFile.Sync()
if err != nil {
log.Fatal(err)
}
assert.Equal(ginkgo.GinkgoT(), runtime.GetCgroupVersion(), int64(1)) assert.Equal(ginkgo.GinkgoT(), runtime.GetCgroupVersion(), int64(1))
assert.Equal(ginkgo.GinkgoT(), runtime.NumCPU(), 2) assert.Equal(ginkgo.GinkgoT(), runtime.NumCPU(), 2)
@ -75,15 +87,25 @@ var _ = framework.IngressNginxDescribeSerial("[CGroups] cgroups", func() {
log.Fatal(err) log.Fatal(err)
} }
os.Create("/sys/fs/cgroup/cgroup.controllers") _, err := os.Create("/sys/fs/cgroup/cgroup.controllers")
file, err := os.Create("/sys/fs/cgroup/cpu.max")
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
file.WriteString("4 2") file, err := os.Create("/sys/fs/cgroup/cpu.max")
file.Sync() if err != nil {
log.Fatal(err)
}
_, err = file.WriteString("4 2")
if err != nil {
log.Fatal(err)
}
err = file.Sync()
if err != nil {
log.Fatal(err)
}
assert.Equal(ginkgo.GinkgoT(), runtime.GetCgroupVersion(), int64(2)) assert.Equal(ginkgo.GinkgoT(), runtime.GetCgroupVersion(), int64(2))
assert.Equal(ginkgo.GinkgoT(), runtime.NumCPU(), 2) assert.Equal(ginkgo.GinkgoT(), runtime.NumCPU(), 2)