Remove unused BastionStatus fields

api/v1alpha5/conversion.go

@@ -448,23 +448,17 @@ func Convert_v1alpha5_PortOpts_To_v1beta1_PortOpts(in *PortOpts, out *infrav1.Po
 }
 
 func Convert_v1alpha5_Instance_To_v1beta1_BastionStatus(in *Instance, out *infrav1.BastionStatus, _ conversion.Scope) error {
-	// BastionStatus is the same as Spec with unused fields removed
-	out.ID = in.ID
+	// BastionStatus is the same as Instance with unused fields removed
 	out.Name = in.Name
-	out.SSHKeyName = in.SSHKeyName
-	out.State = infrav1.InstanceState(in.State)
 	out.IP = in.IP
 	out.FloatingIP = in.FloatingIP
 	out.ReferencedResources.ServerGroupID = in.ServerGroupID
 	return nil
 }
 
 func Convert_v1beta1_BastionStatus_To_v1alpha5_Instance(in *infrav1.BastionStatus, out *Instance, _ conversion.Scope) error {
-	// BastionStatus is the same as Spec with unused fields removed
-	out.ID = in.ID
+	// BastionStatus is the same as Instance with unused fields removed
 	out.Name = in.Name
-	out.SSHKeyName = in.SSHKeyName
-	out.State = InstanceState(in.State)
 	out.IP = in.IP
 	out.FloatingIP = in.FloatingIP
 	out.ServerGroupID = in.ReferencedResources.ServerGroupID

api/v1alpha6/openstackcluster_conversion.go

@@ -339,6 +339,10 @@ func Convert_v1beta1_OpenStackClusterSpec_To_v1alpha6_OpenStackClusterSpec(in *i
 /* OpenStackClusterStatus */
 
 func restorev1alpha6ClusterStatus(previous *OpenStackClusterStatus, dst *OpenStackClusterStatus) {
+	if previous == nil || dst == nil {
+		return
+	}
+
 	// PortOpts.SecurityGroups have been removed in v1beta1
 	// We restore the whole PortOpts/Networks since they are anyway immutable.
 	if previous.ExternalNetwork != nil {
@@ -354,6 +358,8 @@ func restorev1alpha6ClusterStatus(previous *OpenStackClusterStatus, dst *OpenSta
 	restorev1alpha6SecurityGroup(previous.ControlPlaneSecurityGroup, dst.ControlPlaneSecurityGroup)
 	restorev1alpha6SecurityGroup(previous.WorkerSecurityGroup, dst.WorkerSecurityGroup)
 	restorev1alpha6SecurityGroup(previous.BastionSecurityGroup, dst.BastionSecurityGroup)
+
+	restorev1alpha6BastionStatus(previous.Bastion, dst.Bastion)
 }
 
 func restorev1beta1ClusterStatus(previous *infrav1.OpenStackClusterStatus, dst *infrav1.OpenStackClusterStatus) {
@@ -423,21 +429,27 @@ func restorev1beta1Bastion(previous **infrav1.Bastion, dst **infrav1.Bastion) {
 
 func Convert_v1alpha6_Instance_To_v1beta1_BastionStatus(in *Instance, out *infrav1.BastionStatus, _ apiconversion.Scope) error {
 	// BastionStatus is the same as Spec with unused fields removed
-	out.ID = in.ID
 	out.Name = in.Name
-	out.SSHKeyName = in.SSHKeyName
-	out.State = infrav1.InstanceState(in.State)
 	out.IP = in.IP
 	out.FloatingIP = in.FloatingIP
 	return nil
 }
 
+/* Bastion status */
+
+func restorev1alpha6BastionStatus(previous *Instance, dst *Instance) {
+	if previous == nil || dst == nil {
+		return
+	}
+
+	dst.ID = previous.ID
+	dst.SSHKeyName = previous.SSHKeyName
+	dst.State = previous.State
+}
+
 func Convert_v1beta1_BastionStatus_To_v1alpha6_Instance(in *infrav1.BastionStatus, out *Instance, _ apiconversion.Scope) error {
 	// BastionStatus is the same as Spec with unused fields removed
-	out.ID = in.ID
 	out.Name = in.Name
-	out.SSHKeyName = in.SSHKeyName
-	out.State = InstanceState(in.State)
 	out.IP = in.IP
 	out.FloatingIP = in.FloatingIP
 	return nil

api/v1alpha7/openstackcluster_conversion.go

@@ -342,9 +342,15 @@ func Convert_v1beta1_OpenStackClusterSpec_To_v1alpha7_OpenStackClusterSpec(in *i
 /* OpenStackClusterStatus */
 
 func restorev1alpha7ClusterStatus(previous *OpenStackClusterStatus, dst *OpenStackClusterStatus) {
+	if previous == nil || dst == nil {
+		return
+	}
+
 	restorev1alpha7SecurityGroup(previous.ControlPlaneSecurityGroup, dst.ControlPlaneSecurityGroup)
 	restorev1alpha7SecurityGroup(previous.WorkerSecurityGroup, dst.WorkerSecurityGroup)
 	restorev1alpha7SecurityGroup(previous.BastionSecurityGroup, dst.BastionSecurityGroup)
+
+	restorev1alpha7BastionStatus(previous.Bastion, dst.Bastion)
 }
 
 func restorev1beta1ClusterStatus(previous *infrav1.OpenStackClusterStatus, dst *infrav1.OpenStackClusterStatus) {
@@ -433,6 +439,22 @@ func Convert_v1beta1_Bastion_To_v1alpha7_Bastion(in *infrav1.Bastion, out *Basti
 	return optional.Convert_optional_String_To_string(&in.FloatingIP, &out.Instance.FloatingIP, s)
 }
 
+/* Bastion status */
+
+func restorev1alpha7BastionStatus(previous *BastionStatus, dst *BastionStatus) {
+	if previous == nil || dst == nil {
+		return
+	}
+
+	dst.ID = previous.ID
+	dst.SSHKeyName = previous.SSHKeyName
+	dst.State = previous.State
+}
+
+func Convert_v1alpha7_BastionStatus_To_v1beta1_BastionStatus(in *BastionStatus, out *infrav1.BastionStatus, s apiconversion.Scope) error {
+	return autoConvert_v1alpha7_BastionStatus_To_v1beta1_BastionStatus(in, out, s)
+}
+
 func Convert_v1beta1_BastionStatus_To_v1alpha7_BastionStatus(in *infrav1.BastionStatus, out *BastionStatus, s apiconversion.Scope) error {
 	// ReferencedResources have no equivalent in v1alpha7
 	return autoConvert_v1beta1_BastionStatus_To_v1alpha7_BastionStatus(in, out, s)

api/v1beta1/types.go

@@ -304,10 +304,7 @@ type AddressPair struct {
 }
 
 type BastionStatus struct {
-	ID                  string                     `json:"id,omitempty"`
 	Name                string                     `json:"name,omitempty"`
-	SSHKeyName          string                     `json:"sshKeyName,omitempty"`
-	State               InstanceState              `json:"state,omitempty"`
 	IP                  string                     `json:"ip,omitempty"`
 	FloatingIP          string                     `json:"floatingIP,omitempty"`
 	ReferencedResources ReferencedMachineResources `json:"referencedResources,omitempty"`
@@ -629,6 +626,13 @@ type DependentMachineResources struct {
 	Server *ServerStatus `json:"server,omitempty"`
 }
 
+func (r *DependentMachineResources) GetServerID() *string {
+	if r == nil || r.Server == nil {
+		return nil
+	}
+	return &r.Server.ID
+}
+
 type ServerStatus struct {
 	// ID is the uuid of the server
 	// +kubebuilder:validation:Required

controllers/openstackcluster_controller.go

@@ -257,16 +257,22 @@ func deleteBastion(scope *scope.WithLogger, cluster *clusterv1.Cluster, openStac
 		return err
 	}
 
-	if openStackCluster.Status.Bastion != nil && openStackCluster.Status.Bastion.FloatingIP != "" {
+	var instanceStatus *compute.InstanceStatus
+	bastionStatus := openStackCluster.Status.Bastion
+	if bastionStatus != nil && bastionStatus.FloatingIP != "" {
 		if err = networkingService.DeleteFloatingIP(openStackCluster, openStackCluster.Status.Bastion.FloatingIP); err != nil {
 			handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to delete floating IP: %w", err))
 			return fmt.Errorf("failed to delete floating IP: %w", err)
 		}
 	}
 
-	var instanceStatus *compute.InstanceStatus
-	if openStackCluster.Status.Bastion != nil && openStackCluster.Status.Bastion.ID != "" {
-		instanceStatus, err = computeService.GetInstanceStatus(openStackCluster.Status.Bastion.ID)
+	var serverID *string
+	if bastionStatus != nil {
+		serverID = bastionStatus.DependentResources.GetServerID()
+	}
+
+	if serverID != nil {
+		instanceStatus, err = computeService.GetInstanceStatus(*serverID)
 		if err != nil {
 			return err
 		}
@@ -304,7 +310,7 @@ func deleteBastion(scope *scope.WithLogger, cluster *clusterv1.Cluster, openStac
 		}
 	}
 
-	if openStackCluster.Status.Bastion != nil && len(openStackCluster.Status.Bastion.DependentResources.Ports) > 0 {
+	if bastionStatus != nil && len(openStackCluster.Status.Bastion.DependentResources.Ports) > 0 {
 		trunkSupported, err := networkingService.IsTrunkExtSupported()
 		if err != nil {
 			return err
@@ -444,9 +450,12 @@ func reconcileBastion(scope *scope.WithLogger, cluster *clusterv1.Cluster, openS
 	bastionPortIDs := GetPortIDs(openStackCluster.Status.Bastion.DependentResources.Ports)
 
 	var instanceStatus *compute.InstanceStatus
-	if openStackCluster.Status.Bastion != nil && openStackCluster.Status.Bastion.ID != "" {
-		if instanceStatus, err = computeService.GetInstanceStatus(openStackCluster.Status.Bastion.ID); err != nil {
-			return nil, err
+	bastionStatus := openStackCluster.Status.Bastion
+	if bastionStatus != nil {
+		if serverID := bastionStatus.DependentResources.GetServerID(); serverID != nil {
+			if instanceStatus, err = computeService.GetInstanceStatus(*serverID); err != nil {
+				return nil, err
+			}
 		}
 	}
 	if instanceStatus == nil {
@@ -463,6 +472,10 @@ func reconcileBastion(scope *scope.WithLogger, cluster *clusterv1.Cluster, openS
 	}
 
 	// Save hash & status as soon as we know we have an instance
+	openStackCluster.Status.Bastion.DependentResources.Server = &infrav1.ServerStatus{
+		ID:    instanceStatus.ID(),
+		State: instanceStatus.State(),
+	}
 	instanceStatus.UpdateBastionStatus(openStackCluster)
 
 	// Make sure that bastion instance has a valid state

controllers/openstackcluster_controller_test.go

@@ -205,7 +205,12 @@ var _ = Describe("OpenStackCluster controller", func() {
 		Expect(err).To(BeNil())
 		testCluster.Status = infrav1.OpenStackClusterStatus{
 			Bastion: &infrav1.BastionStatus{
-				ID: "bastion-uuid",
+				DependentResources: infrav1.DependentMachineResources{
+					Server: &infrav1.ServerStatus{
+						ID:    "bastion-uuid",
+						State: "ACTIVE",
+					},
+				},
 			},
 		}
 		err = k8sClient.Status().Update(ctx, testCluster)
@@ -285,8 +290,6 @@ var _ = Describe("OpenStackCluster controller", func() {
 
 		res, err := reconcileBastion(scope, capiCluster, testCluster)
 		Expect(testCluster.Status.Bastion).To(Equal(&infrav1.BastionStatus{
-			ID:    "adopted-bastion-uuid",
-			State: "ACTIVE",
 			ReferencedResources: infrav1.ReferencedMachineResources{
 				ImageID: "imageID",
 				Ports: []infrav1.PortOpts{
@@ -303,6 +306,10 @@ var _ = Describe("OpenStackCluster controller", func() {
 						ID: "portID1",
 					},
 				},
+				Server: &infrav1.ServerStatus{
+					ID:    "adopted-bastion-uuid",
+					State: "ACTIVE",
+				},
 			},
 		}))
 		Expect(err).To(BeNil())
@@ -328,7 +335,6 @@ var _ = Describe("OpenStackCluster controller", func() {
 				},
 			},
 			Bastion: &infrav1.BastionStatus{
-				ID: "adopted-fip-bastion-uuid",
 				ReferencedResources: infrav1.ReferencedMachineResources{
 					ImageID: "imageID",
 					Ports: []infrav1.PortOpts{
@@ -345,6 +351,9 @@ var _ = Describe("OpenStackCluster controller", func() {
 							ID: "portID1",
 						},
 					},
+					Server: &infrav1.ServerStatus{
+						ID: "adopted-fip-bastion-uuid",
+					},
 				},
 			},
 		}
@@ -370,9 +379,7 @@ var _ = Describe("OpenStackCluster controller", func() {
 
 		res, err := reconcileBastion(scope, capiCluster, testCluster)
 		Expect(testCluster.Status.Bastion).To(Equal(&infrav1.BastionStatus{
-			ID:         "adopted-fip-bastion-uuid",
 			FloatingIP: "1.2.3.4",
-			State:      "ACTIVE",
 			ReferencedResources: infrav1.ReferencedMachineResources{
 				ImageID: "imageID",
 				Ports: []infrav1.PortOpts{
@@ -389,6 +396,10 @@ var _ = Describe("OpenStackCluster controller", func() {
 						ID: "portID1",
 					},
 				},
+				Server: &infrav1.ServerStatus{
+					ID:    "adopted-fip-bastion-uuid",
+					State: "ACTIVE",
+				},
 			},
 		}))
 		Expect(err).To(BeNil())
@@ -414,7 +425,6 @@ var _ = Describe("OpenStackCluster controller", func() {
 				},
 			},
 			Bastion: &infrav1.BastionStatus{
-				ID: "requeue-bastion-uuid",
 				ReferencedResources: infrav1.ReferencedMachineResources{
 					ImageID: "imageID",
 					Ports: []infrav1.PortOpts{
@@ -431,6 +441,9 @@ var _ = Describe("OpenStackCluster controller", func() {
 							ID: "portID1",
 						},
 					},
+					Server: &infrav1.ServerStatus{
+						ID: "requeue-bastion-uuid",
+					},
 				},
 			},
 		}
@@ -451,8 +464,6 @@ var _ = Describe("OpenStackCluster controller", func() {
 
 		res, err := reconcileBastion(scope, capiCluster, testCluster)
 		Expect(testCluster.Status.Bastion).To(Equal(&infrav1.BastionStatus{
-			ID:    "requeue-bastion-uuid",
-			State: "BUILD",
 			ReferencedResources: infrav1.ReferencedMachineResources{
 				ImageID: "imageID",
 				Ports: []infrav1.PortOpts{
@@ -469,6 +480,10 @@ var _ = Describe("OpenStackCluster controller", func() {
 						ID: "portID1",
 					},
 				},
+				Server: &infrav1.ServerStatus{
+					ID:    "requeue-bastion-uuid",
+					State: "BUILD",
+				},
 			},
 		}))
 		Expect(err).To(BeNil())