OCPBUGS-90087: [release-4.21] clear stale EtcdRecoveryActive failure condition when etcd is healthy

[vsolanki12]

Summary

Backport of #8406 to release-4.21.

• Add Reason check to condition update logic so EtcdRecoveryJobFailed can transition to AsExpected when both use Status=False
• Clear stale EtcdRecoveryJobFailed condition when etcd is fully healthy and no pods are failing

Cherry-pick required manual conflict resolution because #8309 refactored the monolithic function on main but was not backported to release branches.

Original PR

• OCPBUGS-84577: clear stale EtcdRecoveryActive failure condition when etcd is healthy #8406

JIRA

• https://issues.redhat.com/browse/OCPBUGS-90087

[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]

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

[openshift-ci-robot]

@vsolanki12: This pull request references Jira Issue OCPBUGS-90087, which is invalid:

• release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
• expected dependent Jira Issue OCPBUGS-90086 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is New 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:

Summary

Backport of #8406 to release-4.21.

• Add Reason check to condition update logic so EtcdRecoveryJobFailed can transition to AsExpected when both use Status=False
• Clear stale EtcdRecoveryJobFailed condition when etcd is fully healthy and no pods are failing

Cherry-pick required manual conflict resolution because #8309 refactored the monolithic function on main but was not backported to release branches.

Original PR

• OCPBUGS-84577: clear stale EtcdRecoveryActive failure condition when etcd is healthy #8406

JIRA

• https://issues.redhat.com/browse/OCPBUGS-90087

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]

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.

⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: 35f45b83-f530-4602-b448-fe59b06c90af

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

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

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

[vsolanki12]

/jira refresh

[openshift-ci-robot]

@vsolanki12: This pull request references Jira Issue OCPBUGS-90087, which is invalid:

• release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
• expected dependent Jira Issue OCPBUGS-90086 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST 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.

Details

In response to this:

/jira refresh

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.

[vsolanki12]

/jira refresh

[openshift-ci-robot]

@vsolanki12: This pull request references Jira Issue OCPBUGS-90087, which is invalid:

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

Details

In response to this:

/jira refresh

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.

[vsolanki12]

/cc @bryan-cox @sdminonne

[vsolanki12]

Manual Verification on Live Cluster

Tested the stale EtcdRecoveryJobFailed condition clearing on a live KubeVirt-based HostedCluster.

Setup:

• Cross-compiled hypershift-operator binary from this branch (CGO_ENABLED=0 GOOS=linux GOARCH=amd64)
• Deployed custom operator image to management cluster via oc set image deployment/operator -n hypershift
• Created HostedCluster backporttest-etcd with release image 4.21.0-x86_64
• Waited for etcd StatefulSet to reach 3/3 ready

Test:
Patched HostedCluster status with a stale EtcdRecoveryJobFailed condition:

oc patch hostedcluster backporttest-etcd -n clusters --type=merge --subresource=status \
  -p '{"status":{"conditions":[{"type":"EtcdRecoveryActive","status":"False","reason":"EtcdRecoveryJobFailed","message":"Error in Etcd Recovery job: the Etcd cluster requires manual intervention.","lastTransitionTime":"2026-06-01T00:00:00Z"}]}}'

Result:
The reconciler cleared the stale condition within one reconciliation loop:

{
    "lastTransitionTime": "2026-06-01T00:00:00Z",
    "message": "Etcd cluster is healthy, clearing stale recovery failure condition.",
    "observedGeneration": 3,
    "reason": "AsExpected",
    "status": "False",
    "type": "EtcdRecoveryActive"
}

Condition transitioned from EtcdRecoveryJobFailed → AsExpected as expected.

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: vsolanki12

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:

• OWNERS

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

[vsolanki12]

/jira refresh

[openshift-ci-robot]

@vsolanki12: This pull request references Jira Issue OCPBUGS-90087, which is valid.

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.21.z) matches configured target version for branch (4.21.z)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
• release note type set to "Release Note Not Required"
• dependent bug Jira Issue OCPBUGS-90086 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
• dependent Jira Issue OCPBUGS-90086 targets the "4.22.0" version, which is one of the valid target versions: 4.22.0
• bug has dependents

Details

In response to this:

/jira refresh

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.

[vsolanki12]

/retest-required

[bryan-cox]

/lgtm

[openshift-merge-bot]

Scheduling required tests:
/test verify-deps

[vsolanki12]

/verified by @vsolanki12
reference here : #8807 (comment)

[openshift-ci-robot]

@vsolanki12: This PR has been marked as verified by @vsolanki12.

Details

In response to this:

/verified by @vsolanki12
reference here : #8807 (comment)

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]

@vsolanki12: all tests passed!

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.

[openshift-ci-robot]

@vsolanki12: Jira Issue Verification Checks: Jira Issue OCPBUGS-90087
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-90087 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

Summary

Backport of #8406 to release-4.21.

• Add Reason check to condition update logic so EtcdRecoveryJobFailed can transition to AsExpected when both use Status=False
• Clear stale EtcdRecoveryJobFailed condition when etcd is fully healthy and no pods are failing

Cherry-pick required manual conflict resolution because #8309 refactored the monolithic function on main but was not backported to release branches.

Original PR

• OCPBUGS-84577: clear stale EtcdRecoveryActive failure condition when etcd is healthy #8406

JIRA

• https://issues.redhat.com/browse/OCPBUGS-90087

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-merge-robot]

Fix included in release 4.21.0-0.nightly-2026-07-29-004704