v1alpha8: Make all restorers no-ops

v1alpha8 does not yet have any lossy conversions, so doesn't require any
restorer functions.

Author: mdbooth

api/v1alpha7/conversion.go

@@ -25,26 +25,9 @@ import (
 
 var _ ctrlconversion.Convertible = &OpenStackCluster{}
 
-var v1alpha7OpenStackClusterRestorer = conversion.RestorerFor[*OpenStackCluster]{
-	"spec": conversion.HashedFieldRestorer[*OpenStackCluster, OpenStackClusterSpec]{
-		GetField: func(c *OpenStackCluster) *OpenStackClusterSpec {
-			return &c.Spec
-		},
-	},
-	"status": conversion.HashedFieldRestorer[*OpenStackCluster, OpenStackClusterStatus]{
-		GetField: func(c *OpenStackCluster) *OpenStackClusterStatus {
-			return &c.Status
-		},
-	},
-}
+var v1alpha7OpenStackClusterRestorer = conversion.RestorerFor[*OpenStackCluster]{}
 
-var v1alpha8OpenStackClusterRestorer = conversion.RestorerFor[*infrav1.OpenStackCluster]{
-	"status": conversion.HashedFieldRestorer[*infrav1.OpenStackCluster, infrav1.OpenStackClusterStatus]{
-		GetField: func(c *infrav1.OpenStackCluster) *infrav1.OpenStackClusterStatus {
-			return &c.Status
-		},
-	},
-}
+var v1alpha8OpenStackClusterRestorer = conversion.RestorerFor[*infrav1.OpenStackCluster]{}
 
 func (r *OpenStackCluster) ConvertTo(dstRaw ctrlconversion.Hub) error {
 	dst := dstRaw.(*infrav1.OpenStackCluster)
@@ -84,13 +67,7 @@ func (r *OpenStackClusterList) ConvertFrom(srcRaw ctrlconversion.Hub) error {
 
 var _ ctrlconversion.Convertible = &OpenStackClusterTemplate{}
 
-var v1alpha7OpenStackClusterTemplateRestorer = conversion.RestorerFor[*OpenStackClusterTemplate]{
-	"spec": conversion.HashedFieldRestorer[*OpenStackClusterTemplate, OpenStackClusterSpec]{
-		GetField: func(c *OpenStackClusterTemplate) *OpenStackClusterSpec {
-			return &c.Spec.Template.Spec
-		},
-	},
-}
+var v1alpha7OpenStackClusterTemplateRestorer = conversion.RestorerFor[*OpenStackClusterTemplate]{}
 
 var v1alpha8OpenStackClusterTemplateRestorer = conversion.RestorerFor[*infrav1.OpenStackClusterTemplate]{}
 
@@ -118,34 +95,9 @@ func (r *OpenStackClusterTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error
 
 var _ ctrlconversion.Convertible = &OpenStackMachine{}
 
-var v1alpha7OpenStackMachineRestorer = conversion.RestorerFor[*OpenStackMachine]{
-	"spec": conversion.HashedFieldRestorer[*OpenStackMachine, OpenStackMachineSpec]{
-		GetField: func(c *OpenStackMachine) *OpenStackMachineSpec {
-			return &c.Spec
-		},
-		FilterField: func(s *OpenStackMachineSpec) *OpenStackMachineSpec {
-			// Despite being spec fields, ProviderID and InstanceID
-			// are both set by the machine controller. If these are
-			// the only changes to the spec, we still want to
-			// restore the rest of the spec to its original state.
-			if s.ProviderID != nil || s.InstanceID != nil {
-				f := *s
-				f.ProviderID = nil
-				f.InstanceID = nil
-				return &f
-			}
-			return s
-		},
-	},
-}
+var v1alpha7OpenStackMachineRestorer = conversion.RestorerFor[*OpenStackMachine]{}
 
-var v1alpha8OpenStackMachineRestorer = conversion.RestorerFor[*infrav1.OpenStackMachine]{
-	"spec": conversion.HashedFieldRestorer[*infrav1.OpenStackMachine, infrav1.OpenStackMachineSpec]{
-		GetField: func(c *infrav1.OpenStackMachine) *infrav1.OpenStackMachineSpec {
-			return &c.Spec
-		},
-	},
-}
+var v1alpha8OpenStackMachineRestorer = conversion.RestorerFor[*infrav1.OpenStackMachine]{}
 
 func (r *OpenStackMachine) ConvertTo(dstRaw ctrlconversion.Hub) error {
 	dst := dstRaw.(*infrav1.OpenStackMachine)
@@ -183,21 +135,9 @@ func (r *OpenStackMachineList) ConvertFrom(srcRaw ctrlconversion.Hub) error {
 
 var _ ctrlconversion.Convertible = &OpenStackMachineTemplate{}
 
-var v1alpha7OpenStackMachineTemplateRestorer = conversion.RestorerFor[*OpenStackMachineTemplate]{
-	"spec": conversion.HashedFieldRestorer[*OpenStackMachineTemplate, OpenStackMachineSpec]{
-		GetField: func(c *OpenStackMachineTemplate) *OpenStackMachineSpec {
-			return &c.Spec.Template.Spec
-		},
-	},
-}
+var v1alpha7OpenStackMachineTemplateRestorer = conversion.RestorerFor[*OpenStackMachineTemplate]{}
 
-var v1alpha8OpenStackMachineTemplateRestorer = conversion.RestorerFor[*infrav1.OpenStackMachineTemplate]{
-	"spec": conversion.HashedFieldRestorer[*infrav1.OpenStackMachineTemplate, infrav1.OpenStackMachineSpec]{
-		GetField: func(c *infrav1.OpenStackMachineTemplate) *infrav1.OpenStackMachineSpec {
-			return &c.Spec.Template.Spec
-		},
-	},
-}
+var v1alpha8OpenStackMachineTemplateRestorer = conversion.RestorerFor[*infrav1.OpenStackMachineTemplate]{}
 
 func (r *OpenStackMachineTemplate) ConvertTo(dstRaw ctrlconversion.Hub) error {
 	dst := dstRaw.(*infrav1.OpenStackMachineTemplate)