OCPBUGS-88325: fix(cpo) delete terminated MCD pods to retry in-place upgrades by PoornimaSingour · Pull Request #8729 · openshift/hypershift

PoornimaSingour · 2026-06-12T06:06:13Z

Backport of #8434 to release-4.22.

Cherry-pick of 3e8737e and 9092cca.

openshift-merge-bot · 2026-06-12T06:06:16Z

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-12T06:06:22Z

@PoornimaSingour: This pull request references Jira Issue OCPBUGS-88325, 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-84308 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:

Backport of #8434 to release-4.22.

Cherry-pick of 3e8737e and 9092cca.

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-06-12T06:06:23Z

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: e79bece9-2650-4047-b73d-dc92c9885720

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 and usage tips.}

PoornimaSingour · 2026-06-12T06:07:44Z

/jira refresh

openshift-ci-robot · 2026-06-12T06:07:48Z

@PoornimaSingour: This pull request references Jira Issue OCPBUGS-88325, 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-84308 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.

…upgrades When an in-place upgrade MCD pod reaches a terminal phase (Succeeded or Failed) on a node that still needs upgrading, the pod is now detected and deleted so the controller can recreate it for a retry. A periodic requeue (30s) ensures the controller re-evaluates even if the pod deletion event is missed. Also uses supportutil.DeleteIfNeeded from support/util (the k8sutil package does not exist on release-4.22) and includes node.Name in the degraded-node error message for easier debugging. Co-Authored-By: Poornima Singour <psingour@redhat.com>

codecov · 2026-06-18T10:37:51Z

Codecov Report

❌ Patch coverage is 60.86957% with 9 lines in your changes missing coverage. Please review.
✅ Project coverage is 35.51%. Comparing base (5cb8735) to head (461f832).
⚠️ Report is 13 commits behind head on release-4.22.

Files with missing lines	Patch %	Lines
...tor/controllers/inplaceupgrader/inplaceupgrader.go	60.86%	6 Missing and 3 partials ⚠️

Additional details and impacted files

@@               Coverage Diff                @@
##           release-4.22    #8729      +/-   ##
================================================
+ Coverage         35.45%   35.51%   +0.06%     
================================================
  Files               767      767              
  Lines             93724    93724              
================================================
+ Hits              33226    33289      +63     
+ Misses            57785    57706      -79     
- Partials           2713     2729      +16

Files with missing lines	Coverage Δ
...tor/controllers/inplaceupgrader/inplaceupgrader.go	`68.77% <60.86%> (+11.71%)`	⬆️

🚀 New features to boost your workflow:

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

jparrill · 2026-06-18T11:16:46Z

/jira refresh

openshift-ci-robot · 2026-06-18T11:16:50Z

@jparrill: This pull request references Jira Issue OCPBUGS-88325, 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-84308 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.

jparrill · 2026-06-18T11:18:21Z

/jira refresh

openshift-ci-robot · 2026-06-18T11:18:26Z

@jparrill: This pull request references Jira Issue OCPBUGS-88325, 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.

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.

jparrill · 2026-06-18T11:19:03Z

/approve

openshift-ci · 2026-06-18T11:19:17Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jparrill, PoornimaSingour

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

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

jparrill · 2026-06-18T11:19:25Z

You need to update the release note in the Jira bug

enxebre · 2026-06-18T11:37:00Z

/lgtm

openshift-merge-bot · 2026-06-18T11:37:21Z

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/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

PoornimaSingour · 2026-06-26T08:04:41Z

/retest

PoornimaSingour · 2026-06-30T11:39:55Z

/verified by me

Triggered in-place Upgrade to 4.22.3 successfully
MCD pod created and ran on the node
Force-delete MCD pod →----> Pod force-deleted at 11:34:41, controller recreated it within 2 seconds at 11:34:43
Periodic 30s requeue ---> Confirmed ~27-33s reconcile gaps in HCCO logs, matching upgradeRequeueInterval = 30s │
Upgrade completes successfully---> NodePool at 4.22.3, node state=Done, configs match, idle MCD pod cleaned up

openshift-ci-robot · 2026-06-30T11:40:07Z

@PoornimaSingour: This PR has been marked as verified by me.

Details

In response to this:

/verified by me

Triggered in-place Upgrade to 4.22.3 successfully

MCD pod created and ran on the node

Force-delete MCD pod →----> Pod force-deleted at 11:34:41, controller recreated it within 2 seconds at 11:34:43

Periodic 30s requeue ---> Confirmed ~27-33s reconcile gaps in HCCO logs, matching upgradeRequeueInterval = 30s │

Upgrade completes successfully---> NodePool at 4.22.3, node state=Done, configs match, idle MCD pod cleaned up

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.

PoornimaSingour · 2026-06-30T16:39:48Z

/jira refresh

openshift-ci-robot · 2026-06-30T16:39:58Z

@PoornimaSingour: This pull request references Jira Issue OCPBUGS-88325, 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 text is set and does not match the template
dependent bug Jira Issue OCPBUGS-84308 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
dependent Jira Issue OCPBUGS-84308 targets the "5.0.0" version, which is one of the valid target versions: 5.0.0
bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (dhuynh@redhat.com), skipping review request.

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.

openshift-ci · 2026-06-30T16:55:17Z

@PoornimaSingour: 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-06-30T17:06:32Z

@PoornimaSingour: Jira Issue Verification Checks: Jira Issue OCPBUGS-88325
✔️ 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-88325 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:

Backport of #8434 to release-4.22.

Cherry-pick of 3e8737e and 9092cca.

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-01T16:21:46Z

Fix included in release 4.22.0-0.nightly-2026-07-01-084657

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

openshift-ci Bot requested review from csrwng and enxebre June 12, 2026 06:06

openshift-ci Bot added area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release and removed do-not-merge/needs-area labels Jun 12, 2026

PoornimaSingour force-pushed the OCPBUGS-88325 branch from 0f1134e to 85f4d19 Compare June 18, 2026 10:20

PoornimaSingour force-pushed the OCPBUGS-88325 branch from 85f4d19 to 461f832 Compare June 18, 2026 10:23

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 18, 2026

enxebre added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jun 18, 2026

openshift-ci Bot assigned enxebre Jun 18, 2026

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

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

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

openshift-merge-bot Bot merged commit 115431c into openshift:release-4.22 Jun 30, 2026
24 checks passed

Uh oh!

Conversation

PoornimaSingour commented Jun 12, 2026

Uh oh!

openshift-merge-bot Bot commented Jun 12, 2026

Uh oh!

openshift-ci-robot commented Jun 12, 2026

Uh oh!

coderabbitai Bot commented Jun 12, 2026

Review skipped

Uh oh!

PoornimaSingour commented Jun 12, 2026

Uh oh!

openshift-ci-robot commented Jun 12, 2026

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

jparrill commented Jun 18, 2026

Uh oh!

openshift-ci-robot commented Jun 18, 2026

Uh oh!

jparrill commented Jun 18, 2026

Uh oh!

openshift-ci-robot commented Jun 18, 2026

Uh oh!

jparrill commented Jun 18, 2026

Uh oh!

openshift-ci Bot commented Jun 18, 2026

Uh oh!

jparrill commented Jun 18, 2026

Uh oh!

enxebre commented Jun 18, 2026

Uh oh!

openshift-merge-bot Bot commented Jun 18, 2026

Uh oh!

PoornimaSingour commented Jun 26, 2026

Uh oh!

PoornimaSingour commented Jun 30, 2026

Uh oh!

openshift-ci-robot commented Jun 30, 2026

Uh oh!

PoornimaSingour commented Jun 30, 2026

Uh oh!

openshift-ci-robot commented Jun 30, 2026

Uh oh!

openshift-ci Bot commented Jun 30, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented Jun 30, 2026

Uh oh!

openshift-merge-robot commented Jul 1, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecov Bot commented Jun 18, 2026 •

edited

Loading