[release 4.20] OCPBUGS-77252: Calculate machine counts in MCP status from node properties

[isabella-janssen]

- What I did
This updates the calculateStatus function used to to always calculate the machine counts in an MCP's status based on the associated nodes' properties instead of from MCN conditions. This allows the removal of the confusing if degradedMachineCount+readyMachineCount+unavailableMachineCount+updatingMachineCount != int32(len(nodes)) conditional found at

machine-config-operator/pkg/controller/node/status.go

Line 211 in ecf42ae

if degradedMachineCount+readyMachineCount+unavailableMachineCount+updatingMachineCount != int32(len(nodes)) {

.

This conditional was removed in 4.21 and MCN conditions were used to populate the updated and degraded machine counts as part of the ImageModeStatusReporting work. For <=4.20, it does not make sense to populate the machine counts with MCN conditions, when the node properties have the most predictable and consistent performance.

- How to verify it
The MCP machine counts should continue to transition throughout updates as previously expected & all existing tests should continue passing.

- Description for the changelog

[openshift-ci]

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

[isabella-janssen]

/test all

[isabella-janssen]

/jira cherrypick OCPBUGS-77055

[openshift-ci-robot]

@isabella-janssen: Jira Issue OCPBUGS-77055 has been cloned as Jira Issue OCPBUGS-77252. Will retitle bug to link to clone.
/retitle OCPBUGS-77252: Calculate machine counts in MCP status from node properties

Details

In response to this:

/jira cherrypick OCPBUGS-77055

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]

@isabella-janssen: This pull request references Jira Issue OCPBUGS-77252, 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.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

- What I did
This updates the calculateStatus function used to to always calculate the machine counts in an MCP's status based on the associated nodes' properties instead of from MCN conditions. This allows the removal of the confusing if degradedMachineCount+readyMachineCount+unavailableMachineCount+updatingMachineCount != int32(len(nodes)) conditional found at

machine-config-operator/pkg/controller/node/status.go

Line 211 in ecf42ae

if degradedMachineCount+readyMachineCount+unavailableMachineCount+updatingMachineCount != int32(len(nodes)) {

.

This conditional was removed in 4.21 and MCN conditions were used to populate the updated and degraded machine counts as part of the ImageModeStatusReporting work. For <=4.20, it does not make sense to populate the machine counts with MCN conditions, when the node properties have the most predictable and consistent performance.

- How to verify it
The MCP machine counts should continue to transition throughout updates as previously expected & all existing tests should continue passing.

- Description for the changelog

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.

[isabella-janssen]

/retitle [release 4.20] OCPBUGS-77252: Calculate machine counts in MCP status from node properties

[isabella-janssen]

/jira refresh

[openshift-ci-robot]

@isabella-janssen: This pull request references Jira Issue OCPBUGS-77252, 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.20.z) matches configured target version for branch (4.20.z)
• 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-77055 is in the state Closed (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
• dependent Jira Issue OCPBUGS-77055 targets the "4.21.z" version, which is one of the valid target versions: 4.21.0, 4.21.z
• bug has dependents

Requesting review from QA contact:
/cc @sergiordlr

The bug has been updated to refer to the pull request using the external bug tracker.

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.

[isabella-janssen]

/retest-required

[coderabbitai]

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

Run ID: f5719b37-b8f0-400f-b28f-03b9250727fe

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
• Post copyable unit tests in a comment

---

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

[openshift-ci]

@isabella-janssen: The following tests 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/e2e-gcp-op-1of2	398a473	link	true	/test e2e-gcp-op-1of2
ci/prow/e2e-gcp-op-2of2	398a473	link	true	/test e2e-gcp-op-2of2
ci/prow/e2e-hypershift	82ab142	link	true	/test e2e-hypershift

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.

[djoshy]

/lgtm

/label backport-risk-assessed

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: djoshy, isabella-janssen

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 [djoshy,isabella-janssen]

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