Skip to content

Commit 9c8227a

Browse files
Tim Bannisterneolit123
andcommitted
Update kubeadm CRI detection docs
Update kubeadm CRI detection docs in light of dockershim deprecation. Co-authored-by: Lubomir I. Ivanov <[email protected]>
1 parent 3cadb66 commit 9c8227a

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

content/en/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,30 +93,30 @@ to interface with your chosen container runtime.
9393

9494
If you don't specify a runtime, kubeadm automatically tries to detect an installed
9595
container runtime by scanning through a list of well known Unix domain sockets.
96-
The following table lists container runtimes and their associated socket paths:
96+
The following table lists container runtimes that kubeadm looks for, and their associated socket paths:
9797

9898
{{< table caption = "Container runtimes and their socket paths" >}}
99-
| Runtime | Path to Unix domain socket |
100-
|------------|-----------------------------------|
101-
| Docker | `/var/run/dockershim.sock` |
102-
| containerd | `/run/containerd/containerd.sock` |
103-
| CRI-O | `/var/run/crio/crio.sock` |
99+
| Runtime | Path to Unix domain socket |
100+
|----------------|-----------------------------------|
101+
| Docker Engine | `/var/run/dockershim.sock` |
102+
| containerd | `/run/containerd/containerd.sock` |
103+
| CRI-O | `/var/run/crio/crio.sock` |
104104
{{< /table >}}
105105

106106
<br />
107-
If both Docker and containerd are detected, Docker takes precedence. This is
107+
If both Docker Engine and containerd are detected, kubeadm will give precedence to Docker Engine. This is
108108
needed because Docker 18.09 ships with containerd and both are detectable even if you only
109109
installed Docker.
110-
If any other two or more runtimes are detected, kubeadm exits with an error.
110+
**If any other two or more runtimes are detected, kubeadm exits with an error.**
111111

112-
The kubelet integrates with Docker through the built-in `dockershim` CRI implementation.
112+
The kubelet can integrate with Docker Engine using the deprecated `dockershim` adapter (the dockershim is part of the kubelet itself).
113113

114114
See [container runtimes](/docs/setup/production-environment/container-runtimes/)
115115
for more information.
116116
{{% /tab %}}
117117
{{% tab name="other operating systems" %}}
118118
By default, kubeadm uses {{< glossary_tooltip term_id="docker" >}} as the container runtime.
119-
The kubelet integrates with Docker through the built-in `dockershim` CRI implementation.
119+
The kubelet can integrate with Docker Engine using the deprecated `dockershim` adapter (the dockershim is part of the kubelet itself).
120120

121121
See [container runtimes](/docs/setup/production-environment/container-runtimes/)
122122
for more information.

0 commit comments

Comments
 (0)