Skip to content

OCPBUGS-59958: Remove cleanUpDuplicatedMC call in node.config handling#5681

Open
yuqi-zhang wants to merge 1 commit into
openshift:mainfrom
yuqi-zhang:remove-duplication-deletion
Open

OCPBUGS-59958: Remove cleanUpDuplicatedMC call in node.config handling#5681
yuqi-zhang wants to merge 1 commit into
openshift:mainfrom
yuqi-zhang:remove-duplication-deletion

Conversation

@yuqi-zhang

Copy link
Copy Markdown
Contributor

This function was originally intended to remove duplicate MCs that somehow was no longer tracked by the controller. I don't think it should be used in general, and this removal here was causing the controller to be confused and deleting valid 97-POOL-generated-kubeletconfig machineconfig objects, since the new controller hasn't yet had a chance to sync and stamp its controller version, causing multiple reboots.

Looks like we did this change in
#3563 (comment), and the behaviour seems to have changed since then, so I would expect this to be a safe change as the cgroups config is always being generated now. I would lean towards removing cleanUpDuplicatedMC entirely, but based on the comment, it looks like it is catching some unmanaged MC scenarios (e.g. deletion of a custom MCP), so will not do that for a backporting fix until we can sort that out. Note that 97-generated only applies for master/worker/arbiter pools, so I think that shouldn't be a problem.

cc @sairameshv in case I am missing something from the original context

This function was originally intended to remove duplicate MCs that
somehow was no longer tracked by the controller. I don't think it should
be used in general, and this removal here was causing the controller to be
confused and deleting valid 97-POOL-generated-kubeletconfig
machineconfig objects, since the new controller hasn't yet had a chance
to sync and stamp its controller version, causing multiple reboots.

Looks like we did this change in
openshift#3563 (comment),
and the behaviour seems to have changed since then, so I would expect
this to be a safe change as the cgroups config is always being generated
now. I would lean towards removing cleanUpDuplicatedMC entirely, but
based on the comment, it looks like it is catching some unmanaged MC
scenarios (e.g. deletion of a custom MCP), so will not do that for a
backporting fix until we can sort that out. Note that 97-generated only
applies for master/worker/arbiter pools, so I think that shouldn't be a
problem.
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important 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 Feb 19, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@yuqi-zhang: This pull request references Jira Issue OCPBUGS-59958, 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.22.0) matches configured target version for branch (4.22.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @lyman9966

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

Details

In response to this:

This function was originally intended to remove duplicate MCs that somehow was no longer tracked by the controller. I don't think it should be used in general, and this removal here was causing the controller to be confused and deleting valid 97-POOL-generated-kubeletconfig machineconfig objects, since the new controller hasn't yet had a chance to sync and stamp its controller version, causing multiple reboots.

Looks like we did this change in
#3563 (comment), and the behaviour seems to have changed since then, so I would expect this to be a safe change as the cgroups config is always being generated now. I would lean towards removing cleanUpDuplicatedMC entirely, but based on the comment, it looks like it is catching some unmanaged MC scenarios (e.g. deletion of a custom MCP), so will not do that for a backporting fix until we can sort that out. Note that 97-generated only applies for master/worker/arbiter pools, so I think that shouldn't be a problem.

cc @sairameshv in case I am missing something from the original context

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 19, 2026

@sairameshv sairameshv left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks
/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Feb 23, 2026
@openshift-ci

openshift-ci Bot commented Feb 23, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sairameshv, yuqi-zhang

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

@yuqi-zhang

Copy link
Copy Markdown
Contributor Author

/hold

Will fix up the tests

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 23, 2026
@openshift-ci

openshift-ci Bot commented Feb 25, 2026

Copy link
Copy Markdown
Contributor

@yuqi-zhang: 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 9b26b13 link true /test e2e-gcp-op-single-node
ci/prow/unit 9b26b13 link true /test unit
ci/prow/e2e-gcp-op-2of2 9b26b13 link true /test e2e-gcp-op-2of2
ci/prow/e2e-gcp-op-part2 9b26b13 link true /test e2e-gcp-op-part2

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.

@openshift-bot

Copy link
Copy Markdown
Contributor

/jira refresh

The requirements for Jira bugs have changed (Jira issues linked to PRs on main branch need to target different OCP), recalculating validity.

@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@openshift-bot: This pull request references Jira Issue OCPBUGS-59958, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.22.0) matches configured target version for branch (4.22.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @asahay19

Details

In response to this:

/jira refresh

The requirements for Jira bugs have changed (Jira issues linked to PRs on main branch need to target different OCP), recalculating validity.

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.

@proietfb

Copy link
Copy Markdown
Member

@yuqi-zhang given that #6201 has been merged I'd close this PR. What do you think about?

@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 29, 2026
@openshift-ci

openshift-ci Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

PR needs rebase.

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.

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/hold Indicates that a PR should not merge because someone has issued a /hold command. jira/severity-important Referenced Jira bug's severity is important 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. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants