mirror of
				https://github.com/kata-containers/kata-containers.git
				synced 2025-10-30 17:03:57 +00:00 
			
		
		
		
	docs: delete CRI containerd plugin statement
There is no independent CRI containerd plugin for new containerd, the related documentation should be updated too. Fixes: #4605 Signed-off-by: liubin <liubin0329@gmail.com>
This commit is contained in:
		| @@ -5,7 +5,7 @@ | |||||||
| - [Run Kata containers with `crictl`](run-kata-with-crictl.md) | - [Run Kata containers with `crictl`](run-kata-with-crictl.md) | ||||||
| - [Run Kata Containers with Kubernetes](run-kata-with-k8s.md) | - [Run Kata Containers with Kubernetes](run-kata-with-k8s.md) | ||||||
| - [How to use Kata Containers and Containerd](containerd-kata.md) | - [How to use Kata Containers and Containerd](containerd-kata.md) | ||||||
| - [How to use Kata Containers and CRI (containerd) with Kubernetes](how-to-use-k8s-with-cri-containerd-and-kata.md) | - [How to use Kata Containers and containerd with Kubernetes](how-to-use-k8s-with-containerd-and-kata.md) | ||||||
| - [Kata Containers and service mesh for Kubernetes](service-mesh.md) | - [Kata Containers and service mesh for Kubernetes](service-mesh.md) | ||||||
| - [How to import Kata Containers logs into Fluentd](how-to-import-kata-logs-with-fluentd.md) | - [How to import Kata Containers logs into Fluentd](how-to-import-kata-logs-with-fluentd.md) | ||||||
|  |  | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ Also you should ensure that `kubectl` working correctly. | |||||||
| > **Note**: More information about Kubernetes integrations: | > **Note**: More information about Kubernetes integrations: | ||||||
| >   - [Run Kata Containers with Kubernetes](run-kata-with-k8s.md) | >   - [Run Kata Containers with Kubernetes](run-kata-with-k8s.md) | ||||||
| >   - [How to use Kata Containers and Containerd](containerd-kata.md) | >   - [How to use Kata Containers and Containerd](containerd-kata.md) | ||||||
| >   - [How to use Kata Containers and CRI (containerd plugin) with Kubernetes](how-to-use-k8s-with-cri-containerd-and-kata.md) | >   - [How to use Kata Containers and containerd with Kubernetes](how-to-use-k8s-with-containerd-and-kata.md) | ||||||
|  |  | ||||||
| ## Configure Prometheus | ## Configure Prometheus | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,15 +1,15 @@ | |||||||
| # How to use Kata Containers and CRI (containerd plugin) with Kubernetes | # How to use Kata Containers and containerd with Kubernetes | ||||||
| 
 | 
 | ||||||
| This document describes how to set up a single-machine Kubernetes (k8s) cluster. | This document describes how to set up a single-machine Kubernetes (k8s) cluster. | ||||||
| 
 | 
 | ||||||
| The Kubernetes cluster will use the | The Kubernetes cluster will use the | ||||||
| [CRI containerd](https://github.com/containerd/containerd/) and | [containerd](https://github.com/containerd/containerd/) and | ||||||
| [Kata Containers](https://katacontainers.io) to launch untrusted workloads. | [Kata Containers](https://katacontainers.io) to launch workloads. | ||||||
| 
 | 
 | ||||||
| ## Requirements | ## Requirements | ||||||
| 
 | 
 | ||||||
| - Kubernetes, Kubelet, `kubeadm` | - Kubernetes, Kubelet, `kubeadm` | ||||||
| - containerd with `cri` plug-in | - containerd | ||||||
| - Kata Containers | - Kata Containers | ||||||
| 
 | 
 | ||||||
| > **Note:** For information about the supported versions of these components, | > **Note:** For information about the supported versions of these components, | ||||||
| @@ -149,7 +149,7 @@ $ sudo -E kubectl taint nodes --all node-role.kubernetes.io/master- | |||||||
| 
 | 
 | ||||||
| ## Create runtime class for Kata Containers | ## Create runtime class for Kata Containers | ||||||
| 
 | 
 | ||||||
| By default, all pods are created with the default runtime configured in CRI containerd plugin. | By default, all pods are created with the default runtime configured in containerd. | ||||||
| From Kubernetes v1.12, users can use [`RuntimeClass`](https://kubernetes.io/docs/concepts/containers/runtime-class/#runtime-class) to specify a different runtime for Pods. | From Kubernetes v1.12, users can use [`RuntimeClass`](https://kubernetes.io/docs/concepts/containers/runtime-class/#runtime-class) to specify a different runtime for Pods. | ||||||
| 
 | 
 | ||||||
| ```bash | ```bash | ||||||
| @@ -166,7 +166,7 @@ $ sudo -E kubectl apply -f runtime.yaml | |||||||
| 
 | 
 | ||||||
| ## Run pod in Kata Containers | ## Run pod in Kata Containers | ||||||
| 
 | 
 | ||||||
| If a pod has the `runtimeClassName` set to `kata`, the CRI plugin runs the pod with the | If a pod has the `runtimeClassName` set to `kata`, the CRI runs the pod with the | ||||||
| [Kata Containers runtime](../../src/runtime/README.md). | [Kata Containers runtime](../../src/runtime/README.md). | ||||||
| 
 | 
 | ||||||
| - Create an pod configuration that using Kata Containers runtime | - Create an pod configuration that using Kata Containers runtime | ||||||
| @@ -40,7 +40,7 @@ See below example config: | |||||||
|            ConfigPath = "/opt/kata/share/defaults/kata-containers/configuration.toml" |            ConfigPath = "/opt/kata/share/defaults/kata-containers/configuration.toml" | ||||||
| ``` | ``` | ||||||
|  |  | ||||||
|  - [Kata Containers with Containerd and CRI documentation](how-to-use-k8s-with-cri-containerd-and-kata.md) |  - [How to use Kata Containers and containerd with Kubernetes](how-to-use-k8s-with-containerd-and-kata.md) | ||||||
|  - [Containerd CRI config documentation](https://github.com/containerd/containerd/blob/main/docs/cri/config.md) |  - [Containerd CRI config documentation](https://github.com/containerd/containerd/blob/main/docs/cri/config.md) | ||||||
|  |  | ||||||
| #### CRI-O | #### CRI-O | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ After choosing one CRI implementation, you must make the appropriate configurati | |||||||
| to ensure it integrates with Kata Containers. | to ensure it integrates with Kata Containers. | ||||||
|  |  | ||||||
| Kata Containers 1.5 introduced the `shimv2` for containerd 1.2.0, reducing the components | Kata Containers 1.5 introduced the `shimv2` for containerd 1.2.0, reducing the components | ||||||
| required to spawn pods and containers, and this is the preferred way to run Kata Containers with Kubernetes ([as documented here](../how-to/how-to-use-k8s-with-cri-containerd-and-kata.md#configure-containerd-to-use-kata-containers)). | required to spawn pods and containers, and this is the preferred way to run Kata Containers with Kubernetes ([as documented here](../how-to/how-to-use-k8s-with-containerd-and-kata.md#configure-containerd-to-use-kata-containers)). | ||||||
|  |  | ||||||
| An equivalent shim implementation for CRI-O is planned. | An equivalent shim implementation for CRI-O is planned. | ||||||
|  |  | ||||||
| @@ -57,7 +57,7 @@ content shown below: | |||||||
|  |  | ||||||
| To customize containerd to select Kata Containers runtime, follow our | To customize containerd to select Kata Containers runtime, follow our | ||||||
| "Configure containerd to use Kata Containers" internal documentation | "Configure containerd to use Kata Containers" internal documentation | ||||||
| [here](../how-to/how-to-use-k8s-with-cri-containerd-and-kata.md#configure-containerd-to-use-kata-containers). | [here](../how-to/how-to-use-k8s-with-containerd-and-kata.md#configure-containerd-to-use-kata-containers). | ||||||
|  |  | ||||||
| ## Install Kubernetes | ## Install Kubernetes | ||||||
|  |  | ||||||
| @@ -85,7 +85,7 @@ Environment="KUBELET_EXTRA_ARGS=--container-runtime=remote --runtime-request-tim | |||||||
| Environment="KUBELET_EXTRA_ARGS=--container-runtime=remote --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock" | Environment="KUBELET_EXTRA_ARGS=--container-runtime=remote --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock" | ||||||
| ``` | ``` | ||||||
| For more information about containerd see the "Configure Kubelet to use containerd" | For more information about containerd see the "Configure Kubelet to use containerd" | ||||||
| documentation [here](../how-to/how-to-use-k8s-with-cri-containerd-and-kata.md#configure-kubelet-to-use-containerd). | documentation [here](../how-to/how-to-use-k8s-with-containerd-and-kata.md#configure-kubelet-to-use-containerd). | ||||||
|  |  | ||||||
| ## Run a Kubernetes pod with Kata Containers | ## Run a Kubernetes pod with Kata Containers | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user