OCPBUGS-38869: Update desired config in MCN on OCL update

[isabella-janssen]

Closes: OCPBUGS-38869

- What I did
This adds an MCN spec update during the OCL update flow to ensure the desired config version is properly set when OCL is enabled.

- How to verify it

1. Create a cluster and enable OCL.
2. Apply an MC targeting the MCP with OCL enabled.
3. Watch the MCN objects during the MC application.
   • The DESIREDCONFIG column in the oc get machineconfignode output should update properly.
   • The spec.configVersion.desired value in the oc describe machineconfignode/<node-name> output should update properly.

- Description for the changelog
OCPBUGS-38869: Update desired config in MCN on OCL update

[openshift-ci-robot]

@isabella-janssen: This pull request references Jira Issue OCPBUGS-38869, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.19.0) matches configured target version for branch (4.19.0)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

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

Details

In response to this:

Closes: OCPBUGS-38869

- What I did
This adds an MCN spec update during the OCL update flow to ensure the desired config version is properly set when OCL is enabled.

- How to verify it

1. Create a cluster and enable OCL.
2. Apply an MC targeting the MCP with OCL enabled.
3. Watch the MCN objects during the MC application.

• The DESIREDCONFIG column in the oc get machineconfignode output should update properly.
• The spec.configVersion.desired value in the oc describe machineconfignode/<node-name> output should update properly.

- Description for the changelog
OCPBUGS-38869: Update desired config in MCN on OCL update

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]

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]

/retest-required

[sergiordlr]

Verified using IPI on AWS

1. Enable OCL in master and worker pools
2. Wait until the OCL images are applied
3. Check that the machineconfignode resources are reporting the right values for desiredConfig and currentConfig
4. Apply a MC to deploy a dummy test file in master and worker pools
5. Check that the machineconfignode resoures are reporting the right values for desiredConffig and currentConfig

/label qe-approved

[openshift-ci-robot]

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

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.19.0) matches configured target version for branch (4.19.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

Details

In response to this:

Closes: OCPBUGS-38869

- What I did
This adds an MCN spec update during the OCL update flow to ensure the desired config version is properly set when OCL is enabled.

- How to verify it

1. Create a cluster and enable OCL.
2. Apply an MC targeting the MCP with OCL enabled.
3. Watch the MCN objects during the MC application.

• The DESIREDCONFIG column in the oc get machineconfignode output should update properly.
• The spec.configVersion.desired value in the oc describe machineconfignode/<node-name> output should update properly.

- Description for the changelog
OCPBUGS-38869: Update desired config in MCN on OCL update

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

[pablintino]

Looks good to me, but given my limited experience in this field I wouldn't trust my review.

[djoshy]

/lgtm

/retest-required

[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

[isabella-janssen]

/label acknowledge-critical-fixes-only

Minor bug fix specific to the MCN functionality; should not have an impact on any core functionality.

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD 06f8288 and 2 for PR HEAD 765b7b8 in total

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD f46921d and 1 for PR HEAD 765b7b8 in total

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD f46921d and 2 for PR HEAD 765b7b8 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	765b7b8	link	false	/test okd-scos-e2e-aws-ovn
ci/prow/e2e-azure-ovn-upgrade-out-of-change	765b7b8	link	false	/test e2e-azure-ovn-upgrade-out-of-change
ci/prow/e2e-gcp-op-ocl	765b7b8	link	false	/test e2e-gcp-op-ocl
ci/prow/e2e-gcp-op-techpreview	765b7b8	link	false	/test e2e-gcp-op-techpreview

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]

/retest-required

[openshift-ci-robot]

@isabella-janssen: Jira Issue OCPBUGS-38869: All pull requests linked via external trackers have merged:

• openshift/machine-config-operator#4922

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

Details

In response to this:

Closes: OCPBUGS-38869

- What I did
This adds an MCN spec update during the OCL update flow to ensure the desired config version is properly set when OCL is enabled.

- How to verify it

1. Create a cluster and enable OCL.
2. Apply an MC targeting the MCP with OCL enabled.
3. Watch the MCN objects during the MC application.

• The DESIREDCONFIG column in the oc get machineconfignode output should update properly.
• The spec.configVersion.desired value in the oc describe machineconfignode/<node-name> output should update properly.

- Description for the changelog
OCPBUGS-38869: Update desired config in MCN on OCL update

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-bot]

[ART PR BUILD NOTIFIER]

Distgit: ose-machine-config-operator
This PR has been included in build ose-machine-config-operator-container-v4.19.0-202504011355.p0.g9026ff2.assembly.stream.el9.
All builds following this will include this PR.

[isabella-janssen]

/cherry-pick release-4.18

[openshift-cherrypick-robot]

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

Details

In response to this:

/cherry-pick release-4.18

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.