OCPBUGS-86493: Populate status label selector for scale subresource by RadekManak · Pull Request #1501 · openshift/machine-api-operator

RadekManak · 2026-05-25T18:53:09Z

Summary

Cherry-pick of OCPBUGS-82584: Populate status label selector for scale subresource. #1490 to release-4.21
Populates status.labelSelector on MachineSet so the scale subresource returns a valid selector for HPA / external autoscalers
Depends on OCPBUGS-86493: Add labelSelector to MachineSet status for scale subresource api#2857 — uses local replace for openshift/api, will be updated once the API PR merges

Bug

https://redhat.atlassian.net/browse/OCPBUGS-86493

openshift-ci · 2026-05-25T18:53:14Z

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 · 2026-05-25T18:53:17Z

@RadekManak: This pull request references Jira Issue OCPBUGS-86493, which is invalid:

expected Jira Issue OCPBUGS-86493 to depend on a bug targeting a version in 4.22.0 and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

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

Cherry-pick of OCPBUGS-82584: Populate status label selector for scale subresource. #1490 to release-4.21

Populates status.labelSelector on MachineSet so the scale subresource returns a valid selector for HPA / external autoscalers

Depends on OCPBUGS-86493: Add labelSelector to MachineSet status for scale subresource api#2857 — uses local replace for openshift/api, will be updated once the API PR merges

Bug

https://redhat.atlassian.net/browse/OCPBUGS-86493

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-05-25T18:53:17Z

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: a76f8e40-694e-4c51-a08e-0dda536003fa

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.}

RadekManak · 2026-05-26T09:53:30Z

/jira refresh

openshift-ci-robot · 2026-05-26T09:53:37Z

@RadekManak: This pull request references Jira Issue OCPBUGS-86493, 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 text is set and does not match the template
dependent bug Jira Issue OCPBUGS-85102 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-85102 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.

Set status.labelSelector from spec.selector on each reconcile so the CRD scale subresource (labelSelectorPath: .status.labelSelector) can expose the selector string to the HPA and other autoscalers via the autoscaling/v1 Scale status.selector field. Add tests verifying calculateStatus sets labelSelector correctly and that updateMachineSetStatus writes the field even when replica counts are unchanged.

RadekManak · 2026-05-26T13:22:39Z

/verified by https://github.com/openshift/cluster-api-actuator-pkg/pull/479/checks?check_run_id=77758650948
/assign @damdo

openshift-ci-robot · 2026-05-26T13:22:54Z

@RadekManak: This PR has been marked as verified by https://github.com/openshift/cluster-api-actuator-pkg/pull/479/checks?check_run_id=77758650948.

Details

In response to this:

/verified by https://github.com/openshift/cluster-api-actuator-pkg/pull/479/checks?check_run_id=77758650948
/assign @damdo

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.

RadekManak · 2026-05-26T13:23:23Z

/label backport-risk-assessed

damdo · 2026-05-26T15:23:21Z

/test unit

damdo

/approve
/lgtm

openshift-ci · 2026-05-26T15:44:29Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: damdo

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

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

openshift-ci-robot · 2026-05-26T17:39:45Z

@RadekManak: Jira Issue OCPBUGS-86493: Some pull requests linked via external trackers have merged:

The following pull request, linked via external tracker, has not merged:

openshift/cluster-api-actuator-pkg#479 is open

All associated pull requests must be merged or unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

Jira Issue OCPBUGS-86493 has not been moved to the MODIFIED state.

This PR is marked as verified. If the remaining PRs listed above are marked as verified before merging, the issue will automatically be moved to VERIFIED after all of the changes from the PRs are available in an accepted nightly payload.

Details

In response to this:

Summary

Cherry-pick of OCPBUGS-82584: Populate status label selector for scale subresource. #1490 to release-4.21

Populates status.labelSelector on MachineSet so the scale subresource returns a valid selector for HPA / external autoscalers

Depends on OCPBUGS-86493: Add labelSelector to MachineSet status for scale subresource api#2857 — uses local replace for openshift/api, will be updated once the API PR merges

Bug

https://redhat.atlassian.net/browse/OCPBUGS-86493

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 Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 25, 2026

RadekManak mentioned this pull request May 25, 2026

OCPBUGS-86493: test MachineSet scale selector for HPA openshift/cluster-api-actuator-pkg#479

Open

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 May 26, 2026

openshift-ci-robot mentioned this pull request May 26, 2026

OCPBUGS-86493: Add labelSelector to MachineSet status for scale subresource openshift/api#2857

Merged

RadekManak added 2 commits May 26, 2026 15:19

Vendor openshift/api with labelSelector fix

4df9b03

RadekManak force-pushed the cherry-pick-1490-to-release-4.21 branch from dc3173e to 40913b8 Compare May 26, 2026 13:19

RadekManak marked this pull request as ready for review May 26, 2026 13:22

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 May 26, 2026

openshift-ci Bot assigned damdo May 26, 2026

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

openshift-ci Bot requested review from damdo and nrb May 26, 2026 13:22

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

damdo reviewed May 26, 2026

View reviewed changes

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

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

openshift-merge-bot Bot merged commit 88f39dc into openshift:release-4.21 May 26, 2026
16 of 17 checks passed

Conversation

RadekManak commented May 25, 2026

Summary

Bug

Uh oh!

openshift-ci Bot commented May 25, 2026

Uh oh!

openshift-ci-robot commented May 25, 2026

Summary

Bug

Uh oh!

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

Uh oh!

Review skipped

Uh oh!

RadekManak commented May 26, 2026

Uh oh!

openshift-ci-robot commented May 26, 2026

Uh oh!

RadekManak commented May 26, 2026

Uh oh!

openshift-ci-robot commented May 26, 2026

Uh oh!

RadekManak commented May 26, 2026

Uh oh!

damdo commented May 26, 2026

Uh oh!

damdo left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

openshift-ci Bot commented May 26, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented May 26, 2026

Summary

Bug

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

coderabbitai Bot commented May 25, 2026 •

edited

Loading

damdo left a comment •

edited

Loading