Skip to content

Conversation

@isabella-janssen
Copy link
Member

Closes: OCPBUGS-54463

- 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 openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 2, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 2, 2025

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 openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels May 2, 2025
@openshift-ci-robot
Copy link
Contributor

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

  • expected the bug to target either version "4.20." or "openshift-4.20.", but it targets "4.18.z" 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.

Details

In response to this:

Closes: OCPBUGS-54463

- 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-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label May 2, 2025
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 2, 2025
@isabella-janssen isabella-janssen changed the base branch from main to release-4.18 May 2, 2025 15:17
@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels May 2, 2025
@openshift-ci-robot
Copy link
Contributor

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

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.18.z) matches configured target version for branch (4.18.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-38869 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-38869 targets the "4.19.0" version, which is one of the valid target versions: 4.19.0
  • bug has dependents

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-54463

- 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-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 2, 2025
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 2, 2025
@isabella-janssen isabella-janssen marked this pull request as ready for review May 28, 2025 13:47
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 28, 2025
@openshift-ci openshift-ci bot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 29, 2025
@isabella-janssen isabella-janssen force-pushed the ocpbugs-54463 branch 2 times, most recently from 552879f to da1b5cd Compare May 29, 2025 17:26
@sergiordlr
Copy link
Contributor

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jun 13, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 20, 2025

@isabella-janssen: The following test 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 8943915 link false /test e2e-azure-ovn-upgrade-out-of-change

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
Copy link
Member Author

/retest-required

@djoshy
Copy link
Contributor

djoshy commented Jun 24, 2025

/lgtm

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jun 24, 2025
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 24, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 24, 2025

[APPROVALNOTIFIER] This PR is APPROVED

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

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:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 24, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 74df36f into openshift:release-4.18 Jun 24, 2025
18 of 19 checks passed
@openshift-ci-robot
Copy link
Contributor

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

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

Details

In response to this:

Closes: OCPBUGS-54463

- 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 isabella-janssen deleted the ocpbugs-54463 branch June 24, 2025 18:58
@isabella-janssen
Copy link
Member Author

/cherry-pick release-4.17

@openshift-cherrypick-robot

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

Details

In response to this:

/cherry-pick release-4.17

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-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

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

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.18.0-0.nightly-2025-06-25-015700

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.