OCPBUGS-112784: Revert TNF Graceful node shutdown

[vimauro]

- What I did
Reverted the enablement of Graceful Node Shutdown for Two Node Fencing

GNS in its current upstream state has few unresolved issues, see kubernetes/kubernetes#112733 or kubernetes/enhancements#6249

The main issue we've encountered in some cases is related to pods (mainly from DaemonSets) to remain in Ready on NotReady / shutting-down nodes.

- How to verify it

1. Deploy a TNF cluster with this change applied
2. Verify that /etc/kubernetes/kubelet.conf on control plane nodes does NOT contain shutdownGracePeriod or shutdownGracePeriodCriticalPods settings
3. Initiate a node shutdown and confirm that pods are NOT held in Ready state after the shutdown sequence

- Description for the changelog

Reverted Graceful Node Shutdown enablement for DualReplica clusters due to unresolved upstream issues causing pods to remain Ready on shutting-down nodes.

Summary by CodeRabbit

• Behavior Changes

  • Removed the topology-specific kubelet shutdown grace-period settings for DualReplica control planes.
  • Kubelet shutdown handling now uses the standard configuration for this topology.

• Tests

  • Removed coverage and test fixtures for the retired bare-metal TNF controller configuration and graceful-shutdown scenario.

[openshift-merge-bot]

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

[openshift-ci-robot]

@vimauro: This pull request references Jira Issue OCPBUGS-112784, which is invalid:

• expected the bug to target either version "5.1.0." or "openshift-5.1.0.", but it targets "5.0.z" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

- What I did
Reverted the enablement of Graceful Node Shutdown for Two Node Fencing

GNS in its current upstream state has few unresolved issues, see kubernetes/kubernetes#112733 or kubernetes/enhancements#6249

The main issue we've encountered in some cases is related to pods (mainly from DaemonSets) to remain in Ready on NotReady / shutting-down nodes.

- How to verify it

1. Deploy a TNF cluster with this change applied
2. Verify that /etc/kubernetes/kubelet.conf on control plane nodes does NOT contain shutdownGracePeriod or shutdownGracePeriodCriticalPods settings
3. Initiate a node shutdown and confirm that pods are NOT held in Ready state after the shutdown sequence

- Description for the changelog

Reverted Graceful Node Shutdown enablement for DualReplica clusters due to unresolved upstream issues causing pods to remain Ready on shutting-down nodes.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 7388eca0-f696-4c1d-b7b0-24abd3173983

📥 Commits

Reviewing files that changed from the base of the PR and between 7ff337a and 472f325.

📒 Files selected for processing (3)

• pkg/controller/template/render_test.go
• pkg/controller/template/test_data/controller_config_baremetal_tnf.yaml
• templates/master/01-master-kubelet/_base/files/kubelet.yaml

💤 Files with no reviewable changes (3)

• templates/master/01-master-kubelet/_base/files/kubelet.yaml
• pkg/controller/template/render_test.go
• pkg/controller/template/test_data/controller_config_baremetal_tnf.yaml

Included review availability: Your plan provides up to 12 included reviews per hour; 11 remain after this review.

---

Walkthrough

The change removes DualReplica kubelet shutdown configuration from the master template. It also removes the related TNF render test, configuration entry, and bare-metal ControllerConfig fixture.

Changes

Kubelet shutdown handling cleanup

Layer / File(s)	Summary
Remove DualReplica kubelet configuration templates/master/01-master-kubelet/_base/files/kubelet.yaml	The template no longer sets kubelet shutdown grace periods for DualReplica control planes.
Remove TNF test coverage and fixture pkg/controller/template/render_test.go, pkg/controller/template/test_data/controller_config_baremetal_tnf.yaml	The TNF configuration entry, graceful shutdown test, and bare-metal ControllerConfig fixture were deleted.

Estimated code review effort: 2 (Simple) | ~10 minutes

Merge Risk: ⚪ Minimal · up to 472f3

This PR reverts Graceful Node Shutdown configuration and its related tests; no actionable merge-blocking risk remains beyond normal checks and review.

🚥 Pre-merge checks | ✅ 15

✅ Passed checks (15 passed)

Check name	Status	Explanation
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 0 files.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names	✅ Passed	The PR only deletes the TNF test and fixture and removes template lines; it adds no Ginkgo titles or dynamic test-name construction.
Test Structure And Quality	✅ Passed	The PR adds no test code: it removes 79 lines from a standard Go test file and deletes its fixture; no Ginkgo lifecycle or wait calls changed, so no listed failure condition is introduced.
Microshift Test Compatibility	✅ Passed	The commit adds no Ginkgo e2e tests; it removes the Go unit test TestKubeletGracefulShutdownTNF and related fixture/configuration only.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	The diff adds no Ginkgo e2e tests; it removes the existing kubelet shutdown unit test and fixture, so the SNO multi-node test check does not apply.
Topology-Aware Scheduling Compatibility	✅ Passed	The committed diff contains only deletions: it removes a DualReplica kubelet shutdown conditional, test, and fixture. It adds no scheduling constraints covered by this check.
Ote Binary Stdout Contract	✅ Passed	The HEAD^→HEAD patch adds no code. It only removes a test, fixture, and kubelet template block; unchanged TestMain only parses flags and runs tests, with no stdout write.
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	The pull request adds no lines or Ginkgo tests; it removes the TNF test, fixture, and IPv4-related kubelet template block. No compatibility failure was introduced.
No-Weak-Crypto	✅ Passed	The PR has zero added lines and only removes TNF graceful-shutdown code and a fixture; no weak crypto or custom crypto behavior is introduced.
Container-Privileges	✅ Passed	The PR contains only deletions; the added-line scan found no privileged, host namespace, SYS_ADMIN, root, or allowPrivilegeEscalation settings.
No-Sensitive-Data-In-Logs	✅ Passed	The PR adds no lines and introduces no logging; it removes a test, fixture, and kubelet settings, so it cannot introduce sensitive data in logs.
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title clearly identifies the issue and the main change: reverting TNF Graceful Node Shutdown.

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

_{Comment @coderabbitai help to get the list of available commands.}

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: vimauro
Once this PR has been reviewed and has the lgtm label, please assign yuqi-zhang for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

• OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[openshift-ci-robot]

@vimauro: This pull request references Jira Issue OCPBUGS-112790, which is invalid:

• expected the bug to target either version "5.1.0." or "openshift-5.1.0.", but it targets "5.0.z" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

- What I did
Reverted the enablement of Graceful Node Shutdown for Two Node Fencing

GNS in its current upstream state has few unresolved issues, see kubernetes/kubernetes#112733 or kubernetes/enhancements#6249

The main issue we've encountered in some cases is related to pods (mainly from DaemonSets) to remain in Ready on NotReady / shutting-down nodes.

- How to verify it

1. Deploy a TNF cluster with this change applied
2. Verify that /etc/kubernetes/kubelet.conf on control plane nodes does NOT contain shutdownGracePeriod or shutdownGracePeriodCriticalPods settings
3. Initiate a node shutdown and confirm that pods are NOT held in Ready state after the shutdown sequence

- Description for the changelog

Reverted Graceful Node Shutdown enablement for DualReplica clusters due to unresolved upstream issues causing pods to remain Ready on shutting-down nodes.

Summary by CodeRabbit

• Behavior Changes

• Removed the topology-specific kubelet shutdown grace-period settings for DualReplica control planes.

• Kubelet shutdown handling now uses the standard configuration for this topology.

• Tests

• Removed coverage and test fixtures for the retired bare-metal TNF controller configuration and graceful-shutdown scenario.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci-robot]

@vimauro: This pull request references Jira Issue OCPBUGS-112784, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (5.1.0) matches configured target version for branch (5.1.0)
• bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Details

In response to this:

- What I did
Reverted the enablement of Graceful Node Shutdown for Two Node Fencing

GNS in its current upstream state has few unresolved issues, see kubernetes/kubernetes#112733 or kubernetes/enhancements#6249

The main issue we've encountered in some cases is related to pods (mainly from DaemonSets) to remain in Ready on NotReady / shutting-down nodes.

- How to verify it

1. Deploy a TNF cluster with this change applied
2. Verify that /etc/kubernetes/kubelet.conf on control plane nodes does NOT contain shutdownGracePeriod or shutdownGracePeriodCriticalPods settings
3. Initiate a node shutdown and confirm that pods are NOT held in Ready state after the shutdown sequence

- Description for the changelog

Reverted Graceful Node Shutdown enablement for DualReplica clusters due to unresolved upstream issues causing pods to remain Ready on shutting-down nodes.

Summary by CodeRabbit

• Behavior Changes

• Removed the topology-specific kubelet shutdown grace-period settings for DualReplica control planes.

• Kubelet shutdown handling now uses the standard configuration for this topology.

• Tests

• Removed coverage and test fixtures for the retired bare-metal TNF controller configuration and graceful-shutdown scenario.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[vimauro]

/test e2e-metal-ovn-two-node-fencing-recovery

[vimauro]

/test e2e-metal-ovn-two-node-fencing

[vimauro]

/retest

[vimauro]

/verified by @vimauro on a live TNF cluster

[openshift-ci-robot]

@vimauro: This PR has been marked as verified by @vimauro on a live TNF cluster.

Details

In response to this:

/verified by @vimauro on a live TNF cluster

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci]

@vimauro: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-metal-ovn-two-node-fencing	472f325	link	false	/test e2e-metal-ovn-two-node-fencing
ci/prow/perfscale-control-plane-6nodes	472f325	link	false	/test perfscale-control-plane-6nodes

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

[vimauro]

/payload-job periodic-ci-openshift-release-main-nightly-4.22-e2e-metal-ovn-two-node-fencing-upgrade

[openshift-ci]

@vimauro: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

• periodic-ci-openshift-release-main-nightly-4.22-e2e-metal-ovn-two-node-fencing-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/53e0f280-a08d-11f1-90b1-849e7ecfa9fc-0