Skip to content

🐛 MachineSet/KCP: Preserve existing object names for backward compatibility with pre-v1.7 in-place updates #13124

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

Merged
k8s-ci-robot merged 1 commit into from
Dec 12, 2025
+4 −0
Merged

🐛 MachineSet/KCP: Preserve existing object names for backward compatibility with pre-v1.7 in-place updates #13124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions controlplane/kubeadm/internal/desiredstate/desired_state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ func ComputeDesiredKubeadmConfig(kcp *controlplanev1.KubeadmControlPlane, cluste
Spec: *spec,
}
if existingKubeadmConfig != nil {
kubeadmConfig.SetName(existingKubeadmConfig.GetName())
kubeadmConfig.SetUID(existingKubeadmConfig.GetUID())
}
return kubeadmConfig, nil
Expand Down Expand Up @@ -289,6 +290,7 @@ func ComputeDesiredInfraMachine(ctx context.Context, c client.Client, kcp *contr
return nil, errors.Wrap(err, "failed to compute desired InfraMachine")
}
if existingInfraMachine != nil {
infraMachine.SetName(existingInfraMachine.GetName())
infraMachine.SetUID(existingInfraMachine.GetUID())
}
return infraMachine, nil
Expand Down
2 changes: 2 additions & 0 deletions internal/controllers/machineset/machineset_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1823,6 +1823,7 @@ func (r *Reconciler) computeDesiredBootstrapConfig(ctx context.Context, ms *clus
}

if existingBootstrapConfig != nil {
bootstrapConfig.SetName(existingBootstrapConfig.GetName())
bootstrapConfig.SetUID(existingBootstrapConfig.GetUID())
}
return bootstrapConfig, nil
Expand Down Expand Up @@ -1900,6 +1901,7 @@ func (r *Reconciler) computeDesiredInfraMachine(ctx context.Context, ms *cluster
}

if existingInfraMachine != nil {
infraMachine.SetName(existingInfraMachine.GetName())
infraMachine.SetUID(existingInfraMachine.GetUID())
}
return infraMachine, nil
Expand Down