Skip to content

[release-1.12] 🐛 MachineSet/KCP: Preserve existing object names for backward compatibility with pre-v1.7 in-place updates#13147

Merged
k8s-ci-robot merged 1 commit intokubernetes-sigs:release-1.12from
k8s-infra-cherrypick-robot:cherry-pick-13124-to-release-1.12
Dec 12, 2025
Merged

[release-1.12] 🐛 MachineSet/KCP: Preserve existing object names for backward compatibility with pre-v1.7 in-place updates#13147
k8s-ci-robot merged 1 commit intokubernetes-sigs:release-1.12from
k8s-infra-cherrypick-robot:cherry-pick-13124-to-release-1.12

Conversation

@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

This is an automated cherry-pick of #13124

/assign fabriziopandini

…lity with pre-v1.7 in-place updates

Prior to Cluster API v1.7, infraMachine and bootstrapConfig objects created by MachineSet and KubeadmControlPlane could have names that differed from their associated Machine names. Starting from v1.7 (kubernetes-sigs#9833), these objects consistently use the Machines name.

When performing in-place updates on Machines created before v1.7, we must preserve the existing infraMachine and bootstrapConfig names to avoid breaking associations with existing infrastructure resources.

This commit ensures backward compatibility by preserving existing bootstrapConfig names in computeDesiredBootstrapConfig and existing infraMachine names in computeDesiredInfraMachine.
@k8s-ci-robot k8s-ci-robot added this to the v1.12 milestone Dec 12, 2025
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-area PR is missing an area label size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 12, 2025
@fabriziopandini
Copy link
Copy Markdown
Member

/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 12, 2025
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

LGTM label has been added.

DetailsGit tree hash: 779737080a74f826472984f994e4df943a787a91

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[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

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

@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 12, 2025
@fabriziopandini
Copy link
Copy Markdown
Member

/area machineset
/area provider/control-plane-kubeadm

@k8s-ci-robot k8s-ci-robot added area/machineset Issues or PRs related to machinesets area/provider/control-plane-kubeadm Issues or PRs related to KCP and removed do-not-merge/needs-area PR is missing an area label labels Dec 12, 2025
@k8s-ci-robot k8s-ci-robot merged commit 8220bb3 into kubernetes-sigs:release-1.12 Dec 12, 2025
22 checks passed
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. area/machineset Issues or PRs related to machinesets area/provider/control-plane-kubeadm Issues or PRs related to KCP 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants