[release-4.20] OCPBUGS-62174: Fix MCP updated machine count for image mode disabling case

[openshift-cherrypick-robot]

This is an automated cherry-pick of #5271

/assign isabella-janssen

[openshift-ci-robot]

@openshift-cherrypick-robot: Jira Issue OCPBUGS-58198 has been cloned as Jira Issue OCPBUGS-62174. Will retitle bug to link to clone.
/retitle [release-4.20] OCPBUGS-62174: Fix MCP updated machine count for image mode disabling case

In response to this:

This is an automated cherry-pick of #5271

/assign isabella-janssen

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-cherrypick-robot: This pull request references Jira Issue OCPBUGS-62174, which is invalid:

• expected dependent Jira Issue OCPBUGS-58198 to target a version in 4.21.0, but it targets "4.21" 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.

In response to this:

This is an automated cherry-pick of #5271

/assign isabella-janssen

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]

/jira refresh
/retest-required

[openshift-ci-robot]

@isabella-janssen: This pull request references Jira Issue OCPBUGS-62174, which is invalid:

• expected dependent Jira Issue OCPBUGS-58198 to target a version in 4.21.0, but it targets "4.21" 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.

In response to this:

/jira refresh
/retest-required

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]

/jira refresh

[openshift-ci-robot]

@isabella-janssen: This pull request references Jira Issue OCPBUGS-62174, 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.0) matches configured target version for branch (4.20.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-58198 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
• dependent Jira Issue OCPBUGS-58198 targets the "4.21.0" version, which is one of the valid target versions: 4.21.0
• bug has dependents

Requesting review from QA contact:
/cc @sergiordlr

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.

[yuqi-zhang]

/lgtm
/label backport-risk-assessed

Clean backport and should be a safe change

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

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

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [yuqi-zhang]

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

[isabella-janssen]

/retest-required

[isabella-janssen]

/verified later @ptalgulk01

We will do post-merge verification for this PR.

[openshift-ci-robot]

@isabella-janssen: This PR has been marked to be verified later by @ptalgulk01.

In response to this:

/verified later @ptalgulk01

We will do post-merge verification for this PR.

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]

/retest-required

Remaining retests: 0 against base HEAD c258b4e and 2 for PR HEAD b9b6993 in total

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD d707114 and 1 for PR HEAD b9b6993 in total

[isabella-janssen]

/retest-required

[sergiordlr]

Verified using IPI on AWS

1. Enable OCL in the worker pool

$ oc get mcp
NAME     CONFIG                                             UPDATED   UPDATING   DEGRADED   MACHINECOUNT   READYMACHINECOUNT   UPDATEDMACHINECOUNT   DEGRADEDMACHINECOUNT   AGE
master   rendered-master-b2739f927da5a35e90e11e9e71122d37   True      False      False      3              3                   3                     0                      68m
worker   rendered-worker-3f02efbef9f9da25b67bf606c4603bc9   True      False      False      2              2                   2                     0                      68m

$ oc get  machineosconfig
NAME     AGE
worker   27m

2. Delete the machineosconfig resource

oc delete machineosconfigs.machineconfiguration.openshift.io worker 
machineosconfig.machineconfiguration.openshift.io "worker" deleted

3. Check that the number of nodes reported by the worker pool are right

$  oc get mcp -w
NAME     CONFIG                                             UPDATED   UPDATING   DEGRADED   MACHINECOUNT   READYMACHINECOUNT   UPDATEDMACHINECOUNT   DEGRADEDMACHINECOUNT   AGE
master   rendered-master-b2739f927da5a35e90e11e9e71122d37   True      False      False      3              3                   3                     0                      69m
worker   rendered-worker-3f02efbef9f9da25b67bf606c4603bc9   True      False      False      2              2                   2                     0                      69m
worker   rendered-worker-3f02efbef9f9da25b67bf606c4603bc9   False     True       False      2              0                   0                     0                      69m
worker   rendered-worker-3f02efbef9f9da25b67bf606c4603bc9   False     True       False      2              0                   0                     0                      69m
worker   rendered-worker-3f02efbef9f9da25b67bf606c4603bc9   False     True       False      2              1                   1                     0                      74m
worker   rendered-worker-3f02efbef9f9da25b67bf606c4603bc9   False     True       False      2              1                   1                     0                      74m
worker   rendered-worker-3f02efbef9f9da25b67bf606c4603bc9   True      False      False      2              2                   2                     0                      80m

We can see how first there were 0 worker nodes updated, then 1 worker node updated and finally 2.

/label qe-approved
/label cherry-pick-approved

[openshift-ci-robot]

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-62174, which is valid.

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.20.0) matches configured target version for branch (4.20.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
• release note type set to "Release Note Not Required"
• dependent bug Jira Issue OCPBUGS-58198 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
• dependent Jira Issue OCPBUGS-58198 targets the "4.21.0" version, which is one of the valid target versions: 4.21.0
• bug has dependents

Requesting review from QA contact:
/cc @sergiordlr

In response to this:

This is an automated cherry-pick of #5271

/assign isabella-janssen

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.

[djoshy]

/woof

/tide refresh

[openshift-ci]

@djoshy:

In response to this:

/woof

/tide 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 kubernetes-sigs/prow repository.

[djoshy]

/retest-required

[openshift-ci]

@openshift-cherrypick-robot: 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-azure-ovn-upgrade-out-of-change	b9b6993	link	false	/test e2e-azure-ovn-upgrade-out-of-change
ci/prow/e2e-gcp-mco-disruptive	b9b6993	link	false	/test e2e-gcp-mco-disruptive
ci/prow/e2e-agent-compact-ipv4	b9b6993	link	false	/test e2e-agent-compact-ipv4
ci/prow/e2e-aws-mco-disruptive	b9b6993	link	false	/test e2e-aws-mco-disruptive
ci/prow/e2e-aws-ovn-windows	b9b6993	link	false	/test e2e-aws-ovn-windows
ci/prow/e2e-gcp-op-ocl	b9b6993	link	false	/test e2e-gcp-op-ocl
ci/prow/e2e-aws-ovn-upgrade-out-of-change	b9b6993	link	false	/test e2e-aws-ovn-upgrade-out-of-change
ci/prow/bootstrap-unit	b9b6993	link	false	/test bootstrap-unit

Full PR test history. Your PR dashboard.

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.

[isabella-janssen]

/retest-required

[openshift-ci-robot]

@openshift-cherrypick-robot: Jira Issue OCPBUGS-62174: All pull requests linked via external trackers have merged:

• openshift/machine-config-operator#5307

This pull request has the verified-later tag and will need to be manually moved to VERIFIED after testing. Jira Issue OCPBUGS-62174 has been moved to the MODIFIED state.

In response to this:

This is an automated cherry-pick of #5271

/assign isabella-janssen

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]

Fix included in accepted release 4.20.0-0.nightly-2025-10-04-154645

[isabella-janssen]

/cherrypick release-4.19

[openshift-cherrypick-robot]

@isabella-janssen: new pull request created: #5336

In response to this:

/cherrypick release-4.19

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.