whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #31282 from shannonxtreme/dockershim-clusteradmin

Browse Source 
Action on Docker mentions in Concepts > Cluster Administration
This commit is contained in:
Kubernetes Prow Robot
2022-01-21 07:41:59 -08:00
committed by GitHub
parent 0849d43f8c b0da90dd08
commit da262be43e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/en/docs/concepts/cluster-administration/system-logs.md
+2 -1
View File
@@ -182,7 +182,8 @@ There are two types of system components: those that run in a container and thos
that do not run in a container. For example: that do not run in a container. For example:
* The Kubernetes scheduler and kube-proxy run in a container. * The Kubernetes scheduler and kube-proxy run in a container.
* The kubelet and container runtime, for example Docker, do not run in containers. * The kubelet and {{<glossary_tooltip term_id="container-runtime" text="container runtime">}}
do not run in containers.
On machines with systemd, the kubelet and container runtime write to journald. On machines with systemd, the kubelet and container runtime write to journald.
Otherwise, they write to `.log` files in the `/var/log` directory. Otherwise, they write to `.log` files in the `/var/log` directory.
content/en/docs/reference/glossary/container-runtime.md
+2 -2
View File
@@ -15,7 +15,7 @@ tags:
<!--more--> <!--more-->
Kubernetes supports several container runtimes: {{< glossary_tooltip term_id="docker">}}, Kubernetes supports container runtimes such as
{{< glossary_tooltip term_id="containerd" >}}, {{< glossary_tooltip term_id="cri-o" >}}, {{< glossary_tooltip term_id="containerd" >}}, {{< glossary_tooltip term_id="cri-o" >}},
and any implementation of the [Kubernetes CRI (Container Runtime and any other implementation of the [Kubernetes CRI (Container Runtime
Interface)](https://github.com/kubernetes/community/blob/master/contributors/devel/sig-node/container-runtime-interface.md). Interface)](https://github.com/kubernetes/community/blob/master/contributors/devel/sig-node/container-runtime-interface.md).