Skip to content

Conversation

@isabella-janssen
Copy link
Member

@isabella-janssen isabella-janssen commented Jul 24, 2025

Closes: OCPBUGS-59766

- What I did
This moves the MCN spec update function, GenerateAndApplyMachineConfigNodeSpec into the node controller's update function so that the desired config version in the MCN is updated when the node annotation is updated.

- How to verify it

  1. Launch a 4.19 techpreview-enabled cluster with this PR build included.
launch 4.19,openshift/machine-config-operator#5189 aws,techpreview
  1. Apply a MachineConfig to trigger a node update.
  2. Track how the desired configs are 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: Fix timing of Spec.ConfigVersion.Desired update in MCN

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 24, 2025
@isabella-janssen isabella-janssen changed the base branch from main to release-4.19 July 24, 2025 14:01
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 24, 2025
@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 Jul 24, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 24, 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
Copy link
Contributor

openshift-ci bot commented Jul 24, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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:

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 Jul 24, 2025
@isabella-janssen
Copy link
Member Author

/jira cherry-pick OCPBUGS-52302

@openshift-ci-robot
Copy link
Contributor

@isabella-janssen: Jira Issue OCPBUGS-52302 has been cloned as Jira Issue OCPBUGS-59766. Will retitle bug to link to clone.
/retitle OCPBUGS-59766: Fix timing of Spec.ConfigVersion.Desired update in MCN

Details

In response to this:

/jira cherry-pick OCPBUGS-52302

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 openshift-ci bot changed the title Fix timing of Spec.ConfigVersion.Desired update in MCN OCPBUGS-59766: Fix timing of Spec.ConfigVersion.Desired update in MCN Jul 24, 2025
@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. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Jul 24, 2025
@openshift-ci-robot
Copy link
Contributor

@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.19.z) matches configured target version for branch (4.19.z)
  • 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 (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-52302 targets the "4.20.0" version, which is one of the valid target versions: 4.20.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.

Details

In response to this:

Closes: OCPBUGS-XXXXX

- What I did
This moves the MCN spec update function, GenerateAndApplyMachineConfigNodeSpec into the node controller's update function so that the desired config version in the MCN is updated when the node annotation is updated.

- How to verify it

  1. Launch a 4.20 cluster with this PR build included.
launch 4.20,openshift/machine-config-operator#5121 aws
  1. Apply a MachineConfig to trigger a node update.
  2. Track how the desired configs are 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-52302: Fix timing of Spec.ConfigVersion.Desired update in MCN

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

@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.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-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.20.0" version, which is one of the valid target versions: 4.20.0
  • bug has dependents

Requesting review from QA contact:
/cc @sergiordlr

Details

In response to this:

Closes: OCPBUGS-59766

- What I did
This moves the MCN spec update function, GenerateAndApplyMachineConfigNodeSpec into the node controller's update function so that the desired config version in the MCN is updated when the node annotation is updated.

- How to verify it

  1. Launch a 4.19 techpreview-enabled cluster with this PR build included.
launch 4.19,openshift/machine-config-operator#5189 aws,techpreview
  1. Apply a MachineConfig to trigger a node update.
  2. Track how the desired configs are 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: Fix timing of Spec.ConfigVersion.Desired update in MCN

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 openshift-ci bot requested a review from sergiordlr July 24, 2025 14:12
@isabella-janssen isabella-janssen changed the title OCPBUGS-59766: Fix timing of Spec.ConfigVersion.Desired update in MCN [release-4.19] OCPBUGS-59766: Fix timing of Spec.ConfigVersion.Desired update in MCN Jul 24, 2025
@isabella-janssen
Copy link
Member Author

/test all

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 24, 2025

@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-ocl f8089bb link false /test e2e-gcp-op-ocl
ci/prow/e2e-aws-ovn f8089bb link true /test e2e-aws-ovn
ci/prow/okd-e2e-aws f8089bb link false /test okd-e2e-aws
ci/prow/okd-images f8089bb link true /test okd-images
ci/prow/e2e-azure-ovn-upgrade-out-of-change f8089bb link false /test e2e-azure-ovn-upgrade-out-of-change
ci/prow/okd-e2e-gcp-op f8089bb link false /test okd-e2e-gcp-op
ci/prow/e2e-aws-serial f8089bb link false /test e2e-aws-serial
ci/prow/okd-e2e-upgrade f8089bb link false /test okd-e2e-upgrade
ci/prow/okd-e2e-vsphere f8089bb link false /test okd-e2e-vsphere
ci/prow/e2e-azure-ovn-upgrade f8089bb link false /test e2e-azure-ovn-upgrade

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

/close

Closing since #5121 was reverted (see #5190) and this will need to be reworked.

@openshift-ci openshift-ci bot closed this Jul 28, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 28, 2025

@isabella-janssen: Closed this PR.

Details

In response to this:

/close

Closing since #5121 was reverted (see #5190) and this will need to be reworked.

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-ci-robot
Copy link
Contributor

@isabella-janssen: This pull request references Jira Issue OCPBUGS-59766. The bug has been updated to no longer refer to the pull request using the external bug tracker. All external bug links have been closed. The bug has been moved to the NEW state.

Details

In response to this:

Closes: OCPBUGS-59766

- What I did
This moves the MCN spec update function, GenerateAndApplyMachineConfigNodeSpec into the node controller's update function so that the desired config version in the MCN is updated when the node annotation is updated.

- How to verify it

  1. Launch a 4.19 techpreview-enabled cluster with this PR build included.
launch 4.19,openshift/machine-config-operator#5189 aws,techpreview
  1. Apply a MachineConfig to trigger a node update.
  2. Track how the desired configs are 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: Fix timing of Spec.ConfigVersion.Desired update in MCN

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 4.19-ocpbugs-52302 branch October 17, 2025 12:27
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. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants