[release-4.21] OCPBUGS-77295: backport upstream fix to reconcile resources with inconsistent status by openshift-cherrypick-robot · Pull Request #365 · openshift/prometheus-operator

openshift-cherrypick-robot · 2026-02-26T03:21:52Z

This is an automated cherry-pick of #364

/assign openshift-ci-robot

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

It may happen that the updated and/or available replicas reported in the resource status don't reflect the current values (we've had reports of such situations which are caused by races in the operator logic). This commit updates `StatusPoller` to trigger a reconciliation of the resource's status when the updated and available replica numbers aren't equal to the number of expected replicas. Signed-off-by: Simon Pasquier <spasquie@redhat.com>

openshift-ci-robot · 2026-02-26T03:21:55Z

@openshift-cherrypick-robot: Detected clone of Jira Issue OCPBUGS-74491 with correct target version. Will retitle the PR to link to the clone.
/retitle [release-4.21] OCPBUGS-77295: backport upstream fix to reconcile resources with inconsistent status

Details

In response to this:

This is an automated cherry-pick of #364

/assign openshift-ci-robot

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 · 2026-02-26T03:22:15Z

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-77295, 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-74491 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 #364

/assign openshift-ci-robot

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.

juzhao · 2026-02-26T06:16:28Z

/verified by @juzhao

openshift-ci-robot · 2026-02-26T06:16:38Z

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

Details

In response to this:

/verified by @juzhao

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-02-26T06:50:54Z

@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	`87f6ce1`	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.

simonpasquier · 2026-02-26T09:08:29Z

/approve
/label backport-risk-assessed

simonpasquier · 2026-02-26T09:08:42Z

/jira refresh

openshift-ci-robot · 2026-02-26T09:08:47Z

@simonpasquier: This pull request references Jira Issue OCPBUGS-77295, 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-74491 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ON_QA 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.

simonpasquier

/lgtm

openshift-ci · 2026-02-26T09:10:06Z

[APPROVALNOTIFIER] This PR is APPROVED

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

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

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

simonpasquier · 2026-02-27T10:48:51Z

/skip

juzhao · 2026-02-28T01:25:26Z

/jira refresh

openshift-ci-robot · 2026-02-28T01:25:35Z

@juzhao: This pull request references Jira Issue OCPBUGS-77295, 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.21.z) matches configured target version for branch (4.21.z)
bug is in the state New, 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-74491 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-74491 targets the "4.22.0" version, which is one of the valid target versions: 4.22.0
bug has dependents

Requesting review from QA contact:
/cc @juzhao

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 · 2026-02-28T01:29:00Z

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

/assign openshift-ci-robot

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.

simonpasquier added 2 commits February 26, 2026 03:21

test: add e2e test to simulate the race condition

22b0037

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

openshift-cherrypick-robot assigned openshift-ci-robot Feb 26, 2026

openshift-cherrypick-robot mentioned this pull request Feb 26, 2026

OCPBUGS-74491: backport upstream fix to reconcile resources with inconsistent status #364

Merged

openshift-ci bot changed the title ~~[release-4.21] OCPBUGS-74491: backport upstream fix to reconcile resources with inconsistent status~~ [release-4.21] OCPBUGS-77295: backport upstream fix to reconcile resources with inconsistent status Feb 26, 2026

openshift-ci bot requested review from jan--f and slashpai February 26, 2026 03:22

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

openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Feb 26, 2026

simonpasquier reviewed Feb 26, 2026

View reviewed changes

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 26, 2026

openshift-ci bot assigned simonpasquier Feb 26, 2026

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 26, 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 Feb 28, 2026

openshift-ci bot requested a review from juzhao February 28, 2026 01:25

openshift-merge-bot bot merged commit 3de9763 into openshift:release-4.21 Feb 28, 2026
11 checks passed

Conversation

openshift-cherrypick-robot commented Feb 26, 2026

Uh oh!

openshift-ci-robot commented Feb 26, 2026

Uh oh!

openshift-ci-robot commented Feb 26, 2026

Uh oh!

juzhao commented Feb 26, 2026

Uh oh!

openshift-ci-robot commented Feb 26, 2026

Uh oh!

openshift-ci bot commented Feb 26, 2026

Uh oh!

simonpasquier commented Feb 26, 2026

Uh oh!

simonpasquier commented Feb 26, 2026

Uh oh!

openshift-ci-robot commented Feb 26, 2026

Uh oh!

simonpasquier left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Feb 26, 2026

Uh oh!

simonpasquier commented Feb 27, 2026

Uh oh!

juzhao commented Feb 28, 2026

Uh oh!

openshift-ci-robot commented Feb 28, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented Feb 28, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants