From 9b78ecff2cceb92fe0fef29c4a1188fb70eda22d Mon Sep 17 00:00:00 2001 From: Sergey Kanzhelev Date: Thu, 23 Mar 2023 11:16:51 -0700 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Qiming Teng --- .../en/blog/_posts/2022-11-28-registry-k8s-io-change.md | 9 +++++++-- .../setup/production-environment/container-runtimes.md | 9 +++++---- .../check-if-dockershim-removal-affects-you.md | 9 ++++++--- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/content/en/blog/_posts/2022-11-28-registry-k8s-io-change.md b/content/en/blog/_posts/2022-11-28-registry-k8s-io-change.md index a098ac6ad9..6ab4ce7382 100644 --- a/content/en/blog/_posts/2022-11-28-registry-k8s-io-change.md +++ b/content/en/blog/_posts/2022-11-28-registry-k8s-io-change.md @@ -62,9 +62,14 @@ imageRepository: "k8s.gcr.io" ### Reverting the Registry Name in kubelet -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. +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. -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). +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). When using dockershim before v1.23: diff --git a/content/en/docs/setup/production-environment/container-runtimes.md b/content/en/docs/setup/production-environment/container-runtimes.md index 113856914d..8c66df0b00 100644 --- a/content/en/docs/setup/production-environment/container-runtimes.md +++ b/content/en/docs/setup/production-environment/container-runtimes.md @@ -177,7 +177,8 @@ follow [configuring a cgroup driver](/docs/tasks/administer-cluster/kubeadm/conf Your container runtime must support at least v1alpha2 of the container runtime interface. -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 +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 to v1 version, however if a container runtime does not support the v1 API, the kubelet falls back to using the (deprecated) v1alpha2 API instead. @@ -256,9 +257,9 @@ sandbox image by setting the following config: You might need to restart `containerd` as well once you've updated the config file: `systemctl restart containerd`. Please note, that it is a best practice for kubelet to declare the matching `pod-infra-container-image`. -If not configured, kubelet may attempt to Garbage Collect the `pause` image. -There is ongoing work in [containerd to pin the pause image](https://github.com/containerd/containerd/issues/6352) and not require -this setting on kubelet any longer. +If not configured, kubelet may attempt to garbage collect the `pause` image. +There is ongoing work in [containerd to pin the pause image](https://github.com/containerd/containerd/issues/6352) +and not require this setting on kubelet any longer. ### CRI-O diff --git a/content/en/docs/tasks/administer-cluster/migrating-from-dockershim/check-if-dockershim-removal-affects-you.md b/content/en/docs/tasks/administer-cluster/migrating-from-dockershim/check-if-dockershim-removal-affects-you.md index 076eb4fad0..44cfcb2511 100644 --- a/content/en/docs/tasks/administer-cluster/migrating-from-dockershim/check-if-dockershim-removal-affects-you.md +++ b/content/en/docs/tasks/administer-cluster/migrating-from-dockershim/check-if-dockershim-removal-affects-you.md @@ -123,11 +123,14 @@ You can mitigate this issue by using [cAdvisor](https://github.com/google/cadvis 1. Find the latest [cAdvisor release](https://github.com/google/cadvisor/releases) with the name pattern `vX.Y.Z-containerd-cri` (for example, `v0.42.0-containerd-cri`). 2. Follow the steps in [cAdvisor Kubernetes Daemonset](https://github.com/google/cadvisor/tree/master/deploy/kubernetes) to create the daemonset. -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). +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). + +Alternatives: -Alternatives - Use alternative third party metrics collection solution. -- Collect metrics from the Kubelet summary API with an endpoint of `/stats/summary`. +- Collect metrics from the Kubelet summary API that is served at `/stats/summary`. ## {{% heading "whatsnext" %}}