Skip to content

⚠️ Align CAPD conversion to conversion of other providers #12481

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+202 −157
Open

⚠️ Align CAPD conversion to conversion of other providers #12481

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
121 changes: 72 additions & 49 deletions test/infrastructure/docker/api/v1alpha3/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package v1alpha3

import (
"maps"
"reflect"
"slices"
"sort"

Expand All @@ -41,26 +42,46 @@ func (src *DockerCluster) ConvertTo(dstRaw conversion.Hub) error {

// Manually restore data.
restored := &infrav1.DockerCluster{}
if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok {
ok, err := utilconversion.UnmarshalData(src, restored)
if err != nil {
return err
}

if restored.Spec.LoadBalancer.ImageRepository != "" {
dst.Spec.LoadBalancer.ImageRepository = restored.Spec.LoadBalancer.ImageRepository
// Recover intent for bool values converted to *bool.
initialization := infrav1.DockerClusterInitializationStatus{}
restoredDockerClusterProvisioned := restored.Status.Initialization.Provisioned
clusterv1.Convert_bool_To_Pointer_bool(src.Status.Ready, ok, restoredDockerClusterProvisioned, &initialization.Provisioned)
if !reflect.DeepEqual(initialization, infrav1.DockerClusterInitializationStatus{}) {
dst.Status.Initialization = initialization
}

if restored.Spec.LoadBalancer.ImageTag != "" {
dst.Spec.LoadBalancer.ImageTag = restored.Spec.LoadBalancer.ImageTag
if ok {
RestoreDockerClusterSpec(&restored.Spec, &dst.Spec)
}

if restored.Spec.LoadBalancer.CustomHAProxyConfigTemplateRef != nil {
dst.Spec.LoadBalancer.CustomHAProxyConfigTemplateRef = restored.Spec.LoadBalancer.CustomHAProxyConfigTemplateRef
RestoreDockerClusterStatus(&restored.Status, &dst.Status)
Copy link
Member

Choose a reason for hiding this comment

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

I think this also has to be inside the if ok


return nil
}

func RestoreDockerClusterSpec(restored *infrav1.DockerClusterSpec, dst *infrav1.DockerClusterSpec) {
// Restore fields added in v1beta2.
if restored.LoadBalancer.ImageRepository != "" {
dst.LoadBalancer.ImageRepository = restored.LoadBalancer.ImageRepository
}

if restored.LoadBalancer.ImageTag != "" {
dst.LoadBalancer.ImageTag = restored.LoadBalancer.ImageTag
}

dst.Status.Conditions = restored.Status.Conditions
dst.Status.Initialization = restored.Status.Initialization
if restored.LoadBalancer.CustomHAProxyConfigTemplateRef != nil {
dst.LoadBalancer.CustomHAProxyConfigTemplateRef = restored.LoadBalancer.CustomHAProxyConfigTemplateRef
}
}

return nil
func RestoreDockerClusterStatus(restored *infrav1.DockerClusterStatus, dst *infrav1.DockerClusterStatus) {
// Restore fields added in v1beta2.
dst.Conditions = restored.Conditions
}

func (dst *DockerCluster) ConvertFrom(srcRaw conversion.Hub) error {
Expand All @@ -70,12 +91,7 @@ func (dst *DockerCluster) ConvertFrom(srcRaw conversion.Hub) error {
return err
}

// Preserve Hub data on down-conversion except for metadata
if err := utilconversion.MarshalData(src, dst); err != nil {
return err
}

return nil
return utilconversion.MarshalData(src, dst)
}

func (src *DockerMachine) ConvertTo(dstRaw conversion.Hub) error {
Expand All @@ -87,20 +103,40 @@ func (src *DockerMachine) ConvertTo(dstRaw conversion.Hub) error {

// Manually restore data.
restored := &infrav1.DockerMachine{}
if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok {
ok, err := utilconversion.UnmarshalData(src, restored)
if err != nil {
return err
}

if restored.Spec.BootstrapTimeout != nil {
dst.Spec.BootstrapTimeout = restored.Spec.BootstrapTimeout
// Recover intent for bool values converted to *bool.
initialization := infrav1.DockerMachineInitializationStatus{}
restoredDockerMachineProvisioned := restored.Status.Initialization.Provisioned
clusterv1.Convert_bool_To_Pointer_bool(src.Status.Ready, ok, restoredDockerMachineProvisioned, &initialization.Provisioned)
if !reflect.DeepEqual(initialization, infrav1.DockerMachineInitializationStatus{}) {
dst.Status.Initialization = initialization
}

if ok {
RestoreDockerMachineSpec(&restored.Spec, &dst.Spec)
}

dst.Status.Conditions = restored.Status.Conditions
dst.Status.Initialization = restored.Status.Initialization
RestoreDockerMachineStatus(&restored.Status, &dst.Status)
Copy link
Member

Choose a reason for hiding this comment

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

Same here


return nil
}

func RestoreDockerMachineSpec(restored *infrav1.DockerMachineSpec, dst *infrav1.DockerMachineSpec) {
// Restore fields added in v1beta2.
if restored.BootstrapTimeout != nil {
dst.BootstrapTimeout = restored.BootstrapTimeout
}
}

func RestoreDockerMachineStatus(restored *infrav1.DockerMachineStatus, dst *infrav1.DockerMachineStatus) {
// Restore fields added in v1beta2.
dst.Conditions = restored.Conditions
}

func (dst *DockerMachine) ConvertFrom(srcRaw conversion.Hub) error {
src := srcRaw.(*infrav1.DockerMachine)

Expand All @@ -112,11 +148,7 @@ func (dst *DockerMachine) ConvertFrom(srcRaw conversion.Hub) error {
dst.Spec.ProviderID = nil
}

if err := utilconversion.MarshalData(src, dst); err != nil {
return err
}

return nil
return utilconversion.MarshalData(src, dst)
}

func (src *DockerMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
Expand All @@ -128,16 +160,24 @@ func (src *DockerMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {

// Manually restore data.
restored := &infrav1.DockerMachineTemplate{}
if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok {
ok, err := utilconversion.UnmarshalData(src, restored)
if err != nil {
return err
}

dst.Spec.Template.ObjectMeta = restored.Spec.Template.ObjectMeta
dst.Spec.Template.Spec.BootstrapTimeout = restored.Spec.Template.Spec.BootstrapTimeout
if ok {
RestoreDockerMachineTemplateSpec(&restored.Spec, &dst.Spec)
}

return nil
}

func RestoreDockerMachineTemplateSpec(restored *infrav1.DockerMachineTemplateSpec, dst *infrav1.DockerMachineTemplateSpec) {
// Restore fields added in v1beta2.
dst.Template.ObjectMeta = restored.Template.ObjectMeta
dst.Template.Spec.BootstrapTimeout = restored.Template.Spec.BootstrapTimeout
}

func (dst *DockerMachineTemplate) ConvertFrom(srcRaw conversion.Hub) error {
src := srcRaw.(*infrav1.DockerMachineTemplate)

Expand All @@ -149,12 +189,7 @@ func (dst *DockerMachineTemplate) ConvertFrom(srcRaw conversion.Hub) error {
dst.Spec.Template.Spec.ProviderID = nil
}

// Preserve Hub data on down-conversion except for metadata
if err := utilconversion.MarshalData(src, dst); err != nil {
return err
}

return nil
return utilconversion.MarshalData(src, dst)
}

// Convert_v1beta2_DockerClusterSpec_To_v1alpha3_DockerClusterSpec is an autogenerated conversion function.
Expand Down Expand Up @@ -201,9 +236,7 @@ func Convert_v1beta2_DockerClusterStatus_To_v1alpha3_DockerClusterStatus(in *inf
clusterv1alpha3.Convert_v1beta2_Deprecated_V1Beta1_Conditions_To_v1alpha3_Conditions(&in.Deprecated.V1Beta1.Conditions, &out.Conditions)
}

if in.Initialization.Provisioned != nil {
out.Ready = *in.Initialization.Provisioned
}
out.Ready = ptr.Deref(in.Initialization.Provisioned, false)

// Move FailureDomains
if in.FailureDomains != nil {
Expand Down Expand Up @@ -231,9 +264,7 @@ func Convert_v1beta2_DockerMachineStatus_To_v1alpha3_DockerMachineStatus(in *inf
clusterv1alpha3.Convert_v1beta2_Deprecated_V1Beta1_Conditions_To_v1alpha3_Conditions(&in.Deprecated.V1Beta1.Conditions, &out.Conditions)
}

if in.Initialization.Provisioned != nil {
out.Ready = *in.Initialization.Provisioned
}
out.Ready = ptr.Deref(in.Initialization.Provisioned, false)

return nil
}
Expand Down Expand Up @@ -263,10 +294,6 @@ func Convert_v1alpha3_DockerMachineStatus_To_v1beta2_DockerMachineStatus(in *Doc
clusterv1alpha3.Convert_v1alpha3_Conditions_To_v1beta2_Deprecated_V1Beta1_Conditions(&in.Conditions, &out.Deprecated.V1Beta1.Conditions)
}

if in.Ready {
out.Initialization.Provisioned = ptr.To(in.Ready)
}

return nil
}

Expand All @@ -285,10 +312,6 @@ func Convert_v1alpha3_DockerClusterStatus_To_v1beta2_DockerClusterStatus(in *Doc
clusterv1alpha3.Convert_v1alpha3_Conditions_To_v1beta2_Deprecated_V1Beta1_Conditions(&in.Conditions, &out.Deprecated.V1Beta1.Conditions)
}

if in.Ready {
out.Initialization.Provisioned = ptr.To(in.Ready)
}

// Move FailureDomains
if in.FailureDomains != nil {
out.FailureDomains = []clusterv1.FailureDomain{}
Expand Down
Loading