Skip to content

Commit 831e8a9

Browse files
authored
Merge pull request #47729 from carlory/fg-NodeOutOfServiceVolumeDetach
mark feature-gate NodeOutOfServiceVolumeDetach as removed
2 parents 10e98d7 + 72678a1 commit 831e8a9

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

content/en/docs/concepts/cluster-administration/node-shutdown.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,7 @@ these pods will be stuck in terminating status on the shutdown node forever.
217217

218218
To mitigate the above situation, a user can manually add the taint `node.kubernetes.io/out-of-service`
219219
with either `NoExecute` or `NoSchedule` effect to a Node marking it out-of-service.
220-
If the `NodeOutOfServiceVolumeDetach`[feature gate](/docs/reference/command-line-tools-reference/feature-gates/)
221-
is enabled on {{< glossary_tooltip text="kube-controller-manager" term_id="kube-controller-manager" >}},
222-
and a Node is marked out-of-service with this taint, the pods on the node will be forcefully deleted
220+
If a Node is marked out-of-service with this taint, the pods on the node will be forcefully deleted
223221
if there are no matching tolerations on it and volume detach operations for the pods terminating on
224222
the node will happen immediately. This allows the Pods on the out-of-service node to recover quickly
225223
on a different node.

content/en/docs/concepts/workloads/pods/pod-lifecycle.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -665,8 +665,7 @@ Additionally, PodGC cleans up any Pods which satisfy any of the following condit
665665
1. are orphan Pods - bound to a node which no longer exists,
666666
1. are unscheduled terminating Pods,
667667
1. are terminating Pods, bound to a non-ready node tainted with
668-
[`node.kubernetes.io/out-of-service`](/docs/reference/labels-annotations-taints/#node-kubernetes-io-out-of-service),
669-
when the `NodeOutOfServiceVolumeDetach` feature gate is enabled.
668+
[`node.kubernetes.io/out-of-service`](/docs/reference/labels-annotations-taints/#node-kubernetes-io-out-of-service).
670669

671670
Along with cleaning up the Pods, PodGC will also mark them as failed if they are in a non-terminal
672671
phase. Also, PodGC adds a Pod disruption condition when cleaning up an orphan Pod.

content/en/docs/reference/command-line-tools-reference/feature-gates/node-out-of-service-volume-detach.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ stages:
1717
- stage: stable
1818
defaultValue: true
1919
fromVersion: "1.28"
20+
toVersion: "1.31"
21+
22+
removed: true
2023
---
2124
When a Node is marked out-of-service using the
2225
`node.kubernetes.io/out-of-service` taint, Pods on the node will be forcefully deleted

content/en/docs/reference/labels-annotations-taints/_index.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1591,10 +1591,8 @@ Example: `node.kubernetes.io/out-of-service:NoExecute`
15911591
Used on: Node
15921592

15931593
A user can manually add the taint to a Node marking it out-of-service.
1594-
If the `NodeOutOfServiceVolumeDetach`
1595-
[feature gate](/docs/reference/command-line-tools-reference/feature-gates/)
1596-
is enabled on `kube-controller-manager`, and a Node is marked out-of-service with this taint,
1597-
the Pods on the node will be forcefully deleted if there are no matching tolerations on it and
1594+
If a Node is marked out-of-service with this taint, the Pods on the node
1595+
will be forcefully deleted if there are no matching tolerations on it and
15981596
volume detach operations for the Pods terminating on the node will happen immediately.
15991597
This allows the Pods on the out-of-service node to recover quickly on a different node.
16001598

0 commit comments

Comments
 (0)