Skip to content

Commit da262be

Browse files
authored
Merge pull request #31282 from shannonxtreme/dockershim-clusteradmin
Action on Docker mentions in Concepts > Cluster Administration
2 parents 0849d43 + b0da90d commit da262be

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

content/en/docs/concepts/cluster-administration/system-logs.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,8 @@ There are two types of system components: those that run in a container and thos
182182
that do not run in a container. For example:
183183

184184
* The Kubernetes scheduler and kube-proxy run in a container.
185-
* The kubelet and container runtime, for example Docker, do not run in containers.
185+
* The kubelet and {{<glossary_tooltip term_id="container-runtime" text="container runtime">}}
186+
do not run in containers.
186187

187188
On machines with systemd, the kubelet and container runtime write to journald.
188189
Otherwise, they write to `.log` files in the `/var/log` directory.

content/en/docs/reference/glossary/container-runtime.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ tags:
1515

1616
<!--more-->
1717

18-
Kubernetes supports several container runtimes: {{< glossary_tooltip term_id="docker">}},
18+
Kubernetes supports container runtimes such as
1919
{{< glossary_tooltip term_id="containerd" >}}, {{< glossary_tooltip term_id="cri-o" >}},
20-
and any implementation of the [Kubernetes CRI (Container Runtime
20+
and any other implementation of the [Kubernetes CRI (Container Runtime
2121
Interface)](https://github.com/kubernetes/community/blob/master/contributors/devel/sig-node/container-runtime-interface.md).

0 commit comments

Comments
 (0)