Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

containerd: Update containerd config to version 3 #152

Merged
merged 1 commit into from
Aug 8, 2024
Merged

containerd: Update containerd config to version 3 #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docs/containerd.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ Refer to the following configuration to modify the configuration file, default p
[proxy_plugins.vmm]
type = "sandbox"
address = "/run/vmm-sandboxer.sock"
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kuasar-vmm]
[plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.kuasar-vmm]
runtime_type = "io.containerd.kuasar-vmm.v1"
sandboxer = "vmm"
io_type = "hvsock"
io_type = "streaming"
```

+ For quark:
Expand All @@ -39,7 +39,7 @@ Refer to the following configuration to modify the configuration file, default p
[proxy_plugins.quark]
type = "sandbox"
address = "/run/quark-sandboxer.sock"
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kuasar-quark]
[plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.kuasar-quark]
runtime_type = "io.containerd.kuasar-quark.v1"
sandboxer = "quark"
```
Expand All @@ -50,7 +50,7 @@ Refer to the following configuration to modify the configuration file, default p
[proxy_plugins.wasm]
type = "sandbox"
address = "/run/wasm-sandboxer.sock"
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kuasar-wasm]
[plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.kuasar-wasm]
runtime_type = "io.containerd.kuasar-wasm.v1"
sandboxer = "wasm"
```
Expand Down
4 changes: 2 additions & 2 deletions docs/vmm/how-to-run-kuasar-with-isulad-and-stratovirt.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,10 @@ Add the following sandboxer config in the containerd config file `/etc/container
type = "sandbox"
address = "/run/vmm-sandboxer.sock"

[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kuasar-vmm]
[plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.kuasar-vmm]
runtime_type = "io.containerd.kuasar-vmm.v1"
sandboxer = "vmm"
io_type = "hvsock"
io_type = "streaming"
```

## Configure crictl
Expand Down
16 changes: 8 additions & 8 deletions scripts/build/build-containerd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,25 @@ git clone -b v0.2.0-kuasar https://github.com/kuasar-io/containerd.git
mkdir bin && make -C containerd bin/containerd && mv containerd/bin/containerd bin

tee bin/config.toml > /dev/null <<EOF
version = 2
version = 3

[plugins."io.containerd.grpc.v1.cri"]
[plugins.'io.containerd.cri.v1.runtime']
disable_apparmor = true

[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
runtime_type = "io.containerd.runc.v2"
[plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.kuasar-runc]
runtime_type = "io.containerd.kuasar-runc.v1"
sandboxer = "runc"

[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kuasar-vmm]
[plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.kuasar-vmm]
runtime_type = "io.containerd.kuasar-vmm.v1"
sandboxer = "vmm"
io_type = "hvsock"
io_type = "streaming"

[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kuasar-quark]
[plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.kuasar-quark]
runtime_type = "io.containerd.kuasar-quark.v1"
sandboxer = "quark"

[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kuasar-wasm]
[plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.kuasar-wasm]
runtime_type = "io.containerd.kuasar-wasm.v1"
sandboxer = "wasm"

Expand Down
Loading