Skip to content

Commit ebb3da5

Browse files
authored
Merge pull request #47298 from sohankunkerkar/dev-1.31
Update docs for beta promotion of cgroup driver detection from CRI
2 parents 6c6ced2 + 42fda96 commit ebb3da5

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

content/en/docs/reference/command-line-tools-reference/feature-gates/kubelet-cgroup-driver-from-cri.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ stages:
99
- stage: alpha
1010
defaultValue: false
1111
fromVersion: "1.28"
12+
toVersion: "1.30"
13+
- stage: beta
14+
defaultValue: true
15+
fromVersion: "1.31"
1216
---
1317
Enable detection of the kubelet cgroup driver
1418
configuration option from the {{<glossary_tooltip term_id="cri" text="CRI">}}.

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,19 +140,19 @@ Starting with v1.22 and later, when creating a cluster with kubeadm, if the user
140140
the `cgroupDriver` field under `KubeletConfiguration`, kubeadm defaults it to `systemd`.
141141
{{< /note >}}
142142

143-
In Kubernetes v1.28, with the `KubeletCgroupDriverFromCRI`
144-
[feature gate](/docs/reference/command-line-tools-reference/feature-gates/)
145-
enabled and a container runtime that supports the `RuntimeConfig` CRI RPC,
146-
the kubelet automatically detects the appropriate cgroup driver from the runtime,
147-
and ignores the `cgroupDriver` setting within the kubelet configuration.
148-
149143
If you configure `systemd` as the cgroup driver for the kubelet, you must also
150144
configure `systemd` as the cgroup driver for the container runtime. Refer to
151145
the documentation for your container runtime for instructions. For example:
152146

153147
* [containerd](#containerd-systemd)
154148
* [CRI-O](#cri-o)
155149

150+
In Kubernetes {{< skew currentVersion >}}, with the `KubeletCgroupDriverFromCRI`
151+
[feature gate](/docs/reference/command-line-tools-reference/feature-gates/)
152+
enabled and a container runtime that supports the `RuntimeConfig` CRI RPC,
153+
the kubelet automatically detects the appropriate cgroup driver from the runtime,
154+
and ignores the `cgroupDriver` setting within the kubelet configuration.
155+
156156
{{< caution >}}
157157
Changing the cgroup driver of a Node that has joined a cluster is a sensitive operation.
158158
If the kubelet has created Pods using the semantics of one cgroup driver, changing the container

0 commit comments

Comments
 (0)