Skip to content

OCPBUGS-82190: Remove etcd preDrain hook strip workaround from node replacement test#31149

Open
vimauro wants to merge 1 commit intoopenshift:mainfrom
vimauro:revert-etcd-predrain-hook-workaround
Open

OCPBUGS-82190: Remove etcd preDrain hook strip workaround from node replacement test#31149
vimauro wants to merge 1 commit intoopenshift:mainfrom
vimauro:revert-etcd-predrain-hook-workaround

Conversation

@vimauro
Copy link
Copy Markdown
Contributor

@vimauro vimauro commented May 8, 2026

OCPBUGS-82190 is going to be merged soon, so we can remove this temporary workaround from the TNF node replacements tests

Summary by CodeRabbit

  • Chores
    • Cleaned up edge topology test infrastructure by removing unused constants and obsolete helper functions. Simplified machine deletion test logic by eliminating workaround code. These internal improvements reduce test complexity and enhance maintainability of the test framework.

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

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: automatic mode

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels May 8, 2026
@openshift-ci-robot
Copy link
Copy Markdown

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

  • expected the bug to target the "5.0.0" version, but no target version was set

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:

OCPBUGS-82190 is going to be merged soon, so we can remove this temporary workaround from the TNF node replacements tests

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
Copy link
Copy Markdown

coderabbitai Bot commented May 8, 2026

Walkthrough

This PR removes a Machine-specific workaround that periodically stripped EtcdQuorumOperator pre-drain hooks during Machine deletion. The removal spans two test files with approximately 105 lines deleted, including three helper constants and two helper functions plus conditional invocation logic.

Changes

Machine Pre-Drain Hook Stripper Removal

Layer / File(s) Summary
Constants Removal
test/extended/edge_topologies/tnf_node_replacement_const.go
Three constants removed: machinePreDrainHookStripPollInterval, etcdMachinePreDrainHookName, and etcdMachinePreDrainHookOwner.
Implementation Removal
test/extended/edge_topologies/tnf_node_replacement_finish.go
Helper functions runMachineEtcdPreDrainHookStripper and stripEtcdQuorumOperatorPreDrainHook are deleted. Conditional goroutine in deleteOcResourceWithRetry that invoked the stripper for Machine resources is removed.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

🚥 Pre-merge checks | ✅ 12
✅ Passed checks (12 passed)
Check name Status Explanation
Title check ✅ Passed The title accurately describes the main change: removing an etcd preDrain hook strip workaround from the node replacement test, which aligns with the file modifications removing workaround constants and helper functions.
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 Test names are static and deterministic. Ginkgo test title and Describe label contain no dynamic information (pod names, timestamps, UUIDs, node names, IPs, etc.).
Test Structure And Quality ✅ Passed Test code meets all requirements: single responsibility, proper setup/cleanup, timeouts on cluster operations, meaningful assertions, and consistency with patterns.
Microshift Test Compatibility ✅ Passed No new Ginkgo e2e tests are added. The changes only affect utility functions and constants. The MicroShift compatibility check is not applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed The SNO check applies only when new Ginkgo e2e tests are added. This PR removes helper code from existing tests but adds no new test declarations. The check is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed PR only removes code from test files (test/extended/edge_topologies/). No deployment manifests, operator code, or controllers are added/modified. Custom check not applicable.
Ote Binary Stdout Contract ✅ Passed PR removes test helper code. Removed constants are simple assignments. Removed functions were test helpers using e2e.Logf (writes to GinkgoWriter, not stdout). No process-level stdout violations.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed This PR only removes code (removes workaround helper functions and constants) with no new Ginkgo e2e tests added. The custom check applies only when new tests are added.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Tip

💬 Introducing Slack Agent: The best way for teams to turn conversations into code.

Slack Agent is built on CodeRabbit's deep understanding of your code, so your team can collaborate across the entire SDLC without losing context.

  • Generate code and open pull requests
  • Plan features and break down work
  • Investigate incidents and troubleshoot customer tickets together
  • Automate recurring tasks and respond to alerts with triggers
  • Summarize progress and report instantly

Built for teams:

  • Shared memory across your entire org—no repeating context
  • Per-thread sandboxes to safely plan and execute work
  • Governance built-in—scoped access, auditability, and budget controls

One agent for your entire SDLC. Right inside Slack.

👉 Get started


Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 8, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vimauro

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

The pull request process is described here

Details Needs approval from an approver in each of these files:

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

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 8, 2026
@openshift-merge-bot openshift-merge-bot Bot added the ready-for-human-review Indicates a PR has been reviewed by automated tools and is ready for human review label May 8, 2026
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

Scheduling required tests:
/test e2e-aws-csi
/test e2e-aws-ovn-fips
/test e2e-aws-ovn-microshift
/test e2e-aws-ovn-microshift-serial
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-gcp-csi
/test e2e-gcp-ovn
/test e2e-gcp-ovn-upgrade
/test e2e-metal-ipi-ovn-ipv6
/test e2e-vsphere-ovn
/test e2e-vsphere-ovn-upi

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-metal-ovn-two-node-arbiter
/test e2e-metal-ovn-two-node-fencing
/test e2e-metal-ovn-two-node-fencing-recovery

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 8, 2026

@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-ipi-ovn-ipv6 5a08b6d link true /test e2e-metal-ipi-ovn-ipv6
ci/prow/e2e-metal-ovn-two-node-fencing-recovery 5a08b6d link false /test e2e-metal-ovn-two-node-fencing-recovery

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. ready-for-human-review Indicates a PR has been reviewed by automated tools and is ready for human review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants