Skip to content

Commit 72c6e5b

Browse files
committed
feat: add SystemCgroup option to containerd runtime options
update `README.md`, `conformance-tests/README.md`, `node-installer/script/installer.sh` to include `SystemdCgroup` option in containerd runtime options. Signed-off-by: Jiaxiao (mossaka) Zhou <[email protected]>
1 parent 54a1faf commit 72c6e5b

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,18 @@ To carry out the installation step-by-step, do the following:
6666

6767
```toml
6868
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.spin]
69-
runtime_type = "io.containerd.spin.v2"
69+
runtime_type = "io.containerd.spin.v2"
70+
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.spin.options]
71+
SystemdCgroup = true
7072
```
7173

7274
Otherwise, add:
7375

7476
```toml
7577
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.spin]
76-
runtime_type = "io.containerd.spin.v2"
78+
runtime_type = "io.containerd.spin.v2"
79+
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.spin.options]
80+
SystemdCgroup = true
7781
```
7882

7983
The [Node Installer script](./node-installer/script/installer.sh) that is used by the [`runtime-class-manager`](https://www.spinkube.dev/docs/topics/architecture/#runtime-class-manager) does this for you and is a good reference to understand the common paths to the containerd configuration file for popular Kubernetes distributions.

conformance-tests/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ Containerd must be configured to access the `containerd-shim-spin`:
1919
```toml
2020
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.spin]
2121
runtime_type = "/usr/bin/containerd-shim-spin-v2"
22+
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.spin.options]
23+
SystemdCgroup = true
2224
```
2325
3. Restart containerd if it is running as a service
2426
```sh

node-installer/script/installer.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ if ! grep -q spin $NODE_ROOT$CONTAINERD_CONF; then
4242
echo '
4343
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.spin]
4444
runtime_type = "'$KWASM_DIR'/bin/containerd-shim-spin-v2"
45+
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.spin.options]
46+
SystemdCgroup = true
4547
' >> $NODE_ROOT$CONTAINERD_CONF
4648
rm -Rf $NODE_ROOT$KWASM_DIR/active
4749
fi

0 commit comments

Comments
 (0)