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

gofmt

Browse source
This commit is contained in:
Nicholas Orlowsky 2023-07-16 23:47:43 -04:00
parent 8621dfc66d
commit 0f4d054c07
No known key found for this signature in database
GPG key ID: 58832FD3AC16C706
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/util/runtime/cpu_notlinux.go
View file

@ -26,4 +26,4 @@ import (
// NumCPU ... // NumCPU ...
func NumCPU() int { func NumCPU() int {
return runtime.NumCPU() return runtime.NumCPU()
} }

30
test/e2e/cgroups/cgroups_linux.go
View file

@ -28,8 +28,8 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework" "k8s.io/ingress-nginx/test/e2e/framework"
"path/filepath"
"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"
) )
@ -48,29 +48,29 @@ var _ = framework.IngressNginxDescribeSerial("[CGroups] cgroups", func() {
log.Fatal(err) log.Fatal(err)
} }
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"); quotaFile.WriteString("4")
quotaFile.Sync(); quotaFile.Sync()
periodFile.WriteString("2"); periodFile.WriteString("2")
periodFile.Sync(); periodFile.Sync()
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)
os.Remove(filepath.Join(cgroupPath,"cpu.cfs_quota_us")) os.Remove(filepath.Join(cgroupPath, "cpu.cfs_quota_us"))
os.Remove(filepath.Join(cgroupPath,"cpu.cfs_period_us")) os.Remove(filepath.Join(cgroupPath, "cpu.cfs_period_us"))
}) })
ginkgo.It("detect cgroups version v2", func() { ginkgo.It("detect cgroups version v2", func() {
@ -85,10 +85,10 @@ var _ = framework.IngressNginxDescribeSerial("[CGroups] cgroups", func() {
log.Fatal(err) log.Fatal(err)
} }
file.WriteString("4 2"); file.WriteString("4 2")
file.Sync(); file.Sync()
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)
os.Remove("/sys/fs/cgroup/cpu.max") os.Remove("/sys/fs/cgroup/cpu.max")