Skip to content

[release-4.20] OCPBUGS-77313: Wait for revision stability before removing etcd members#1559

Open
openshift-cherrypick-robot wants to merge 1 commit intoopenshift:release-4.20from
openshift-cherrypick-robot:cherry-pick-1555-to-release-4.20
Open

[release-4.20] OCPBUGS-77313: Wait for revision stability before removing etcd members#1559
openshift-cherrypick-robot wants to merge 1 commit intoopenshift:release-4.20from
openshift-cherrypick-robot:cherry-pick-1555-to-release-4.20

Conversation

@openshift-cherrypick-robot

This is an automated cherry-pick of #1555

/assign hasbro17

/cherrypick release-4.19 release-4.18

Previously, the ClusterMemberRemovalController would remove etcd members
during revision rollouts, causing cluster degradation when simultaneously
deleting multiple control plane machines with the OnDelete strategy.

During a revision rollout, etcd members can temporarily appear unhealthy
while their pods are reinstalled to the latest revision. This is different
from members being indefinitely unhealthy on a stable revision.

Additionally, the EtcdEndpointsController pauses during revision rollouts,
so when a replacement machine is added and triggers a rollout, the
etcd-endpoints configmap won't update. This causes API servers on the old
revision to use removed member endpoints, leading to API unavailability.

This change adds a revision stability check before allowing member removal,
ensuring we only remove members when revisions are stable and unhealthy
members are truly unhealthy. This explicitly codifies the 4.17 behavior
where the operator waited for all revisions to complete before removing
members and lifecycle hooks.

Additionally, the ClusterMemberRemovalController now verifies that the live
etcd membership matches the configmap before proceeding with member removal,
preventing potential issues during rapid member deletion

(cherry picked from commit 0168733)
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: Detected clone of Jira Issue OCPBUGS-77097 with correct target version. Will retitle the PR to link to the clone.
/retitle [release-4.20] OCPBUGS-77313: Wait for revision stability before removing etcd members

Details

In response to this:

This is an automated cherry-pick of #1555

/assign hasbro17

/cherrypick release-4.19 release-4.18

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

coderabbitai bot commented Mar 2, 2026

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment

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

@openshift-ci openshift-ci bot changed the title [release-4.20] OCPBUGS-77097: Wait for revision stability before removing etcd members [release-4.20] OCPBUGS-77313: Wait for revision stability before removing etcd members Mar 2, 2026
@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 Mar 2, 2026
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-77313, which is invalid:

  • expected dependent Jira Issue OCPBUGS-77097 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is MODIFIED 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:

This is an automated cherry-pick of #1555

/assign hasbro17

/cherrypick release-4.19 release-4.18

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 openshift-ci bot requested review from dusk125 and hasbro17 March 2, 2026 19:07
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 2, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

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

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

@lance5890
Copy link
Contributor

/retest-required

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 3, 2026

@openshift-cherrypick-robot: 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-aws-ovn-serial-1of2 36b6530 link true /test e2e-aws-ovn-serial-1of2
ci/prow/e2e-aws-ovn-single-node 36b6530 link true /test e2e-aws-ovn-single-node
ci/prow/e2e-aws-ovn-serial-2of2 36b6530 link true /test e2e-aws-ovn-serial-2of2

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

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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants