Skip to content

Commit

Permalink
fix: update CRI config parts for containerd config v3
Browse files Browse the repository at this point in the history
The CRI plugin name got changed.

Signed-off-by: Andrey Smirnov <[email protected]>
  • Loading branch information
smira committed Jul 31, 2024
1 parent c536209 commit ab77645
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions container-runtime/gvisor/gvisor-kvm.part
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runsc-kvm]
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.runsc-kvm]
runtime_type = "io.containerd.runsc.v1"

[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runsc-kvm.options]
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.runsc-kvm.options]
TypeUrl = "io.containerd.runsc.v1.options"
ConfigPath = "/etc/cri/conf.d/runsc-kvm.toml"
4 changes: 2 additions & 2 deletions container-runtime/gvisor/gvisor.part
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runsc]
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.runsc]
runtime_type = "io.containerd.runsc.v1"

[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runsc.options]
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.runsc.options]
TypeUrl = "io.containerd.runsc.v1.options"
ConfigPath = "/etc/cri/conf.d/runsc.toml"
4 changes: 2 additions & 2 deletions container-runtime/kata-containers/kata-containers.part
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kata]
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.kata]
runtime_type = "io.containerd.kata.v2"
privileged_without_host_devices = true
pod_annotations = ["io.katacontainers.*"]
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kata.options]
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.kata.options]
ConfigPath = "/usr/local/share/kata-containers/configuration.toml"
2 changes: 1 addition & 1 deletion container-runtime/spin/spin.part
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.spin]
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.spin]
runtime_type = "io.containerd.spin.v2"
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Enable stargz snapshotter for CRI
[plugins."io.containerd.grpc.v1.cri".containerd]
[plugins."io.containerd.cri.v1.runtime".containerd]
snapshotter = "stargz"
disable_snapshot_annotations = false

Expand Down
2 changes: 1 addition & 1 deletion container-runtime/wasmedge/wasm.part
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.wasmedge]
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.wasmedge]
runtime_type = "io.containerd.wasmedge.v1"
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.nvidia]
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.nvidia]
privileged_without_host_devices = false
runtime_engine = ""
runtime_root = ""
runtime_type = "io.containerd.runc.v2"
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.nvidia.options]
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.nvidia.options]
BinaryName = "/usr/local/bin/nvidia-container-runtime"

0 comments on commit ab77645

Please sign in to comment.