From bbe8e547ce82c64846eecbf1dbe23926d2f72562 Mon Sep 17 00:00:00 2001 From: Tim Bannister Date: Tue, 5 Apr 2022 15:39:47 +0100 Subject: [PATCH] Update kubeadm CRI detection docs Update kubeadm CRI detection docs in light of dockershim deprecation. Co-authored-by: Lubomir I. Ivanov --- .../tools/kubeadm/install-kubeadm.md | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/content/en/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md b/content/en/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md index dc3ad5d7a6ee2..e89d7e6d7d8d5 100644 --- a/content/en/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md +++ b/content/en/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md @@ -93,30 +93,30 @@ to interface with your chosen container runtime. If you don't specify a runtime, kubeadm automatically tries to detect an installed container runtime by scanning through a list of well known Unix domain sockets. -The following table lists container runtimes and their associated socket paths: +The following table lists container runtimes that the kubelet looks for, and their associated socket paths: {{< table caption = "Container runtimes and their socket paths" >}} -| Runtime | Path to Unix domain socket | -|------------|-----------------------------------| -| Docker | `/var/run/dockershim.sock` | -| containerd | `/run/containerd/containerd.sock` | -| CRI-O | `/var/run/crio/crio.sock` | +| Runtime | Path to Unix domain socket | +|----------------|-----------------------------------| +| Docker Engine | `/var/run/dockershim.sock` | +| containerd | `/run/containerd/containerd.sock` | +| CRI-O | `/var/run/crio/crio.sock` | {{< /table >}}
-If both Docker and containerd are detected, Docker takes precedence. This is +If both Docker Engine and containerd are detected, kubeadm will give precedence to Docker Engine. This is needed because Docker 18.09 ships with containerd and both are detectable even if you only installed Docker. -If any other two or more runtimes are detected, kubeadm exits with an error. +**If any other two or more runtimes are detected, kubeadm exits with an error.** -The kubelet integrates with Docker through the built-in `dockershim` CRI implementation. +The kubelet can integrate with Docker Engine using the deprecated `dockershim` adapter (the dockershim is part of the kubelet itself). See [container runtimes](/docs/setup/production-environment/container-runtimes/) for more information. {{% /tab %}} {{% tab name="other operating systems" %}} By default, kubeadm uses {{< glossary_tooltip term_id="docker" >}} as the container runtime. -The kubelet integrates with Docker through the built-in `dockershim` CRI implementation. +The kubelet can integrate with Docker Engine using the deprecated `dockershim` adapter (the dockershim is part of the kubelet itself). See [container runtimes](/docs/setup/production-environment/container-runtimes/) for more information.