Skip to content

[release-1.12] 🐛 fix: use MachineSet template values in completeMoveMachine for in-place updates #13085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Dec 1, 2025
Merged

[release-1.12] 🐛 fix: use MachineSet template values in completeMoveMachine for in-place updates #13085

merged 2 commits into from
Dec 1, 2025
+186 −2

Conversation

@k8s-infra-cherrypick-robot
Copy link

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot commented Nov 30, 2025

This is an automated cherry-pick of #13059

/assign fabriziopandini

@liuxu623
fix: use MachineSet template values in completeMoveMachine for in-pla…
78625ee 
…ce updates

Previously, the completeMoveMachine function incorrectly used the current
Machine's Version and FailureDomain values when performing in-place updates.
This caused the Machine to retain its old values instead of being updated to
the latest values from the MachineSet spec template.

This fix ensures that during in-place updates, the Machine is updated with
the correct Version and FailureDomain values from the MachineSet template
spec rather than preserving the old Machine values.

Changes:
- Update completeMoveMachine to use s.machineSet.Spec.Template.Spec.Version
  instead of currentMachine.Spec.Version
- Update completeMoveMachine to use s.machineSet.Spec.Template.Spec.FailureDomain
  instead of currentMachine.Spec.FailureDomain
- Add TestReconciler_completeMoveMachine unit test to verify the fix
@liuxu623
test: Add test coverage for version and failureDomain in triggerInPla…
f00183e 
…ceUpdate
@k8s-ci-robot k8s-ci-robot added this to the v1.12 milestone Nov 30, 2025
@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Nov 30, 2025
Merged
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 30, 2025
@k8s-ci-robot k8s-ci-robot added do-not-merge/needs-area PR is missing an area label size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 30, 2025
@fabriziopandini
Copy link
Member

fabriziopandini commented Nov 30, 2025

/test

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Nov 30, 2025

@fabriziopandini: The /test command needs one or more targets.
The following commands are available to trigger required jobs:

/test pull-cluster-api-build-release-1-12

/test pull-cluster-api-e2e-blocking-release-1-12

/test pull-cluster-api-e2e-conformance-ci-latest-release-1-12

/test pull-cluster-api-e2e-conformance-release-1-12

/test pull-cluster-api-e2e-mink8s-release-1-12

/test pull-cluster-api-e2e-release-1-12

/test pull-cluster-api-e2e-upgrade-1-34-1-35-release-1-12

/test pull-cluster-api-test-mink8s-release-1-12

/test pull-cluster-api-test-release-1-12

/test pull-cluster-api-verify-release-1-12

The following commands are available to trigger optional jobs:

/test pull-cluster-api-apidiff-release-1-12

Use /test all to run the following jobs that were automatically triggered:

pull-cluster-api-apidiff-release-1-12

pull-cluster-api-build-release-1-12

pull-cluster-api-e2e-blocking-release-1-12

pull-cluster-api-test-release-1-12

pull-cluster-api-verify-release-1-12

In response to this:

/test

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.

@fabriziopandini
Copy link
Member

fabriziopandini commented Nov 30, 2025

/test pull-cluster-api-e2e-release-1-12

@fabriziopandini
Copy link
Member

fabriziopandini commented Nov 30, 2025

/area machine set

@k8s-ci-robot k8s-ci-robot added the area/machine Issues or PRs related to machine lifecycle management label Nov 30, 2025
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Nov 30, 2025

@fabriziopandini: The label(s) area/set cannot be applied, because the repository doesn't have them.

In response to this:

/area machine set

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.

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/needs-area PR is missing an area label label Nov 30, 2025
@fabriziopandini
Copy link
Member

fabriziopandini commented Nov 30, 2025

/area machineset

@k8s-ci-robot k8s-ci-robot added the area/machineset Issues or PRs related to machinesets label Nov 30, 2025
@fabriziopandini
Copy link
Member

fabriziopandini commented Nov 30, 2025

/test pull-cluster-api-e2e-release-1-12

1 similar comment
@fabriziopandini
Copy link
Member

fabriziopandini commented Nov 30, 2025

/test pull-cluster-api-e2e-release-1-12

@fabriziopandini
Copy link
Member

fabriziopandini commented Dec 1, 2025

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 1, 2025
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Dec 1, 2025

LGTM label has been added.

Git tree hash: cfd01757dabc593052b08ee838cfa33d987cfd56

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Dec 1, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 1, 2025
@k8s-ci-robot k8s-ci-robot merged commit 23a2611 into kubernetes-sigs:release-1.12 Dec 1, 2025
22 of 23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sivchari sivchari Awaiting requested review from sivchari

@vincepri vincepri Awaiting requested review from vincepri

Assignees

@fabriziopandini fabriziopandini

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/machine Issues or PRs related to machine lifecycle management area/machineset Issues or PRs related to machinesets cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Milestone

v1.12

Development

Successfully merging this pull request may close these issues.

4 participants

@k8s-infra-cherrypick-robot @fabriziopandini @k8s-ci-robot @liuxu623