From 9f738f0d05a0575d38f373348b93ae543595df07 Mon Sep 17 00:00:00 2001 From: Gabriela Cervantes Date: Mon, 15 Jul 2024 16:58:18 +0000 Subject: [PATCH 1/2] docs: Update cri installion guide url in containerd documentation This PR updates the cri installation guide url link in the containerd documentation guide as the previous url link does not exists. Signed-off-by: Gabriela Cervantes --- docs/how-to/containerd-kata.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/how-to/containerd-kata.md b/docs/how-to/containerd-kata.md index 8b3e0788b5..bf27275082 100644 --- a/docs/how-to/containerd-kata.md +++ b/docs/how-to/containerd-kata.md @@ -62,7 +62,7 @@ Follow the instructions to [install Kata Containers](../install/README.md). > You do not need to install `cri` if you have containerd 1.1 or above. Just remove the `cri` plugin from the list of > `disabled_plugins` in the containerd configuration file (`/etc/containerd/config.toml`). -Follow the instructions from the [CRI installation guide](https://github.com/containerd/containerd/blob/main/docs/cri/installation.md). +Follow the instructions from the [CRI installation guide](https://github.com/containerd/containerd/blob/main/docs/cri/crictl.md#install-crictl). Then, check if `containerd` is now available: From e4045ff29a0fde50b84b4ca8e238677f2d4b9aea Mon Sep 17 00:00:00 2001 From: Gabriela Cervantes Date: Mon, 15 Jul 2024 20:36:17 +0000 Subject: [PATCH 2/2] docs: Update runtime v2 containerd url information This PR updates the runtime v2 containerd url information at containerd documentation. Signed-off-by: Gabriela Cervantes --- docs/how-to/containerd-kata.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/how-to/containerd-kata.md b/docs/how-to/containerd-kata.md index bf27275082..a2a1cde7e7 100644 --- a/docs/how-to/containerd-kata.md +++ b/docs/how-to/containerd-kata.md @@ -40,7 +40,7 @@ use `RuntimeClass` instead of the deprecated annotations. ### Containerd Runtime V2 API: Shim V2 API The [`containerd-shim-kata-v2` (short as `shimv2` in this documentation)](../../src/runtime/cmd/containerd-shim-kata-v2/) -implements the [Containerd Runtime V2 (Shim API)](https://github.com/containerd/containerd/tree/main/runtime/v2) for Kata. +implements the [Containerd Runtime V2 (Shim API)](https://github.com/containerd/containerd/tree/main/core/runtime/v2) for Kata. With `shimv2`, Kubernetes can launch Pod and OCI-compatible containers with one shim per Pod. Prior to `shimv2`, `2N+1` shims (i.e. a `containerd-shim` and a `kata-shim` for each container and the Pod sandbox itself) and no standalone `kata-proxy` process were used, even with VSOCK not available. @@ -132,9 +132,9 @@ The `RuntimeClass` is suggested. The following configuration includes two runtime classes: - `plugins.cri.containerd.runtimes.runc`: the runc, and it is the default runtime. -- `plugins.cri.containerd.runtimes.kata`: The function in containerd (reference [the document here](https://github.com/containerd/containerd/tree/main/runtime/v2#binary-naming)) +- `plugins.cri.containerd.runtimes.kata`: The function in containerd (reference [the document here](https://github.com/containerd/containerd/tree/main/core/runtime/v2)) where the dot-connected string `io.containerd.kata.v2` is translated to `containerd-shim-kata-v2` (i.e. the - binary name of the Kata implementation of [Containerd Runtime V2 (Shim API)](https://github.com/containerd/containerd/tree/main/runtime/v2)). + binary name of the Kata implementation of [Containerd Runtime V2 (Shim API)](https://github.com/containerd/containerd/tree/main/core/runtime/v2)). ```toml [plugins.cri.containerd]