Move ports management outside of instances

Author: EmilienM

api/v1alpha5/conversion.go

@@ -410,6 +410,10 @@ func Convert_v1alpha8_OpenStackClusterStatus_To_v1alpha5_OpenStackClusterStatus(
 		}
 	}
 
+	if in.Bastion != nil && in.Bastion.PortsStatus != nil {
+		in.Bastion.PortsStatus = nil
+	}
+
 	return nil
 }
 
@@ -437,3 +441,14 @@ func Convert_v1alpha5_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterStatus(
 func Convert_v1alpha8_OpenStackMachineSpec_To_v1alpha5_OpenStackMachineSpec(in *infrav1.OpenStackMachineSpec, out *OpenStackMachineSpec, s conversion.Scope) error {
 	return autoConvert_v1alpha8_OpenStackMachineSpec_To_v1alpha5_OpenStackMachineSpec(in, out, s)
 }
+
+func Convert_v1alpha8_OpenStackMachineStatus_To_v1alpha5_OpenStackMachineStatus(in *infrav1.OpenStackMachineStatus, out *OpenStackMachineStatus, s conversion.Scope) error {
+	err := autoConvert_v1alpha8_OpenStackMachineStatus_To_v1alpha5_OpenStackMachineStatus(in, out, s)
+	if err != nil {
+		return err
+	}
+
+	in.PortsStatus = nil
+
+	return nil
+}

api/v1alpha5/zz_generated.conversion.go

@@ -638,6 +638,10 @@ func Convert_v1alpha8_OpenStackClusterStatus_To_v1alpha6_OpenStackClusterStatus(
 		out.Network.APIServerLoadBalancer = (*LoadBalancer)(in.APIServerLoadBalancer)
 	}
 
+	if in.Bastion != nil && in.Bastion.PortsStatus != nil {
+		in.Bastion.PortsStatus = nil
+	}
+
 	return nil
 }
 
@@ -659,3 +663,14 @@ func Convert_v1alpha6_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterStatus(
 func Convert_v1alpha8_OpenStackMachineSpec_To_v1alpha6_OpenStackMachineSpec(in *infrav1.OpenStackMachineSpec, out *OpenStackMachineSpec, s apiconversion.Scope) error {
 	return autoConvert_v1alpha8_OpenStackMachineSpec_To_v1alpha6_OpenStackMachineSpec(in, out, s)
 }
+
+func Convert_v1alpha8_OpenStackMachineStatus_To_v1alpha6_OpenStackMachineStatus(in *infrav1.OpenStackMachineStatus, out *OpenStackMachineStatus, s apiconversion.Scope) error {
+	err := autoConvert_v1alpha8_OpenStackMachineStatus_To_v1alpha6_OpenStackMachineStatus(in, out, s)
+	if err != nil {
+		return err
+	}
+
+	in.PortsStatus = nil
+
+	return nil
+}

api/v1alpha6/conversion.go

@@ -17,6 +17,7 @@ limitations under the License.
 package v1alpha7
 
 import (
+	apiconversion "k8s.io/apimachinery/pkg/conversion"
 	ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8"
@@ -232,3 +233,25 @@ func (r *OpenStackMachineTemplateList) ConvertFrom(srcRaw ctrlconversion.Hub) er
 	src := srcRaw.(*infrav1.OpenStackMachineTemplateList)
 	return Convert_v1alpha8_OpenStackMachineTemplateList_To_v1alpha7_OpenStackMachineTemplateList(src, r, nil)
 }
+
+func Convert_v1alpha8_OpenStackMachineStatus_To_v1alpha7_OpenStackMachineStatus(in *infrav1.OpenStackMachineStatus, out *OpenStackMachineStatus, s apiconversion.Scope) error {
+	err := autoConvert_v1alpha8_OpenStackMachineStatus_To_v1alpha7_OpenStackMachineStatus(in, out, s)
+	if err != nil {
+		return err
+	}
+
+	in.PortsStatus = nil
+
+	return nil
+}
+
+func Convert_v1alpha8_BastionStatus_To_v1alpha7_BastionStatus(in *infrav1.BastionStatus, out *BastionStatus, s apiconversion.Scope) error {
+	err := autoConvert_v1alpha8_BastionStatus_To_v1alpha7_BastionStatus(in, out, s)
+	if err != nil {
+		return err
+	}
+
+	in.PortsStatus = nil
+
+	return nil
+}

api/v1alpha6/zz_generated.conversion.go

@@ -22,6 +22,10 @@ const (
 	// InstanceReadyCondition reports on current status of the OpenStack instance. Ready indicates the instance is in a Running state.
 	InstanceReadyCondition clusterv1.ConditionType = "InstanceReady"
 
+	// PortsReadyCondition reports on the current status of the ports. Ready indicates that all ports have been created
+	// successfully and ready to be attached to the instance.
+	PortsReadyCondition clusterv1.ConditionType = "PortsReady"
+
 	// WaitingForClusterInfrastructureReason used when machine is waiting for cluster infrastructure to be ready before proceeding.
 	WaitingForClusterInfrastructureReason = "WaitingForClusterInfrastructure"
 	// WaitingForBootstrapDataReason used when machine is waiting for bootstrap data to be ready before proceeding.
@@ -40,6 +44,10 @@ const (
 	InstanceNotReadyReason = "InstanceNotReady"
 	// InstanceDeleteFailedReason used when deleting the instance failed.
 	InstanceDeleteFailedReason = "InstanceDeleteFailed"
+	// PortsCreateFailedReason used when creating the ports failed.
+	PortsCreateFailedReason = "PortsCreateFailed"
+	// PortsDeleteFailedReason used when deleting the ports failed.
+	PortsDeleteFailedReason = "PortsDeleteFailed"
 	// OpenstackErrorReason used when there is an error communicating with OpenStack.
 	OpenStackErrorReason = "OpenStackError"
 )

api/v1alpha7/conversion.go

@@ -111,6 +111,10 @@ type OpenStackMachineStatus struct {
 	// +optional
 	InstanceState *InstanceState `json:"instanceState,omitempty"`
 
+	// PortsStatus is the status of the ports associated with the machine.
+	// +optional
+	PortsStatus []PortStatus `json:"portsStatus,omitempty"`
+
 	FailureReason *errors.MachineStatusError `json:"failureReason,omitempty"`
 
 	// FailureMessage will be set in the event that there is a terminal problem