github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #5627 from payall4u/payall4u/cri-support-cgroup-v2

Browse Source
This commit is contained in:
Fu Wei
2021-09-09 23:10:33 +08:00
committed by GitHub
parent d040ca3845 f8dfbee178
commit d58542a9d1
3 changed files with 62 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cri/server/container_create_linux_test.go
View File

@@ -90,6 +90,7 @@ func getCreateContainerTestData() (*runtime.ContainerConfig, *runtime.PodSandbox
OomScoreAdj: 500,
CpusetCpus: "0-1",
CpusetMems: "2-3",
Unified: map[string]string{"memory.min": "65536", "memory.swap.max": "1024"},
},
SecurityContext: &runtime.LinuxContainerSecurityContext{
SupplementalGroups: []int64{1111, 2222},
@@ -136,6 +137,7 @@ func getCreateContainerTestData() (*runtime.ContainerConfig, *runtime.PodSandbox
assert.EqualValues(t, *spec.Linux.Resources.CPU.Shares, 300)
assert.EqualValues(t, spec.Linux.Resources.CPU.Cpus, "0-1")
assert.EqualValues(t, spec.Linux.Resources.CPU.Mems, "2-3")
assert.EqualValues(t, spec.Linux.Resources.Unified, map[string]string{"memory.min": "65536", "memory.swap.max": "1024"})
assert.EqualValues(t, *spec.Linux.Resources.Memory.Limit, 400)
assert.EqualValues(t, *spec.Process.OOMScoreAdj, 500)