DNM/TEST: Revert "OCPEDGE-2473: feat: enabled graceful shutdown for TNF cluster… by jluhrsen · Pull Request #6399 · openshift/machine-config-operator

jluhrsen · 2026-08-13T03:52:22Z

…s (#6036)"

This reverts commit 6618f14.

- What I did

- How to verify it

- Description for the changelog

Summary by CodeRabbit

Bug Fixes
- Removed explicit pod priority values from CoreDNS, Keepalived, and HAProxy while retaining their critical system priority class.
- Simplified kubelet shutdown behavior for dual-replica control-plane deployments.
Tests
- Removed obsolete bare-metal test coverage and related configuration fixtures.

openshift#6036)" This reverts commit 6618f14.

openshift-merge-bot · 2026-08-13T03:52:24Z

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 · 2026-08-13T03:52:26Z

@jluhrsen: This pull request references OCPEDGE-2473 which is a valid jira issue.

Details

In response to this:

…s (#6036)"

This reverts commit 6618f14.

- What I did

- How to verify it

- Description for the changelog

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 · 2026-08-13T03:52:43Z

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: 0e4a09bb-16de-426e-9800-734ac73a9343

📥 Commits

Reviewing files that changed from the base of the PR and between 0df05f6 and 533df20.

📒 Files selected for processing (6)

pkg/controller/template/render_test.go
pkg/controller/template/test_data/controller_config_baremetal_tnf.yaml
templates/common/on-prem/files/coredns.yaml
templates/common/on-prem/files/keepalived.yaml
templates/master/00-master/on-prem/files/haproxy.yaml
templates/master/01-master-kubelet/_base/files/kubelet.yaml

💤 Files with no reviewable changes (6)

pkg/controller/template/test_data/controller_config_baremetal_tnf.yaml
templates/common/on-prem/files/keepalived.yaml
templates/master/01-master-kubelet/_base/files/kubelet.yaml
templates/master/00-master/on-prem/files/haproxy.yaml
templates/common/on-prem/files/coredns.yaml
pkg/controller/template/render_test.go

Walkthrough

The change removes obsolete bare-metal TNF test data and coverage. It also removes explicit numeric pod priorities from CoreDNS, Keepalived, and HAProxy manifests while retaining system-node-critical priority classes.

Changes

On-premises configuration cleanup

Layer / File(s)	Summary
Remove obsolete bare-metal TNF test coverage `pkg/controller/template/render_test.go`, `pkg/controller/template/test_data/controller_config_baremetal_tnf.yaml`	Removes the bare-metal TNF fixture, graceful shutdown test, and DualReplica path case.
Use priority class configuration `templates/common/on-prem/files/coredns.yaml`, `templates/common/on-prem/files/keepalived.yaml`, `templates/master/00-master/on-prem/files/haproxy.yaml`, `templates/master/01-master-kubelet/_base/files/kubelet.yaml`	Removes explicit pod priority values and dual-replica kubelet shutdown settings. The affected pods retain `priorityClassName: system-node-critical`.

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

Mergeability Score: ⚪ Minimal · up to 533df

This revert is merge-ready after normal checks and review; no actionable merge-blocking risk remains.

🚥 Pre-merge checks | ✅ 15

✅ Passed checks (15 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title clearly identifies the pull request as a test revert of the graceful shutdown changes for TNF clusters.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
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 diff adds no Ginkgo title and only removes a standard-library Go test; the affected file uses testing.T subtests, not It/Describe/Context/When.
Test Structure And Quality	✅ Passed	The commit only deletes a standard-library Go test, its fixture, and test cases; it adds no Ginkgo tests, cluster operations, waits, or setup/cleanup requirements.
Microshift Test Compatibility	✅ Passed	The diff contains 127 deletions and no additions; it removes an ordinary Go test and fixture, so no new Ginkgo e2e test requires MicroShift compatibility review.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	The commit adds no Ginkgo e2e tests; it only deletes a standard Go test and removes fixtures and template fields, so the SNO compatibility check is not applicable.
Topology-Aware Scheduling Compatibility	✅ Passed	The diff is deletion-only: it removes priority values, TNF test data, and shutdown settings. It adds no anti-affinity, topology spread, node targeting, replica, or PDB constraint.
Ote Binary Stdout Contract	✅ Passed	The diff only deletes tests, a fixture, and YAML fields. It adds no OTE entry-point code or process-level stdout writes; the existing TestMain only parses flags and runs tests.
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	The diff contains only deletions; it adds no Ginkgo e2e tests. The removed test used standard Go testing, so the check's IPv4 and external-connectivity conditions do not apply.
No-Weak-Crypto	✅ Passed	The patch only removes TNF tests, fixtures, pod priority fields, and shutdown settings; no MD5, SHA1, DES, RC4, 3DES, Blowfish, ECB, custom crypto, or secret comparisons were introduced.
Container-Privileges	✅ Passed	The diff adds no prohibited privilege setting; it only removes priority fields and test data. Existing hostNetwork and privileged SCC annotations are unchanged from the parent.
No-Sensitive-Data-In-Logs	✅ Passed	The commit contains only deletions; no logging statements or sensitive-data log paths were added in the diff.

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

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

openshift-ci · 2026-08-13T03:52:55Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: jluhrsen
Once this PR has been reviewed and has the lgtm label, please assign ptalgulk01 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

jluhrsen · 2026-08-13T03:55:24Z

/payload-job periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-ipv6-degraded

openshift-ci · 2026-08-13T03:55:27Z

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

periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-ipv6-degraded

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/d0b24420-96ca-11f1-9cbd-3d8d836edd8d-0

jluhrsen · 2026-08-13T03:56:02Z

/payload-job periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-ipv6-degraded

openshift-ci · 2026-08-13T03:56:05Z

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

periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-ipv6-degraded

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/e7565130-96ca-11f1-9714-8ce9d749a9a0-0

jluhrsen · 2026-08-13T03:56:35Z

/payload-job periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-ipv6-degraded

openshift-ci · 2026-08-13T03:56:38Z

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

periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-ipv6-degraded

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/fb10abd0-96ca-11f1-93a5-7393af5b273b-0

jluhrsen · 2026-08-13T03:56:53Z

/payload-job periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-ipv6-degraded

openshift-ci · 2026-08-13T03:56:56Z

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

periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-ipv6-degraded

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/05c3c6c0-96cb-11f1-8949-58ae82a7df43-0

jluhrsen · 2026-08-13T03:57:00Z

/payload-job periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-ipv6-degraded

openshift-ci · 2026-08-13T03:57:03Z

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

periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-ipv6-degraded

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/09b413c0-96cb-11f1-8b9b-ae6e239745b2-0

jluhrsen · 2026-08-13T03:57:08Z

/payload-job periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-ipv6-degraded

openshift-ci · 2026-08-13T03:57:12Z

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

periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-ipv6-degraded

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/0f10c200-96cb-11f1-80bb-34744590d5cb-0

jluhrsen · 2026-08-13T03:57:15Z

/payload-job periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-ipv6-degraded

openshift-ci · 2026-08-13T03:57:19Z

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

periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-ipv6-degraded

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/13267150-96cb-11f1-93a6-66350dee7595-0

jluhrsen · 2026-08-13T16:45:40Z

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

jluhrsen · 2026-08-13T16:45:50Z

/test e2e-aws-ovn

openshift-ci · 2026-08-13T16:45:53Z

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

periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-degraded

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/6bacf040-9736-11f1-8675-44c8a80ac452-0

jluhrsen · 2026-08-13T17:51:56Z

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

openshift-ci · 2026-08-13T17:52:00Z

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

periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-degraded

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/ad0e10b0-973f-11f1-9ec4-4ac0f5d61cba-0

jluhrsen · 2026-08-13T17:52:13Z

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

jluhrsen · 2026-08-13T17:52:16Z

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

jluhrsen · 2026-08-13T17:52:19Z

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

openshift-ci · 2026-08-13T17:52:19Z

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

periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-degraded

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/b79560b0-973f-11f1-87c8-2008337d5b8b-0

jluhrsen · 2026-08-13T17:52:21Z

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

openshift-ci · 2026-08-13T17:52:21Z

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

periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-degraded

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/b9930570-973f-11f1-86af-cc6a871f667f-0

openshift-ci · 2026-08-13T17:52:24Z

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

periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-degraded

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/bb362e20-973f-11f1-92de-8c7fda981b38-0

jluhrsen · 2026-08-13T17:52:24Z

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

openshift-ci · 2026-08-13T17:52:25Z

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

periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-degraded

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/bc64ea20-973f-11f1-9327-5650bc6b0258-0

openshift-ci · 2026-08-13T17:52:27Z

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

periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ovn-two-node-fencing-degraded

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/bdf2dd20-973f-11f1-8406-7d087c22fa17-0

Revert "OCPEDGE-2473: feat: enabled graceful shutdown for TNF clusters (

533df20

openshift#6036)" This reverts commit 6618f14.

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 13, 2026

openshift-ci Bot requested review from cybertron and emy August 13, 2026 03:52

jluhrsen closed this Aug 20, 2026

Uh oh!

Conversation

jluhrsen commented Aug 13, 2026 • edited by coderabbitai Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary by CodeRabbit

Uh oh!

openshift-merge-bot Bot commented Aug 13, 2026

Uh oh!

openshift-ci-robot commented Aug 13, 2026 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coderabbitai Bot commented Aug 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Uh oh!

openshift-ci Bot commented Aug 13, 2026

Uh oh!

jluhrsen commented Aug 13, 2026

Uh oh!

openshift-ci Bot commented Aug 13, 2026

Uh oh!

jluhrsen commented Aug 13, 2026

Uh oh!

openshift-ci Bot commented Aug 13, 2026

Uh oh!

jluhrsen commented Aug 13, 2026

Uh oh!

openshift-ci Bot commented Aug 13, 2026

Uh oh!

jluhrsen commented Aug 13, 2026

Uh oh!

openshift-ci Bot commented Aug 13, 2026

Uh oh!

jluhrsen commented Aug 13, 2026

Uh oh!

openshift-ci Bot commented Aug 13, 2026

Uh oh!

jluhrsen commented Aug 13, 2026

Uh oh!

openshift-ci Bot commented Aug 13, 2026

Uh oh!

jluhrsen commented Aug 13, 2026

Uh oh!

openshift-ci Bot commented Aug 13, 2026

Uh oh!

jluhrsen commented Aug 13, 2026

Uh oh!

jluhrsen commented Aug 13, 2026

Uh oh!

openshift-ci Bot commented Aug 13, 2026

Uh oh!

jluhrsen commented Aug 13, 2026

Uh oh!

openshift-ci Bot commented Aug 13, 2026

Uh oh!

jluhrsen commented Aug 13, 2026

Uh oh!

jluhrsen commented Aug 13, 2026

Uh oh!

jluhrsen commented Aug 13, 2026

Uh oh!

openshift-ci Bot commented Aug 13, 2026

Uh oh!

jluhrsen commented Aug 13, 2026

Uh oh!

openshift-ci Bot commented Aug 13, 2026

Uh oh!

openshift-ci Bot commented Aug 13, 2026

Uh oh!

jluhrsen commented Aug 13, 2026

Uh oh!

openshift-ci Bot commented Aug 13, 2026

Uh oh!

openshift-ci Bot commented Aug 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

jluhrsen commented Aug 13, 2026 •

edited by coderabbitai Bot

Loading

openshift-ci-robot commented Aug 13, 2026 •

edited by openshift-ci Bot

Loading

coderabbitai Bot commented Aug 13, 2026 •

edited

Loading