[release-4.20] OCPBUGS-59766: Update timing of MCN desired config spec update to align with node annotation setting

[isabella-janssen]

Closes: OCPBUGS-59766

- What I did
This is a manual backport of the bug fix included in the larger scoped PR #5282 into 4.21.

- How to verify it

1. Launch a 4.20 cluster with this PR build included.

launch 4.20,openshift/machine-config-operator#5367 aws

2. Apply a MachineConfig to trigger a node update. Track how the desired config is updated in the MCN's spec and status. The desired config value in the spec should update before the UpdatePrepared condition is True and before the desired config version is updated in the status.
   Example grep to see the necessary fields:

oc describe machineconfignode/<node-name> | grep -E "Config Version|UpdatePrepared" -A 2

- Description for the changelog
OCPBUGS-59766: Update timing of desired config version update in MCN to align with node annotation setting

[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

[openshift-ci-robot]

@isabella-janssen: This pull request references Jira Issue OCPBUGS-59766, 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-52302 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
• dependent Jira Issue OCPBUGS-52302 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

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

In response to this:

Closes: OCPBUGS-59766

- What I did
This is a manual backport of the bug fix included in the larger scoped PR #5282 into 4.21.

- How to verify it

1. Launch a 4.20 cluster with this PR build included.

launch 4.20,openshift/machine-config-operator# aws

2. Apply a MachineConfig to trigger a node update.
   Track how the desired config is updated in the MCN's spec and status. The desired config value in the spec should update before the UpdatePrepared condition is True and before the desired config version is updated in the status.
   Example grep to see the necessary fields:

oc describe machineconfignode/<node-name> | grep -E "Config Version|UpdatePrepared" -A 2

- Description for the changelog
OCPBUGS-59766: Update timing of desired config version update in MCN to align with node annotation setting

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-59766, 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-52302 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
• dependent Jira Issue OCPBUGS-52302 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:

Closes: OCPBUGS-59766

- What I did
This is a manual backport of the bug fix included in the larger scoped PR #5282 into 4.21.

- How to verify it

1. Launch a 4.20 cluster with this PR build included.

launch 4.20,openshift/machine-config-operator#5367 aws

2. Apply a MachineConfig to trigger a node update.
   Track how the desired config is updated in the MCN's spec and status. The desired config value in the spec should update before the UpdatePrepared condition is True and before the desired config version is updated in the status.
   Example grep to see the necessary fields:

oc describe machineconfignode/<node-name> | grep -E "Config Version|UpdatePrepared" -A 2

- Description for the changelog
OCPBUGS-59766: Update timing of desired config version update in MCN to align with node annotation setting

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]

/payload-job periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-serial-1of2 periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-serial-2of2 periodic-ci-openshift-release-master-ci-4.20-e2e-aws-ovn-techpreview-serial-1of3 periodic-ci-openshift-release-master-ci-4.20-e2e-aws-ovn-techpreview-serial-2of3 periodic-ci-openshift-release-master-ci-4.20-e2e-aws-ovn-techpreview-serial-3of3 periodic-ci-openshift-release-master-ci-4.20-e2e-aws-ovn-techpreview

[openshift-ci]

@isabella-janssen: trigger 6 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

• periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-serial-1of2
• periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-serial-2of2
• periodic-ci-openshift-release-master-ci-4.20-e2e-aws-ovn-techpreview-serial-1of3
• periodic-ci-openshift-release-master-ci-4.20-e2e-aws-ovn-techpreview-serial-2of3
• periodic-ci-openshift-release-master-ci-4.20-e2e-aws-ovn-techpreview-serial-3of3
• periodic-ci-openshift-release-master-ci-4.20-e2e-aws-ovn-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/34a011e0-ae8e-11f0-9317-ad3cb710f8e2-0

[isabella-janssen]

/retest-required

[sergiordlr]

Verified using IPI on AWS

We can see these values while applying the config.

spec:
  configVersion:
    desired: rendered-infra-9e5f80296f678a6a65254f1afd312983
...
    message: 'Action during update to rendered-infra-d88b2a316a685cc687783c5b9edc4740:
      Update Compatible. Post Cfg Actions: [] Drain Required: false'
    reason: UpdatePrepared
    status: "False"
    type: UpdatePrepared
...
  configVersion:
    current: rendered-infra-d88b2a316a685cc687783c5b9edc4740
    desired: rendered-infra-9e5f80296f678a6a65254f1afd312983

The spec.configVersion.desirec value is updated before the UpdatePrepared is set to True.

/label qe-approved
/label cherry-pick-approved
/verified by @sergiordlr

[openshift-ci-robot]

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

In response to this:

Verified using IPI on AWS

We can see these values while applying the config.

spec:
 configVersion:
   desired: rendered-infra-9e5f80296f678a6a65254f1afd312983
...
   message: 'Action during update to rendered-infra-d88b2a316a685cc687783c5b9edc4740:
     Update Compatible. Post Cfg Actions: [] Drain Required: false'
   reason: UpdatePrepared
   status: "False"
   type: UpdatePrepared
...
 configVersion:
   current: rendered-infra-d88b2a316a685cc687783c5b9edc4740
   desired: rendered-infra-9e5f80296f678a6a65254f1afd312983

The spec.configVersion.desirec value is updated before the UpdatePrepared is set to True.

/label qe-approved
/label cherry-pick-approved
/verified by @sergiordlr

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-59766, which is valid.

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 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-52302 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-52302 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:

Closes: OCPBUGS-59766

- What I did
This is a manual backport of the bug fix included in the larger scoped PR #5282 into 4.21.

- How to verify it

1. Launch a 4.20 cluster with this PR build included.

launch 4.20,openshift/machine-config-operator#5367 aws

2. Apply a MachineConfig to trigger a node update. Track how the desired config is updated in the MCN's spec and status. The desired config value in the spec should update before the UpdatePrepared condition is True and before the desired config version is updated in the status.
   Example grep to see the necessary fields:

oc describe machineconfignode/<node-name> | grep -E "Config Version|UpdatePrepared" -A 2

- Description for the changelog
OCPBUGS-59766: Update timing of desired config version update in MCN to align with node annotation setting

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.

[pablintino]

/lgtm
Clean manual cherry-pick

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

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

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

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

[isabella-janssen]

/label backport-risk-assessed

QE verified & passing related blocking tests.

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD b9dbf39 and 2 for PR HEAD bab0622 in total

[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/okd-scos-e2e-aws-ovn	bab0622	link	false	/test okd-scos-e2e-aws-ovn
ci/prow/bootstrap-unit	bab0622	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]

@isabella-janssen: Jira Issue Verification Checks: Jira Issue OCPBUGS-59766
✔️ 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-59766 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

In response to this:

Closes: OCPBUGS-59766

- What I did
This is a manual backport of the bug fix included in the larger scoped PR #5282 into 4.21.

- How to verify it

1. Launch a 4.20 cluster with this PR build included.

launch 4.20,openshift/machine-config-operator#5367 aws

2. Apply a MachineConfig to trigger a node update. Track how the desired config is updated in the MCN's spec and status. The desired config value in the spec should update before the UpdatePrepared condition is True and before the desired config version is updated in the status.
   Example grep to see the necessary fields:

oc describe machineconfignode/<node-name> | grep -E "Config Version|UpdatePrepared" -A 2

- Description for the changelog
OCPBUGS-59766: Update timing of desired config version update in MCN to align with node annotation setting

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]

/cherrypick release-4.19

[openshift-cherrypick-robot]

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

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.

[openshift-merge-robot]

Fix included in accepted release 4.20.0-0.nightly-2025-11-11-205214