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

[isabella-janssen]

This is a manual cherry-pick of #5367 because the automated cherry-pick was resulting in build failures in the CI test runs.

[openshift-ci-robot]

@isabella-janssen: This pull request references Jira Issue OCPBUGS-64922, which is valid.

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.19.z) matches configured target version for branch (4.19.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-59766 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-59766 targets the "4.20.z" version, which is one of the valid target versions: 4.20.0, 4.20.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:

This is a manual cherry-pick of #5367 because the automated cherry-pick was resulting in build failures in the CI test runs.

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]

/test unit

[ptalgulk01]

Pre-merge tested:

Environment Setup
OpenShift Version: 4.19.0-0-2025-11-25-072418-test-ci-ln-ictyfb2-latest
Platform: AWS

Steps:

• Apply any MC

MC Template

$ oc create -f - << EOF
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
metadata:
  labels:
    machineconfiguration.openshift.io/role: worker
  name: test-file
spec:
  config:
    ignition:
      version: 3.4.0
    storage:
      files:
      - contents:
          source: data:text/plain;charset=utf-8;base64,dGVzdA==
        filesystem: root
        mode: 420
        path: /etc/test-file.test
EOF
machineconfig.machineconfiguration.openshift.io/test-file created

- Check the MCN update - During update

$ oc describe machineconfignode ip-10-0-72-244.ec2.internal | grep -E "Config Version|UpdatePrepared" -A 2
  Config Version:
    Desired:  rendered-worker-e0be4e6d0110c62a60651bf9764d3304
  Node:
--
    Reason:                UpdatePrepared
    Status:                True
    Type:                  UpdatePrepared
    Last Transition Time:  2025-11-25T09:30:37Z
    Message:               Updated the Files and OS on disk as a part of the in progress phase
--
  Config Version:
    Current:            rendered-worker-4d4f56422c551acab421a91c38dfae93
    Desired:            rendered-worker-e0be4e6d0110c62a60651bf9764d3304

- After Update

oc describe machineconfignode ip-10-0-72-244.ec2.internal | grep -E "Config Version|UpdatePrepared" -A 2
  Config Version:
    Desired:  rendered-worker-e0be4e6d0110c62a60651bf9764d3304
  Node:
--
    Reason:                UpdatePrepared
    Status:                False
    Type:                  UpdatePrepared
    Last Transition Time:  2025-11-25T09:31:45Z
    Message:               Action during update to rendered-worker-e0be4e6d0110c62a60651bf9764d3304: Updated the Files and OS on disk as a part of the in progress phase
--
  Config Version:
    Current:            rendered-worker-e0be4e6d0110c62a60651bf9764d3304
    Desired:            rendered-worker-e0be4e6d0110c62a60651bf9764d3304

- Able to see the status.configVersion.desired updated as soon as spec.configVersion.desired is updated.

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

[openshift-ci-robot]

@isabella-janssen: This pull request references Jira Issue OCPBUGS-64922, which is valid.

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.19.z) matches configured target version for branch (4.19.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-59766 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-59766 targets the "4.20.z" version, which is one of the valid target versions: 4.20.0, 4.20.z
• bug has dependents

Requesting review from QA contact:
/cc @sergiordlr

Details

In response to this:

This is a manual cherry-pick of #5367 because the automated cherry-pick was resulting in build failures in the CI test runs.

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]

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

Details

In response to this:

Pre-merge tested:

Environment Setup
OpenShift Version: 4.19.0-0-2025-11-25-072418-test-ci-ln-ictyfb2-latest
Platform: AWS

Steps:

• Apply any MC

MC Template

$ oc create -f - << EOF
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
metadata:
 labels:
   machineconfiguration.openshift.io/role: worker
 name: test-file
spec:
 config:
   ignition:
     version: 3.4.0
   storage:
     files:
     - contents:
         source: data:text/plain;charset=utf-8;base64,dGVzdA==
       filesystem: root
       mode: 420
       path: /etc/test-file.test
EOF
machineconfig.machineconfiguration.openshift.io/test-file created

- Check the MCN update - During update

$ oc describe machineconfignode ip-10-0-72-244.ec2.internal | grep -E "Config Version|UpdatePrepared" -A 2
 Config Version:
   Desired:  rendered-worker-e0be4e6d0110c62a60651bf9764d3304
 Node:
--
   Reason:                UpdatePrepared
   Status:                True
   Type:                  UpdatePrepared
   Last Transition Time:  2025-11-25T09:30:37Z
   Message:               Updated the Files and OS on disk as a part of the in progress phase
--
 Config Version:
   Current:            rendered-worker-4d4f56422c551acab421a91c38dfae93
   Desired:            rendered-worker-e0be4e6d0110c62a60651bf9764d3304

- After Update

oc describe machineconfignode ip-10-0-72-244.ec2.internal | grep -E "Config Version|UpdatePrepared" -A 2
 Config Version:
   Desired:  rendered-worker-e0be4e6d0110c62a60651bf9764d3304
 Node:
--
   Reason:                UpdatePrepared
   Status:                False
   Type:                  UpdatePrepared
   Last Transition Time:  2025-11-25T09:31:45Z
   Message:               Action during update to rendered-worker-e0be4e6d0110c62a60651bf9764d3304: Updated the Files and OS on disk as a part of the in progress phase
--
 Config Version:
   Current:            rendered-worker-e0be4e6d0110c62a60651bf9764d3304
   Desired:            rendered-worker-e0be4e6d0110c62a60651bf9764d3304

- Able to see the status.configVersion.desired updated as soon as spec.configVersion.desired is updated.

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

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]

/lgtm

/label backport-risk-assessed

[djoshy]

hmm actually, it seems like the units constructor calls might need some tweaking as well 😓

[isabella-janssen]

/test unit

Units seem to be passing on my end, so I'm trying them again here.

[isabella-janssen]

/test unit

[isabella-janssen]

/test unit

[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-single-node	c77dd73	link	true	/test e2e-gcp-op-single-node
ci/prow/unit	c77dd73	link	true	/test unit

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.

[isabella-janssen]

/test unit

Units are passing locally :(

[isabella-janssen]

/verified by @ptalgulk01

See verification here. The only change since that verification was a minor fix to the unit tests, which does not impact the added functionality.

[openshift-ci-robot]

@isabella-janssen: This PR has been marked as verified by @ptalgulk01.

Details

In response to this:

/verified by @ptalgulk01

See verification here. The only change since that verification was a minor fix to the unit tests, which does not impact the added functionality.

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-ci-4.19-e2e-aws-ovn-techpreview periodic-ci-openshift-release-master-ci-4.19-e2e-aws-ovn-techpreview-serial

Just double checking that this change doesn't push any thresholds over their limits in the blocking suites with MCN tests.

[openshift-ci]

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

• periodic-ci-openshift-release-master-ci-4.19-e2e-aws-ovn-techpreview
• periodic-ci-openshift-release-master-ci-4.19-e2e-aws-ovn-techpreview-serial

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/c282dc90-cadb-11f0-9022-bebc93c5d505-0

[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

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD 8917be0 and 2 for PR HEAD f009b5e in total

[openshift-ci-robot]

@isabella-janssen: Jira Issue Verification Checks: Jira Issue OCPBUGS-64922
✔️ 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-64922 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 a manual cherry-pick of #5367 because the automated cherry-pick was resulting in build failures in the CI test runs.

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.