Skip to content

[release-4.22] OCPBUGS-83637: only report Progressing for active network rollouts#2962

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:release-4.22from
openshift-cherrypick-robot:cherry-pick-2937-to-release-4.22
Apr 20, 2026
Merged

[release-4.22] OCPBUGS-83637: only report Progressing for active network rollouts#2962
openshift-merge-bot[bot] merged 1 commit intoopenshift:release-4.22from
openshift-cherrypick-robot:cherry-pick-2937-to-release-4.22

Conversation

@openshift-cherrypick-robot
Copy link
Copy Markdown

This is an automated cherry-pick of #2937

/assign jluhrsen

Keep pod-based Progressing tied to an actual CNO rollout instead of
temporary unavailability during node reboot churn.

Detect rollouts with a simple two-phase approach:
- Before install complete: all pod churn is part of the rollout
- After install complete: rollout is active only when UpdatedXXX < CurrentXXX/Replicas

Once Updated >= Current, treat pod unavailability as node reboot churn
rather than network rollout progress, avoiding false Progressing conditions.

Restore install-complete state safely across upgrades by treating older
last-seen annotations that omit InstallComplete as legacy data instead
of assuming install is incomplete again.

For machine config status, stop treating generic MCP node convergence
as a CNO rollout signal. Reuse shared mcutil helpers for source-only
checks, and only prune removed machine-config state after every matching
non-paused pool has dropped that config from its rendered source.

Signed-off-by: Jamo Luhrsen <jluhrsen@gmail.com>
Co-authored-by: Codex
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Apr 16, 2026

@openshift-cherrypick-robot: Ignoring requests to cherry-pick non-bug issues: CORENET-6572

Details

In response to this:

This is an automated cherry-pick of #2937

/assign jluhrsen

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 Apr 16, 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.

⚙️ Run configuration

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

Review profile: CHILL

Plan: Pro Plus

Run ID: e1a86a18-bf83-45a4-bd1b-66c9d7641c5f

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

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

@openshift-ci openshift-ci Bot requested review from bpickard22 and tssurya April 16, 2026 23:41
@jluhrsen
Copy link
Copy Markdown
Contributor

jluhrsen commented Apr 17, 2026

/retitle [release-4.22] CORENET-6992: only report Progressing for active network rollouts

@openshift-ci openshift-ci Bot changed the title [release-4.22] CORENET-6572: only report Progressing for active network rollouts [release-4.22] CORENET-6992: only report Progressing for active network rollouts Apr 17, 2026
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 17, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Apr 17, 2026

@openshift-cherrypick-robot: This pull request references CORENET-6992 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.22.0" version, but no target version was set.

Details

In response to this:

This is an automated cherry-pick of #2937

/assign jluhrsen

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.

@jluhrsen
Copy link
Copy Markdown
Contributor

/jira-refresh

3 similar comments
@jluhrsen
Copy link
Copy Markdown
Contributor

/jira-refresh

@jluhrsen
Copy link
Copy Markdown
Contributor

/jira-refresh

@jluhrsen
Copy link
Copy Markdown
Contributor

/jira-refresh

@jluhrsen
Copy link
Copy Markdown
Contributor

/retest

@jluhrsen
Copy link
Copy Markdown
Contributor

@danwinship this is just the backport since we missed getting the original PR in time before branch cutting.

@jluhrsen
Copy link
Copy Markdown
Contributor

/retitle [release-4.22] OCPBUGS-83637: only report Progressing for active network rollouts

@openshift-ci openshift-ci Bot changed the title [release-4.22] CORENET-6992: only report Progressing for active network rollouts [release-4.22] OCPBUGS-83637: only report Progressing for active network rollouts Apr 17, 2026
@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Apr 17, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Apr 17, 2026

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-83637, 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.
  • dependent bug CORENET-6572 is not in the required OCPBUGS project

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 #2937

/assign jluhrsen

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.

@jluhrsen
Copy link
Copy Markdown
Contributor

/jira-refresh

@jluhrsen
Copy link
Copy Markdown
Contributor

/retest

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Apr 18, 2026

@openshift-cherrypick-robot: The following test 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/security 02b74c2 link false /test security

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.

@jluhrsen
Copy link
Copy Markdown
Contributor

/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Apr 20, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@jluhrsen: This pull request references Jira Issue OCPBUGS-83637, which is valid. The bug has been moved to the POST state.

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 New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-83743 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-83743 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.

@openshift-ci-robot openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Apr 20, 2026
@danwinship
Copy link
Copy Markdown
Contributor

/lgtm
/label backport-risk-assessed

@openshift-ci openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Apr 20, 2026
@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Apr 20, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Apr 20, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danwinship, openshift-cherrypick-robot

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 Apr 20, 2026
@jluhrsen
Copy link
Copy Markdown
Contributor

/verified by ci

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Apr 20, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@jluhrsen: This PR has been marked as verified by ci.

Details

In response to this:

/verified by ci

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-bot openshift-merge-bot Bot merged commit e20b9cb into openshift:release-4.22 Apr 20, 2026
24 of 25 checks passed
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@openshift-cherrypick-robot: Jira Issue Verification Checks: Jira Issue OCPBUGS-83637
✔️ 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-83637 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:

This is an automated cherry-pick of #2937

/assign jluhrsen

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

Fix included in release 4.22.0-0.nightly-2026-04-21-051400

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.