Commit 090b51c
committed
feat: update sandboxd for cgroup v2
Advance the sandboxd submodule to the merged upstream revision that
detects the local cgroup mode and supports both v1 and v2 transparently.
Update the platform and deployment documentation to remove the former
cgroup v1 restriction.
Set the ACK Terraform default to Kubernetes 1.35.2 now that sandboxd can
run on the unified cgroup v2 hierarchy used by that release.
Signed-off-by: Tianyu Zhou <albert.zty@antgroup.com>1 parent 29982af commit 090b51c
7 files changed
Lines changed: 5 additions & 17 deletions
File tree
- deploy
- terraform
- aliyun
- huaweicloud
- src
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
151 | 151 | | |
152 | 152 | | |
153 | 153 | | |
154 | | - | |
155 | | - | |
156 | | - | |
157 | | - | |
158 | 154 | | |
159 | 155 | | |
160 | 156 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
168 | 168 | | |
169 | 169 | | |
170 | 170 | | |
171 | | - | |
| 171 | + | |
172 | 172 | | |
173 | 173 | | |
174 | 174 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | 28 | | |
34 | 29 | | |
35 | 30 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
37 | | - | |
| 36 | + | |
38 | 37 | | |
39 | 38 | | |
40 | 39 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
124 | 124 | | |
125 | 125 | | |
126 | 126 | | |
127 | | - | |
128 | | - | |
| 127 | + | |
| 128 | + | |
129 | 129 | | |
130 | 130 | | |
131 | 131 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
10 | | - | |
11 | 9 | | |
12 | 10 | | |
13 | 11 | | |
| |||
- .dockerignore+1
- README.md+6-5
- config/config.go-12
- configs/sandboxd.toml-1
- go.mod+1
- go.sum+4
- internal/cgroupops/cgroup.go-35
- internal/server/server.go+24-20
- internal/server/server_test.go+1-14
- internal/util/util.go-23
- internal/util/util_test.go-60
- pkg/cgroupmanager/cgroup.go+335-224
- pkg/cgroupmanager/cgroup_extend.go-120
- pkg/cgroupmanager/cgroup_extend_test.go-125
- pkg/cgroupmanager/cgroup_oom.go-105
- pkg/cgroupmanager/lease.go+56
- pkg/cgroupmanager/mock_test.go-51
- pkg/cgroupmanager/oom.go+10-14
- pkg/cgroupmanager/oom_v1.go+270
- pkg/cgroupmanager/oom_v2.go+413
- pkg/cgroupmanager/ops.go+135
- pkg/cgroupmanager/ops_test.go+521
- pkg/cgroupmanager/ops_v1.go+183
- pkg/cgroupmanager/ops_v2.go+237
- pkg/networkmanager/cpuinfo.go+125-36
- pkg/networkmanager/cpuinfo_test.go+88
- pkg/resourcemanager/cgroupv1/cgroup.go-94
- pkg/resourcemanager/cgroupv1/cpu.go-58
- pkg/resourcemanager/cgroupv1/cpu_test.go-38
- pkg/resourcemanager/cgroupv1/cpuacct.go-196
- pkg/resourcemanager/cgroupv1/cpuacct_test.go-606
- pkg/resourcemanager/cgroupv1/cpuset.go-93
- pkg/resourcemanager/cgroupv1/cpuset_test.go-73
- pkg/resourcemanager/cgroupv1/memory.go-79
- pkg/resourcemanager/cgroupv1/memory_test.go-34
- pkg/resourcemanager/cgroupv1/testdata/a/cpu.cfs_quota_us-1
- pkg/resourcemanager/cgroupv1/testdata/a/memory.stat-9
- pkg/resourcemanager/cgroupv1/testdata/b/cpu.cfs_period_us-1
- pkg/resourcemanager/cgroupv1/testdata/b/cpu.cfs_quota_us-1
- pkg/resourcemanager/cgroupv1/testdata/cpu.cfs_period_us-1
- pkg/resourcemanager/cgroupv1/testdata/cpu.cfs_quota_us-1
- pkg/resourcemanager/cgroupv1/testdata/cpu.shares-1
- pkg/resourcemanager/cgroupv1/testdata/cpuacct.usage-1
- pkg/resourcemanager/cgroupv1/testdata/cpuset.cpus-1
- pkg/resourcemanager/cgroupv1/testdata/memory.stat-36
- pkg/resourcemanager/cgroupv1/testdata/pids.current-1
- pkg/resourcemanager/metrics.go+51-35
- pkg/resourcemanager/metrics_test.go+46
- pkg/resourcemanager/module.go+11
- pkg/runtime/kata_handler.go-6
- pkg/runtime/kata_resources.go+14
- pkg/runtime/runsc_handler.go-49
- pkg/runtime/runsc_handler_test.go-43
- pkg/sandbox/manager.go+40-36
- pkg/sandbox/manager_test.go+1-14
- test/e2e/Dockerfile+2
- test/e2e/README.md+12-2
- test/e2e/e2e-run.sh+266-5
- test/e2e/oom-hog/main.go+23-23
- test/e2e/run.sh+6
0 commit comments