Skip to content

[release-1.11] 🐛 Stop adding conversion-data annotation to Cluster object #12721

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
merged 1 commit into from
Sep 2, 2025
Merged

[release-1.11] 🐛 Stop adding conversion-data annotation to Cluster object #12721

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
3 changes: 2 additions & 1 deletion bootstrap/kubeadm/types/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ func marshalForVersion(obj conversion.Hub, version semver.Version, kubeadmObjVer
}

targetKubeadmObj = targetKubeadmObj.DeepCopyObject().(conversion.Convertible)
if err := targetKubeadmObj.ConvertFrom(obj); err != nil {
// DeepCopy obj because ConvertFrom might have side effects.
if err := targetKubeadmObj.ConvertFrom(obj.DeepCopyObject().(conversion.Hub)); err != nil {
return "", errors.Wrapf(err, "failed to convert to KubeadmAPI type for version %s", kubeadmAPIGroupVersion)
}

Expand Down
6 changes: 4 additions & 2 deletions exp/topology/desiredstate/desired_state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,8 @@ func (g *generator) computeControlPlaneVersion(ctx context.Context, s *scope.Sco
// hook because we didn't go through an upgrade or we already called the hook after the upgrade.
if hooks.IsPending(runtimehooksv1.AfterControlPlaneUpgrade, s.Current.Cluster) {
v1beta1Cluster := &clusterv1beta1.Cluster{}
if err := v1beta1Cluster.ConvertFrom(s.Current.Cluster); err != nil {
// DeepCopy cluster because ConvertFrom has side effects like adding the conversion annotation.
if err := v1beta1Cluster.ConvertFrom(s.Current.Cluster.DeepCopy()); err != nil {
return "", errors.Wrap(err, "error converting Cluster to v1beta1 Cluster")
}

Expand Down Expand Up @@ -621,7 +622,8 @@ func (g *generator) computeControlPlaneVersion(ctx context.Context, s *scope.Sco
// At this point the control plane and the machine deployments are stable and we are almost ready to pick
// up the desiredVersion. Call the BeforeClusterUpgrade hook before picking up the desired version.
v1beta1Cluster := &clusterv1beta1.Cluster{}
if err := v1beta1Cluster.ConvertFrom(s.Current.Cluster); err != nil {
// DeepCopy cluster because ConvertFrom has side effects like adding the conversion annotation.
if err := v1beta1Cluster.ConvertFrom(s.Current.Cluster.DeepCopy()); err != nil {
return "", errors.Wrap(err, "error converting Cluster to v1beta1 Cluster")
}

Expand Down
6 changes: 4 additions & 2 deletions internal/controllers/topology/cluster/cluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,8 @@ func (r *Reconciler) callBeforeClusterCreateHook(ctx context.Context, s *scope.S

if !s.Current.Cluster.Spec.InfrastructureRef.IsDefined() && !s.Current.Cluster.Spec.ControlPlaneRef.IsDefined() {
v1beta1Cluster := &clusterv1beta1.Cluster{}
if err := v1beta1Cluster.ConvertFrom(s.Current.Cluster); err != nil {
// DeepCopy cluster because ConvertFrom has side effects like adding the conversion annotation.
if err := v1beta1Cluster.ConvertFrom(s.Current.Cluster.DeepCopy()); err != nil {
return ctrl.Result{}, errors.Wrap(err, "error converting Cluster to v1beta1 Cluster")
}

Expand Down Expand Up @@ -525,7 +526,8 @@ func (r *Reconciler) reconcileDelete(ctx context.Context, cluster *clusterv1.Clu
if feature.Gates.Enabled(feature.RuntimeSDK) {
if !hooks.IsOkToDelete(cluster) {
v1beta1Cluster := &clusterv1beta1.Cluster{}
if err := v1beta1Cluster.ConvertFrom(cluster); err != nil {
// DeepCopy cluster because ConvertFrom has side effects like adding the conversion annotation.
if err := v1beta1Cluster.ConvertFrom(cluster.DeepCopy()); err != nil {
return ctrl.Result{}, errors.Wrap(err, "error converting Cluster to v1beta1 Cluster")
}

Expand Down
6 changes: 4 additions & 2 deletions internal/controllers/topology/cluster/reconcile_state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,8 @@ func (r *Reconciler) callAfterControlPlaneInitialized(ctx context.Context, s *sc
if hooks.IsPending(runtimehooksv1.AfterControlPlaneInitialized, s.Current.Cluster) {
if isControlPlaneInitialized(s.Current.Cluster) {
v1beta1Cluster := &clusterv1beta1.Cluster{}
if err := v1beta1Cluster.ConvertFrom(s.Current.Cluster); err != nil {
// DeepCopy cluster because ConvertFrom has side effects like adding the conversion annotation.
if err := v1beta1Cluster.ConvertFrom(s.Current.Cluster.DeepCopy()); err != nil {
return errors.Wrap(err, "error converting Cluster to v1beta1 Cluster")
}

Expand Down Expand Up @@ -250,7 +251,8 @@ func (r *Reconciler) callAfterClusterUpgrade(ctx context.Context, s *scope.Scope
!s.UpgradeTracker.MachinePools.IsAnyPendingUpgrade() && // No MachinePools are pending an upgrade
!s.UpgradeTracker.MachinePools.DeferredUpgrade() { // No MachinePools have deferred an upgrade
v1beta1Cluster := &clusterv1beta1.Cluster{}
if err := v1beta1Cluster.ConvertFrom(s.Current.Cluster); err != nil {
// DeepCopy cluster because ConvertFrom has side effects like adding the conversion annotation.
if err := v1beta1Cluster.ConvertFrom(s.Current.Cluster.DeepCopy()); err != nil {
return errors.Wrap(err, "error converting Cluster to v1beta1 Cluster")
}

Expand Down