Skip to content

Conversation

@isabella-janssen
Copy link
Member

@isabella-janssen isabella-janssen commented Nov 17, 2025

Closes: OCPBUGS-64825

- What I did
This adds a MachineConfigNode informer in the node controller so that changes to a node's MCN trigger syncs of the MachineConfigPool machine counts. This change is necessary with the introduction of #5141, which calculates the updated and degraded machine counts with MCN conditions instead of node annotations.

- How to verify it
This can be tested locally by launching a 4.21 tech preview cluster with this PR included. It can also be tested by ensuring that all existing MachineConfigNode and ImageModeStatusReporting pass--specifically the Should properly report MCN conditions on node degrade test mentioned in the attached bug.

- Description for the changelog
OCPBUGS-64825: Add MachineConfigNode informer to trigger MCP machine count syncs

@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 Nov 17, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 17, 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 Nov 17, 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

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

/payload-job periodic-ci-openshift-machine-config-operator-release-4.21-periodics-e2e-aws-mco-disruptive-techpreview-1of2 periodic-ci-openshift-machine-config-operator-release-4.21-periodics-e2e-aws-mco-disruptive-techpreview-2of2 periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-1of3 periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-2of3 periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-3of3

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 18, 2025

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

  • periodic-ci-openshift-machine-config-operator-release-4.21-periodics-e2e-aws-mco-disruptive-techpreview-1of2
  • periodic-ci-openshift-machine-config-operator-release-4.21-periodics-e2e-aws-mco-disruptive-techpreview-2of2
  • periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-1of3
  • periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-2of3
  • periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-3of3

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/1a8c0660-c4be-11f0-8d30-0331b62d98be-0

@isabella-janssen
Copy link
Member Author

/payload-job periodic-ci-openshift-machine-config-operator-release-4.21-periodics-e2e-aws-mco-disruptive-techpreview-1of2 periodic-ci-openshift-machine-config-operator-release-4.21-periodics-e2e-aws-mco-disruptive-techpreview-2of2 periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-1of3 periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-2of3 periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-3of3

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 19, 2025

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

  • periodic-ci-openshift-machine-config-operator-release-4.21-periodics-e2e-aws-mco-disruptive-techpreview-1of2
  • periodic-ci-openshift-machine-config-operator-release-4.21-periodics-e2e-aws-mco-disruptive-techpreview-2of2
  • periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-1of3
  • periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-2of3
  • periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-3of3

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/c463a790-c556-11f0-8f5e-89314842e1fc-0

@isabella-janssen isabella-janssen force-pushed the ocpbugs-64825 branch 2 times, most recently from 768b0fc to df7c4e1 Compare November 19, 2025 15:42
@isabella-janssen
Copy link
Member Author

/payload-job periodic-ci-openshift-machine-config-operator-release-4.21-periodics-e2e-aws-mco-disruptive-techpreview-1of2 periodic-ci-openshift-machine-config-operator-release-4.21-periodics-e2e-aws-mco-disruptive-techpreview-2of2 periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-1of3 periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-2of3 periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-3of3

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 19, 2025

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

  • periodic-ci-openshift-machine-config-operator-release-4.21-periodics-e2e-aws-mco-disruptive-techpreview-1of2
  • periodic-ci-openshift-machine-config-operator-release-4.21-periodics-e2e-aws-mco-disruptive-techpreview-2of2
  • periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-1of3
  • periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-2of3
  • periodic-ci-openshift-release-master-ci-4.21-e2e-aws-ovn-techpreview-serial-3of3

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/f4ffb360-c571-11f0-80ff-b3f773b50dbd-0

@isabella-janssen isabella-janssen changed the title WIP OCPBUGS-64825: Add MachineConfigNode informer to trigger MCP machine count syncs Nov 19, 2025
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Nov 19, 2025
@openshift-ci-robot
Copy link
Contributor

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

  • expected the bug to target the "4.21.0" version, but no target version was set

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.

In response to this:

Closes: OCPBUGS-64825

- What I did
This adds a MachineConfigNode informer in the node controller so that changes to a node's MCN trigger syncs of the MachineConfigPool machine counts. This change is necessary with the introduction of #5141, which calculates the updated and degraded machine counts with MCN conditions instead of node annotations.

- How to verify it
This can be tested locally by launching a 4.21 tech preview cluster with this PR included. It can also be tested by ensuring that all existing MachineConfigNode and ImageModeStatusReporting pass--specifically the Should properly report MCN conditions on node degrade test mentioned in the attached bug.

- Description for the changelog
OCPBUGS-64825: Add MachineConfigNode informer to trigger MCP machine count syncs

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

/jira refresh

@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 Nov 19, 2025
@openshift-ci-robot
Copy link
Contributor

@isabella-janssen: This pull request references Jira Issue OCPBUGS-64825, 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.21.0) matches configured target version for branch (4.21.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sergiordlr

In response to this:

/jira refresh

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 November 19, 2025 19:00
@isabella-janssen isabella-janssen marked this pull request as ready for review November 19, 2025 20:52
@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 Nov 19, 2025
Copy link
Contributor

@djoshy djoshy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally looks good, would adding unit test(s) for this case be viable?

@isabella-janssen
Copy link
Member Author

Generally looks good, would adding unit test(s) for this case be viable?

@djoshy I was considering adding unit tests but did not for two reasons:

  1. The Should properly report MCN conditions on node degrade regression test makes sure the MCP reacts to degrade corrections and the MachineConfigPool machine counts should transition correctly on an update in a default MCP and MachineConfigPool machine counts should transition when OCB is enabled in a default MCP regression tests make sure the MCP reacts during standard updates.
  2. The informers "reacting" only reflects if it's working in tech preview and I'm not sure we can distinguish test cases based on tech preview feature gates?

I think unit tests would be a good idea because signal from (1) takes a lot longer than the feedback from unit tests, but I'd need to better understand how to handle feature gate "enablement" in unit tests to remediate (2). Do you have an example that would help solve (2)?

@djoshy
Copy link
Contributor

djoshy commented Nov 25, 2025

The informers "reacting" only reflects if it's working in tech preview and I'm not sure we can distinguish test cases based on tech preview feature gates?

We have a few unit tests that initializes controllers with feature gates enabled. I don't think we need to necessarily try to test the informer reaction since that's pretty standard(although that would be great if we want to add a general unit test for the syncs), I was thinking something more surgical in TestCalculateStatus or so to cover MCN edge cases such as these(plus the regular "happy" path cases). These checks/counts are becoming quite nuanced so I worry about not having an immediate signal until our CR goes red.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 26, 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/verify 6e1f8ab link true /test verify
ci/prow/bootstrap-unit 6e1f8ab link false /test bootstrap-unit
ci/prow/e2e-gcp-op-single-node 6e1f8ab link true /test e2e-gcp-op-single-node

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.

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