Skip to content

Commit 9b78ecf

Browse files
Apply suggestions from code review
Co-authored-by: Qiming Teng <[email protected]>
1 parent 4b5eb96 commit 9b78ecf

File tree

3 files changed

+19
-10
lines changed

3 files changed

+19
-10
lines changed

content/en/blog/_posts/2022-11-28-registry-k8s-io-change.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,14 @@ imageRepository: "k8s.gcr.io"
6262
6363
### Reverting the Registry Name in kubelet
6464
65-
The image used by kubelet for the pod sandbox (`pause`) can be overridden by configuring your Container Runtime or by setting the `--pod-infra-container-image` flag depending on the version of Kubernetes you are using.
66-
67-
Other runtimes: [containerd](/docs/setup/production-environment/container-runtimes/#override-pause-image-containerd), [CRI-O](/docs/setup/production-environment/container-runtimes/#override-pause-image-cri-o), [cri-dockerd](/docs/setup/production-environment/container-runtimes/#override-pause-image-cri-dockerd-mcr).
65+
The image used by kubelet for the pod sandbox (`pause`) can be overridden
66+
by configuring your container runtime or by setting the `--pod-infra-container-image`
67+
flag depending on the version of Kubernetes you are using.
68+
69+
Other runtimes:
70+
[containerd](/docs/setup/production-environment/container-runtimes/#override-pause-image-containerd),
71+
[CRI-O](/docs/setup/production-environment/container-runtimes/#override-pause-image-cri-o),
72+
[cri-dockerd](/docs/setup/production-environment/container-runtimes/#override-pause-image-cri-dockerd-mcr).
6873

6974
When using dockershim before v1.23:
7075

content/en/docs/setup/production-environment/container-runtimes.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,8 @@ follow [configuring a cgroup driver](/docs/tasks/administer-cluster/kubeadm/conf
177177

178178
Your container runtime must support at least v1alpha2 of the container runtime interface.
179179

180-
Kubernetes [starting v1.26](/blog/2022/11/18/upcoming-changes-in-kubernetes-1-26/#cri-api-removal) _only works_ with v1 of the CRI API. Earlier versions default
180+
Kubernetes [starting v1.26](/blog/2022/11/18/upcoming-changes-in-kubernetes-1-26/#cri-api-removal)
181+
_only works_ with v1 of the CRI API. Earlier versions default
181182
to v1 version, however if a container runtime does not support the v1 API, the kubelet falls back to
182183
using the (deprecated) v1alpha2 API instead.
183184

@@ -256,9 +257,9 @@ sandbox image by setting the following config:
256257
You might need to restart `containerd` as well once you've updated the config file: `systemctl restart containerd`.
257258

258259
Please note, that it is a best practice for kubelet to declare the matching `pod-infra-container-image`.
259-
If not configured, kubelet may attempt to Garbage Collect the `pause` image.
260-
There is ongoing work in [containerd to pin the pause image](https://github.com/containerd/containerd/issues/6352) and not require
261-
this setting on kubelet any longer.
260+
If not configured, kubelet may attempt to garbage collect the `pause` image.
261+
There is ongoing work in [containerd to pin the pause image](https://github.com/containerd/containerd/issues/6352)
262+
and not require this setting on kubelet any longer.
262263

263264
### CRI-O
264265

content/en/docs/tasks/administer-cluster/migrating-from-dockershim/check-if-dockershim-removal-affects-you.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,14 @@ You can mitigate this issue by using [cAdvisor](https://github.com/google/cadvis
123123
1. Find the latest [cAdvisor release](https://github.com/google/cadvisor/releases)
124124
with the name pattern `vX.Y.Z-containerd-cri` (for example, `v0.42.0-containerd-cri`).
125125
2. Follow the steps in [cAdvisor Kubernetes Daemonset](https://github.com/google/cadvisor/tree/master/deploy/kubernetes) to create the daemonset.
126-
3. Point the installed metrics collector to use the cAdvisor `/metrics` endpoint which provides the full set of [Prometheus container metrics](https://github.com/google/cadvisor/blob/master/docs/storage/prometheus.md).
126+
3. Point the installed metrics collector to use the cAdvisor `/metrics` endpoint
127+
which provides the full set of
128+
[Prometheus container metrics](https://github.com/google/cadvisor/blob/master/docs/storage/prometheus.md).
129+
130+
Alternatives:
127131

128-
Alternatives
129132
- Use alternative third party metrics collection solution.
130-
- Collect metrics from the Kubelet summary API with an endpoint of `/stats/summary`.
133+
- Collect metrics from the Kubelet summary API that is served at `/stats/summary`.
131134

132135
## {{% heading "whatsnext" %}}
133136

0 commit comments

Comments
 (0)