From eb11d053d5f05a348d9fc359a1934581703c249d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Mon, 15 Nov 2021 11:24:02 +0100 Subject: [PATCH] cri-o: Update deployment documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CRI-O deployment documentation was quite outdated, giving info from the `1.x` era. Let's update this to reflect what we currently have. Fixes: #2498 Signed-off-by: Fabiano Fidêncio --- docs/how-to/run-kata-with-k8s.md | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/docs/how-to/run-kata-with-k8s.md b/docs/how-to/run-kata-with-k8s.md index 37c3614878..29d7309876 100644 --- a/docs/how-to/run-kata-with-k8s.md +++ b/docs/how-to/run-kata-with-k8s.md @@ -22,7 +22,7 @@ An equivalent shim implementation for CRI-O is planned. ### CRI-O For CRI-O installation instructions, refer to the [CRI-O Tutorial](https://github.com/cri-o/cri-o/blob/main/tutorial.md) page. -The following sections show how to set up the CRI-O configuration file (default path: `/etc/crio/crio.conf`) for Kata. +The following sections show how to set up the CRI-O snippet configuration file (default path: `/etc/crio/crio.conf`) for Kata. Unless otherwise stated, all the following settings are specific to the `crio.runtime` table: ```toml @@ -40,23 +40,16 @@ A comprehensive documentation of the configuration file can be found [here](http #### Kubernetes Runtime Class (CRI-O v1.12+) The [Kubernetes Runtime Class](https://kubernetes.io/docs/concepts/containers/runtime-class/) is the preferred way of specifying the container runtime configuration to run a Pod's containers. -To use this feature, Kata must added as a runtime handler with: +To use this feature, Kata must added as a runtime handler. This can be done by +dropping a `50-kata` snippet file into `/etc/crio/crio.conf.d`, with the +content shown below: ```toml -[crio.runtime.runtimes.kata-runtime] - runtime_path = "/usr/bin/kata-runtime" - runtime_type = "oci" -``` - -You can also add multiple entries to specify alternatives hypervisors, e.g.: -```toml -[crio.runtime.runtimes.kata-qemu] - runtime_path = "/usr/bin/kata-runtime" - runtime_type = "oci" - -[crio.runtime.runtimes.kata-fc] - runtime_path = "/usr/bin/kata-runtime" - runtime_type = "oci" +[crio.runtime.runtimes.kata] + runtime_path = "/usr/bin/containerd-shim-kata-v2" + runtime_type = "vm" + runtime_root = "/run/vc" + privileged_without_host_devices = true ```