OCPBUGS-90086: [release-4.22] clear stale EtcdRecoveryActive failure condition when etcd is healthy by vsolanki12 · Pull Request #8806 · openshift/hypershift

vsolanki12 · 2026-06-23T11:01:54Z

Summary

Backport of #8406 to release-4.22.

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-90086

openshift-merge-bot · 2026-06-23T11:01:57Z

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-06-23T11:02:00Z

@vsolanki12: This pull request references Jira Issue OCPBUGS-90086, 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-84577 to target a version in 5.0.0, but it targets "5.0" 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.22.

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-90086

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 · 2026-06-23T11:02:01Z

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

coderabbitai · 2026-06-23T11:02:50Z

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 YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: a5050e35-a77b-4146-95b6-6c1462f3d8f9

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

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

codecov · 2026-06-23T11:19:46Z

Codecov Report

❌ Patch coverage is 58.33333% with 10 lines in your changes missing coverage. Please review.
✅ Project coverage is 35.59%. Comparing base (e3ad989) to head (dfc89c3).
⚠️ Report is 43 commits behind head on release-4.22.

Files with missing lines	Patch %	Lines
...perator/controllers/hostedcluster/etcd_recovery.go	58.33%	8 Missing and 2 partials ⚠️

Additional details and impacted files

@@               Coverage Diff                @@
##           release-4.22    #8806      +/-   ##
================================================
+ Coverage         35.45%   35.59%   +0.14%     
================================================
  Files               767      767              
  Lines             93724    93771      +47     
================================================
+ Hits              33226    33381     +155     
+ Misses            57785    57673     -112     
- Partials           2713     2717       +4

Files with missing lines	Coverage Δ
...perator/controllers/hostedcluster/etcd_recovery.go	`35.69% <58.33%> (+35.69%)`	⬆️

... and 6 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

cblecker · 2026-06-24T17:28:52Z

/uncc

vsolanki12 · 2026-06-26T08:03:24Z

/jira refresh

openshift-ci-robot · 2026-06-26T08:03:30Z

@vsolanki12: This pull request references Jira Issue OCPBUGS-90086, 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-84577 to target a version in 5.0.0, but it targets "5.0" 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 · 2026-06-26T08:08:56Z

/jira refresh

openshift-ci-robot · 2026-06-26T08:09:00Z

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

expected dependent Jira Issue OCPBUGS-84577 to target a version in 5.0.0, but it targets "5.0" 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 · 2026-06-26T10:41:09Z

/cc @bryan-cox @sdminonne

…when etcd is healthy When an etcd recovery job fails and etcd later recovers on its own, the EtcdRecoveryActive condition retains the stale failure reason and message. The console renders this as a red error icon even though the cluster is healthy (Available=True, Degraded=False, EtcdAvailable=True). Clear the stale EtcdRecoveryActive condition by resetting its reason and message when etcd quorum is available and no recovery job is running. Add unit tests covering all condition state transitions. Signed-off-by: Vimal Solanki <vsolanki@redhat.com>

vsolanki12 · 2026-06-29T06:50:03Z

Manual Verification on Live Cluster

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

Setup:

Built custom HO image from this branch (Dockerfile.dev)
Deployed to management cluster via oc set image deployment/operator -n hypershift
Created HostedCluster backporttest-etcd with release image 4.22.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.

vsolanki12 · 2026-07-07T09:27:34Z

/jira refresh

openshift-ci-robot · 2026-07-07T09:27:38Z

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

expected dependent Jira Issue OCPBUGS-84577 to target a version in 5.0.0, but it targets "5.0" 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 · 2026-07-07T09:27:59Z

/jira refresh

openshift-ci-robot · 2026-07-07T09:28:04Z

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

expected dependent Jira Issue OCPBUGS-84577 to target a version in 5.0.0, but it targets "5.0" 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 · 2026-07-07T09:30:42Z

/jira refresh

openshift-ci-robot · 2026-07-07T09:30:49Z

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

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.22.0) matches configured target version for branch (4.22.0)
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-84577 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
dependent Jira Issue OCPBUGS-84577 targets the "5.0.0" version, which is one of the valid target versions: 5.0.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.

bryan-cox

/lgtm

openshift-merge-bot · 2026-07-16T18:59:31Z

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aks-4-21
/test e2e-aws-4-21
/test e2e-aks
/test e2e-aws
/test e2e-aws-upgrade-hypershift-operator
/test e2e-azure-self-managed
/test e2e-kubevirt-aws-ovn-reduced
/test e2e-v2-aws

openshift-ci · 2026-07-16T19:00:25Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bryan-cox, 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~~ [bryan-cox]

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

vsolanki12 · 2026-07-22T12:44:00Z

/retest

vsolanki12 · 2026-07-24T07:29:05Z

/retest

bryan-cox · 2026-07-27T01:39:56Z

/test e2e-aws-upgrade-hypershift-operator

vsolanki12 · 2026-07-27T06:00:22Z

/verified by @vsolanki12
reference of testing #8806 (comment)

openshift-ci-robot · 2026-07-27T06:00:33Z

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

Details

In response to this:

/verified by @vsolanki12
reference of testing #8806 (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 · 2026-07-27T06:16:01Z

@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 · 2026-07-27T06:27:46Z

@vsolanki12: Jira Issue Verification Checks: Jira Issue OCPBUGS-90086
✔️ 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-90086 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.22.

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-90086

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 · 2026-07-27T20:29:34Z

Fix included in release 4.22.0-0.nightly-2026-07-27-135441

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 Jun 23, 2026

openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 23, 2026

openshift-ci Bot added the do-not-merge/needs-area label Jun 23, 2026

openshift-ci Bot added area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release and removed do-not-merge/needs-area labels Jun 23, 2026

vsolanki12 marked this pull request as ready for review June 24, 2026 09:08

openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 24, 2026

openshift-ci Bot requested review from cblecker and enxebre June 24, 2026 09:10

openshift-ci Bot removed the request for review from cblecker June 24, 2026 17:28

openshift-ci Bot requested review from bryan-cox and sdminonne June 26, 2026 10:41

vsolanki12 force-pushed the backport-c5ada28-to-release-4.22 branch from 75a3a26 to 821f069 Compare June 26, 2026 10:53

vsolanki12 force-pushed the backport-c5ada28-to-release-4.22 branch from 821f069 to dfc89c3 Compare June 26, 2026 11:03

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jul 7, 2026

csrwng added approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. labels Jul 16, 2026

bryan-cox approved these changes Jul 16, 2026

View reviewed changes

openshift-ci Bot assigned bryan-cox Jul 16, 2026

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 16, 2026

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jul 27, 2026

openshift-merge-bot Bot merged commit f4c055d into openshift:release-4.22 Jul 27, 2026
25 checks passed

Uh oh!

Conversation

vsolanki12 commented Jun 23, 2026

Summary

Original PR

JIRA

Uh oh!

openshift-merge-bot Bot commented Jun 23, 2026

Uh oh!

openshift-ci-robot commented Jun 23, 2026

Summary

Original PR

JIRA

Uh oh!

openshift-ci Bot commented Jun 23, 2026

Uh oh!

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

Uh oh!

Review skipped

Uh oh!

codecov Bot commented Jun 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

cblecker commented Jun 24, 2026

Uh oh!

vsolanki12 commented Jun 26, 2026

Uh oh!

openshift-ci-robot commented Jun 26, 2026

Uh oh!

vsolanki12 commented Jun 26, 2026

Uh oh!

openshift-ci-robot commented Jun 26, 2026

Uh oh!

vsolanki12 commented Jun 26, 2026

Uh oh!

vsolanki12 commented Jun 29, 2026

Manual Verification on Live Cluster

Uh oh!

vsolanki12 commented Jul 7, 2026

Uh oh!

openshift-ci-robot commented Jul 7, 2026

Uh oh!

vsolanki12 commented Jul 7, 2026

Uh oh!

openshift-ci-robot commented Jul 7, 2026

Uh oh!

vsolanki12 commented Jul 7, 2026

Uh oh!

openshift-ci-robot commented Jul 7, 2026

Uh oh!

bryan-cox left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-merge-bot Bot commented Jul 16, 2026

Uh oh!

openshift-ci Bot commented Jul 16, 2026

Uh oh!

vsolanki12 commented Jul 22, 2026

Uh oh!

vsolanki12 commented Jul 24, 2026

Uh oh!

bryan-cox commented Jul 27, 2026

Uh oh!

vsolanki12 commented Jul 27, 2026

Uh oh!

openshift-ci-robot commented Jul 27, 2026

Uh oh!

openshift-ci Bot commented Jul 27, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented Jul 27, 2026

Summary

Original PR

JIRA

Uh oh!

openshift-merge-robot commented Jul 27, 2026

Uh oh!

Reviewers

Assignees

coderabbitai Bot commented Jun 23, 2026 •

edited

Loading

codecov Bot commented Jun 23, 2026 •

edited

Loading