fix v1alpha7 restore overlap in cluster status

Author: mdbooth

api/v1alpha7/__debug_bin2831452306

@@ -18,6 +18,7 @@ package v1alpha7
 
 import (
 	apiconversion "k8s.io/apimachinery/pkg/conversion"
+	"k8s.io/utils/pointer"
 	ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8"
@@ -86,28 +87,30 @@ func restorev1alpha8SecurityGroupStatus(previous *infrav1.SecurityGroupStatus, d
 		return
 	}
 
-	for i, rule := range dst.Rules {
+	for i := range dst.Rules {
+		dstRule := &dst.Rules[i]
+
 		// Conversion from scalar to *scalar is lossy for zero values. We need to restore only nil values.
-		if rule.Description != nil && *rule.Description == "" {
-			rule.Description = previous.Rules[i].Description
+		if dstRule.Description != nil && *dstRule.Description == "" {
+			dstRule.Description = previous.Rules[i].Description
 		}
-		if rule.EtherType != nil && *rule.EtherType == "" {
-			rule.EtherType = previous.Rules[i].EtherType
+		if dstRule.EtherType != nil && *dstRule.EtherType == "" {
+			dstRule.EtherType = previous.Rules[i].EtherType
 		}
-		if rule.PortRangeMin != nil && *rule.PortRangeMin == 0 {
-			rule.PortRangeMin = previous.Rules[i].PortRangeMin
+		if dstRule.PortRangeMin != nil && *dstRule.PortRangeMin == 0 {
+			dstRule.PortRangeMin = previous.Rules[i].PortRangeMin
 		}
-		if rule.PortRangeMax != nil && *rule.PortRangeMax == 0 {
-			rule.PortRangeMax = previous.Rules[i].PortRangeMax
+		if dstRule.PortRangeMax != nil && *dstRule.PortRangeMax == 0 {
+			dstRule.PortRangeMax = previous.Rules[i].PortRangeMax
 		}
-		if rule.Protocol != nil && *rule.Protocol == "" {
-			rule.Protocol = previous.Rules[i].Protocol
+		if dstRule.Protocol != nil && *dstRule.Protocol == "" {
+			dstRule.Protocol = previous.Rules[i].Protocol
 		}
-		if rule.RemoteGroupID != nil && *rule.RemoteGroupID == "" {
-			rule.RemoteGroupID = previous.Rules[i].RemoteGroupID
+		if dstRule.RemoteGroupID != nil && *dstRule.RemoteGroupID == "" {
+			dstRule.RemoteGroupID = previous.Rules[i].RemoteGroupID
 		}
-		if rule.RemoteIPPrefix != nil && *rule.RemoteIPPrefix == "" {
-			rule.RemoteIPPrefix = previous.Rules[i].RemoteIPPrefix
+		if dstRule.RemoteIPPrefix != nil && *dstRule.RemoteIPPrefix == "" {
+			dstRule.RemoteIPPrefix = previous.Rules[i].RemoteIPPrefix
 		}
 	}
 }
@@ -116,6 +119,11 @@ func restorev1alpha8ClusterStatus(previous *infrav1.OpenStackClusterStatus, dst
 	restorev1alpha8SecurityGroupStatus(previous.ControlPlaneSecurityGroup, dst.ControlPlaneSecurityGroup)
 	restorev1alpha8SecurityGroupStatus(previous.WorkerSecurityGroup, dst.WorkerSecurityGroup)
 	restorev1alpha8SecurityGroupStatus(previous.BastionSecurityGroup, dst.BastionSecurityGroup)
+
+	// ReferencedResources have no equivalent in v1alpha7
+	if dst.Bastion != nil {
+		dst.Bastion.ReferencedResources = previous.Bastion.ReferencedResources
+	}
 }
 
 var v1alpha8OpenStackClusterRestorer = conversion.RestorerFor[*infrav1.OpenStackCluster]{
@@ -144,16 +152,6 @@ var v1alpha8OpenStackClusterRestorer = conversion.RestorerFor[*infrav1.OpenStack
 		),
 	),
 
-	// No equivalent in v1alpha7
-	"bastionrefresources": conversion.UnconditionalFieldRestorer(
-		func(c *infrav1.OpenStackCluster) *infrav1.ReferencedMachineResources {
-			if c.Status.Bastion == nil {
-				return nil
-			}
-			return &c.Status.Bastion.ReferencedResources
-		},
-	),
-
 	"status": conversion.HashedFieldRestorer(
 		func(c *infrav1.OpenStackCluster) *infrav1.OpenStackClusterStatus {
 			return &c.Status
@@ -658,14 +656,14 @@ func Convert_v1alpha7_SecurityGroup_To_v1alpha8_SecurityGroupStatus(in *Security
 	for i, rule := range in.Rules {
 		out.Rules[i] = infrav1.SecurityGroupRuleStatus{
 			ID:             rule.ID,
-			Description:    &rule.Description,
+			Description:    pointer.String(rule.Description),
 			Direction:      rule.Direction,
-			EtherType:      &rule.EtherType,
-			PortRangeMin:   &rule.PortRangeMin,
-			PortRangeMax:   &rule.PortRangeMax,
-			Protocol:       &rule.Protocol,
-			RemoteGroupID:  &rule.RemoteGroupID,
-			RemoteIPPrefix: &rule.RemoteIPPrefix,
+			EtherType:      pointer.String(rule.EtherType),
+			PortRangeMin:   pointer.Int(rule.PortRangeMin),
+			PortRangeMax:   pointer.Int(rule.PortRangeMax),
+			Protocol:       pointer.String(rule.Protocol),
+			RemoteGroupID:  pointer.String(rule.RemoteGroupID),
+			RemoteIPPrefix: pointer.String(rule.RemoteIPPrefix),
 		}
 	}
 

api/v1alpha7/conversion.go

@@ -314,7 +314,7 @@ type SecurityGroupStatus struct {
 
 	// list of security group rules
 	// +optional
-	Rules []SecurityGroupRuleStatus `json:"rules"`
+	Rules []SecurityGroupRuleStatus `json:"rules,omitempty"`
 }
 
 // SecurityGroupRuleSpec represent the basic information of the associated OpenStack
@@ -374,7 +374,7 @@ type SecurityGroupRuleSpec struct {
 	// remoteManagedGroups is the remote managed groups to be associated with this security group rule.
 	// You can specify either remoteGroupID or remoteIPPrefix or remoteManagedGroups.
 	// +optional
-	RemoteManagedGroups []ManagedSecurityGroupName `json:"remoteManagedGroups"`
+	RemoteManagedGroups []ManagedSecurityGroupName `json:"remoteManagedGroups,omitempty"`
 }
 
 type SecurityGroupRuleStatus struct {