Skip to content

Commit 0731e38

Browse files
committed
1 parent ab4604a commit 0731e38

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

content/en/docs/concepts/architecture/cri.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ each Node in your cluster, so that the
2626
The kubelet acts as a client when connecting to the container runtime via gRPC.
2727
The runtime and image service endpoints have to be available in the container
2828
runtime, which can be configured separately within the kubelet by using the
29-
`--image-service-endpoint` [command line flags](/docs/reference/command-line-tools-reference/kubelet)
29+
`--image-service-endpoint` [command line flags](/docs/reference/command-line-tools-reference/kubelet).
3030

3131
For Kubernetes v{{< skew currentVersion >}}, the kubelet prefers to use CRI `v1`.
3232
If a container runtime does not support `v1` of the CRI, then the kubelet tries to

content/en/docs/reference/command-line-tools-reference/kubelet.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,14 +182,14 @@ kubelet [flags]
182182
<td colspan="2">--container-log-max-files int32&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: 5td>
183183
tr>
184184
<tr>
185-
<td>td><td style="line-height: 130%; word-wrap: break-word;">&lt;Warning: Beta feature&gt; Set the maximum number of container log files that can be present for a container. The number must be &gt;= 2. This flag can only be used with <code>--container-runtime=remotecode>. (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's <code>--configcode> flag. See <a href="https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/">kubelet-config-filea> for more information.)td>
185+
<td>td><td style="line-height: 130%; word-wrap: break-word;">&lt;Warning: Beta feature&gt; Set the maximum number of container log files that can be present for a container. The number must be &gt;= 2. (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's <code>--configcode> flag. See <a href="https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/">kubelet-config-filea> for more information.)td>
186186
tr>
187187

188188
<tr>
189189
<td colspan="2">--container-log-max-size string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: <code>10Micode>td>
190190
tr>
191191
<tr>
192-
<td>td><td style="line-height: 130%; word-wrap: break-word;">&lt;Warning: Beta feature&gt; Set the maximum size (e.g. <code>10Micode>) of container log file before it is rotated. This flag can only be used with <code>--container-runtime=remotecode>. (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's <code>--configcode> flag. See <a href="https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/">kubelet-config-filea> for more information.)td>
192+
<td>td><td style="line-height: 130%; word-wrap: break-word;">&lt;Warning: Beta feature&gt; Set the maximum size (e.g. <code>10Micode>) of container log file before it is rotated. (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's <code>--configcode> flag. See <a href="https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/">kubelet-config-filea> for more information.)td>
193193
tr>
194194

195195
<tr>

content/en/docs/setup/production-environment/tools/kubeadm/setup-ha-etcd-with-kubeadm.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ on Kubernetes dual-stack support see [Dual-stack support with kubeadm](/docs/set
6868
ExecStart=
6969
# Replace "systemd" with the cgroup driver of your container runtime. The default value in the kubelet is "cgroupfs".
7070
# Replace the value of "--container-runtime-endpoint" for a different container runtime if needed.
71-
ExecStart=/usr/bin/kubelet --address=127.0.0.1 --pod-manifest-path=/etc/kubernetes/manifests --cgroup-driver=systemd
72-
--container-runtime-endpoint=unix:///var/run/containerd/containerd.sock
71+
ExecStart=/usr/bin/kubelet --address=127.0.0.1 --pod-manifest-path=/etc/kubernetes/manifests --cgroup-driver=systemd --container-runtime-endpoint=unix:///var/run/containerd/containerd.sock
7372
Restart=always
7473
EOF
7574

content/en/docs/tasks/administer-cluster/migrating-from-dockershim/change-runtime-containerd.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ then run the following commands:
9898

9999
## Configure the kubelet to use containerd as its container runtime
100100

101-
Edit the file `/var/lib/kubelet/kubeadm-flags.env` and add the containerd runtime to the flags.
101+
Edit the file `/var/lib/kubelet/kubeadm-flags.env` and add the containerd runtime to the flags;
102102
`--container-runtime-endpoint=unix:///run/containerd/containerd.sock`.
103103

104104
Users using kubeadm should be aware that the `kubeadm` tool stores the CRI socket for each host as

content/en/docs/tasks/administer-cluster/migrating-from-dockershim/find-out-runtime-you-use.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ nodes.
8888
8989
* If your nodes use Kubernetes v1.23 and earlier and these flags aren't
9090
present or if the `--container-runtime` flag is not `remote`,
91-
you use the dockershim socket with Docker Engine. `--container-runtime`
92-
is removed since v1.27.
91+
you use the dockershim socket with Docker Engine. The `--container-runtime` command line
92+
argument is not available in Kubernetes v1.27 and later.
9393
* If the `--container-runtime-endpoint` flag is present, check the socket
9494
name to find out which runtime you use. For example,
9595
`unix:///run/containerd/containerd.sock` is the containerd endpoint.

0 commit comments

Comments
 (0)