From 0d2962b0f80ab626209788d1c00cfabc91c09dae Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Wed, 26 Jul 2023 11:18:14 +0300 Subject: [PATCH] docs: change wording of k8s versioning on KubeletCgroupDriverFromCRI --- .../docs/setup/production-environment/container-runtimes.md | 6 +++--- .../administer-cluster/kubeadm/configure-cgroup-driver.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/content/en/docs/setup/production-environment/container-runtimes.md b/content/en/docs/setup/production-environment/container-runtimes.md index ce49a7347d..36bf4ef299 100644 --- a/content/en/docs/setup/production-environment/container-runtimes.md +++ b/content/en/docs/setup/production-environment/container-runtimes.md @@ -157,7 +157,7 @@ Starting with v1.22 and later, when creating a cluster with kubeadm, if the user the `cgroupDriver` field under `KubeletConfiguration`, kubeadm defaults it to `systemd`. {{< /note >}} -For Kubernetes v1.28 and later, with the `KubeletCgroupDriverFromCRI` +In Kubernetes {{< skew currentVersion >}}, with the `KubeletCgroupDriverFromCRI` [feature gate](/docs/reference/command-line-tools-reference/feature-gates/) enabled and a container runtime that supports the `RuntimeConfig` CRI RPC, the kubelet automatically detects the appropriate cgroup driver from the runtime, @@ -257,7 +257,7 @@ sudo systemctl restart containerd When using kubeadm, manually configure the [cgroup driver for kubelet](/docs/tasks/administer-cluster/kubeadm/configure-cgroup-driver/#configuring-the-kubelet-cgroup-driver). -Starting with v1.28 and later, you can enable automatic detection of the +In Kubernetes {{< skew currentVersion >}}, you can enable automatic detection of the cgroup driver as an alpha feature. See [systemd cgroup driver](#systemd-cgroup-driver) for more details. @@ -302,7 +302,7 @@ You should also note the changed `conmon_cgroup`, which has to be set to the val cgroup driver configuration of the kubelet (usually done via kubeadm) and CRI-O in sync. -Starting with v1.28 and later, you can enable automatic detection of the +In Kubernetes {{< skew currentVersion >}}, you can enable automatic detection of the cgroup driver as an alpha feature. See [systemd cgroup driver](#systemd-cgroup-driver) for more details. diff --git a/content/en/docs/tasks/administer-cluster/kubeadm/configure-cgroup-driver.md b/content/en/docs/tasks/administer-cluster/kubeadm/configure-cgroup-driver.md index e3133054f5..afaa370011 100644 --- a/content/en/docs/tasks/administer-cluster/kubeadm/configure-cgroup-driver.md +++ b/content/en/docs/tasks/administer-cluster/kubeadm/configure-cgroup-driver.md @@ -37,7 +37,7 @@ driver of the kubelet. In v1.22 and later, if the user does not set the `cgroupDriver` field under `KubeletConfiguration`, kubeadm defaults it to `systemd`. -Starting with v1.28 and later, you can enable automatic detection of the +In Kubernetes {{< skew currentVersion >}}, you can enable automatic detection of the cgroup driver as an alpha feature. See [systemd cgroup driver](/docs/setup/production-environment/container-runtimes/#systemd-cgroup-driver) for more details.