WIP - move ports out of instance

Author: EmilienM

api/v1alpha5/conversion.go

@@ -437,3 +437,14 @@ func Convert_v1alpha5_OpenStackClusterStatus_To_v1alpha7_OpenStackClusterStatus(
 func Convert_v1alpha7_OpenStackMachineSpec_To_v1alpha5_OpenStackMachineSpec(in *infrav1.OpenStackMachineSpec, out *OpenStackMachineSpec, s conversion.Scope) error {
 	return autoConvert_v1alpha7_OpenStackMachineSpec_To_v1alpha5_OpenStackMachineSpec(in, out, s)
 }
+
+func Convert_v1alpha7_OpenStackMachineStatus_To_v1alpha5_OpenStackMachineStatus(in *infrav1.OpenStackMachineStatus, out *OpenStackMachineStatus, s conversion.Scope) error {
+	err := autoConvert_v1alpha7_OpenStackMachineStatus_To_v1alpha5_OpenStackMachineStatus(in, out, s)
+	if err != nil {
+		return err
+	}
+
+	in.PortsStatus = nil
+
+	return nil
+}

api/v1alpha5/zz_generated.conversion.go

@@ -659,3 +659,14 @@ func Convert_v1alpha6_OpenStackClusterStatus_To_v1alpha7_OpenStackClusterStatus(
 func Convert_v1alpha7_OpenStackMachineSpec_To_v1alpha6_OpenStackMachineSpec(in *infrav1.OpenStackMachineSpec, out *OpenStackMachineSpec, s apiconversion.Scope) error {
 	return autoConvert_v1alpha7_OpenStackMachineSpec_To_v1alpha6_OpenStackMachineSpec(in, out, s)
 }
+
+func Convert_v1alpha7_OpenStackMachineStatus_To_v1alpha6_OpenStackMachineStatus(in *infrav1.OpenStackMachineStatus, out *OpenStackMachineStatus, s apiconversion.Scope) error {
+	err := autoConvert_v1alpha7_OpenStackMachineStatus_To_v1alpha6_OpenStackMachineStatus(in, out, s)
+	if err != nil {
+		return err
+	}
+
+	in.PortsStatus = nil
+
+	return nil
+}

api/v1alpha6/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.
@@ -42,6 +46,10 @@ const (
 	InstanceDeleteFailedReason = "InstanceDeleteFailed"
 	// OpenstackErrorReason used when there is an error communicating with OpenStack.
 	OpenStackErrorReason = "OpenStackError"
+	// PortsCreateFailedReason used when creating the ports failed.
+	PortsCreateFailedReason = "PortsCreateFailed"
+	// PortsDeleteFailedReason used when deleting the ports failed.
+	PortsDeleteFailedReason = "PortsDeleteFailed"
 )
 
 const (

api/v1alpha6/zz_generated.conversion.go

@@ -113,6 +113,10 @@ type OpenStackMachineStatus struct {
 
 	FailureReason *errors.MachineStatusError `json:"failureReason,omitempty"`
 
+	// PortsStatus is the status of the ports associated with the machine.
+	// +optional
+	PortsStatus []PortStatus `json:"portsStatus,omitempty"`
+
 	// FailureMessage will be set in the event that there is a terminal problem
 	// reconciling the Machine and will contain a more verbose string suitable
 	// for logging and human consumption.

api/v1alpha7/conditions_consts.go

@@ -128,6 +128,12 @@ type PortOpts struct {
 	ValueSpecs []ValueSpec `json:"valueSpecs,omitempty"`
 }
 
+type PortStatus struct {
+	// ID is the unique identifier of the port.
+	// +optional
+	ID string `json:"id,omitempty"`
+}
+
 type BindingProfile struct {
 	// OVSHWOffload enables or disables the OVS hardware offload feature.
 	OVSHWOffload bool `json:"ovsHWOffload,omitempty"`
@@ -149,12 +155,13 @@ 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"`
+	ID          string        `json:"id,omitempty"`
+	Name        string        `json:"name,omitempty"`
+	SSHKeyName  string        `json:"sshKeyName,omitempty"`
+	State       InstanceState `json:"state,omitempty"`
+	PortsStatus PortStatus    `json:"portsStatus,omitempty"`
+	IP          string        `json:"ip,omitempty"`
+	FloatingIP  string        `json:"floatingIP,omitempty"`
 }
 
 type RootVolume struct {

api/v1alpha7/openstackmachine_types.go

@@ -4404,6 +4404,12 @@ spec:
                     type: string
                   name:
                     type: string
+                  portsStatus:
+                    properties:
+                      id:
+                        description: ID is the unique identifier of the port.
+                        type: string
+                    type: object
                   sshKeyName:
                     type: string
                   state:

api/v1alpha7/types.go

@@ -1603,6 +1603,16 @@ spec:
                 description: InstanceState is the state of the OpenStack instance
                   for this machine.
                 type: string
+              portsStatus:
+                description: PortsStatus is the status of the ports associated with
+                  the machine.
+                items:
+                  properties:
+                    id:
+                      description: ID is the unique identifier of the port.
+                      type: string
+                  type: object
+                type: array
               ready:
                 description: Ready is true when the provider resource is ready.
                 type: boolean

api/v1alpha7/zz_generated.deepcopy.go

@@ -179,7 +179,7 @@ func (r *OpenStackClusterReconciler) reconcileDelete(ctx context.Context, scope
 			return ctrl.Result{}, fmt.Errorf("failed to delete router: %w", err)
 		}
 
-		if err = networkingService.DeletePorts(openStackCluster); err != nil {
+		if err = networkingService.DeleteClusterPorts(openStackCluster); err != nil {
 			handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to delete ports: %w", err))
 			return reconcile.Result{}, fmt.Errorf("failed to delete ports: %w", err)
 		}
@@ -239,7 +239,7 @@ func deleteBastion(scope scope.Scope, cluster *clusterv1.Cluster, openStackClust
 
 		instanceSpec := bastionToInstanceSpec(openStackCluster, cluster.Name)
 
-		if err = computeService.DeleteInstance(openStackCluster, openStackCluster, instanceStatus, instanceSpec); err != nil {
+		if err = computeService.DeleteInstance(openStackCluster, instanceStatus, instanceSpec); err != nil {
 			handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to delete bastion: %w", err))
 			return fmt.Errorf("failed to delete bastion: %w", err)
 		}
@@ -320,6 +320,8 @@ func reconcileBastion(scope scope.Scope, cluster *clusterv1.Cluster, openStackCl
 		return err
 	}
 
+	// TODO(emilien) Create ports for bastion host
+
 	instanceSpec := bastionToInstanceSpec(openStackCluster, cluster.Name)
 	bastionHash, err := compute.HashInstanceSpec(instanceSpec)
 	if err != nil {
@@ -349,7 +351,7 @@ func reconcileBastion(scope scope.Scope, cluster *clusterv1.Cluster, openStackCl
 		}
 	}
 
-	instanceStatus, err = computeService.CreateInstance(openStackCluster, openStackCluster, instanceSpec, cluster.Name)
+	instanceStatus, err = computeService.CreateInstance(openStackCluster, openStackCluster, instanceSpec, cluster.Name, []string{})
 	if err != nil {
 		return fmt.Errorf("failed to reconcile bastion: %w", err)
 	}
@@ -398,18 +400,30 @@ func bastionToInstanceSpec(openStackCluster *infrav1.OpenStackCluster, clusterNa
 		RootVolume:    openStackCluster.Spec.Bastion.Instance.RootVolume,
 	}
 
-	instanceSpec.SecurityGroups = openStackCluster.Spec.Bastion.Instance.SecurityGroups
+	instanceSpec.SecurityGroups = getBastionSecurityGroups(openStackCluster)
+
+	instanceSpec.Ports = openStackCluster.Spec.Bastion.Instance.Ports
+
+	return instanceSpec
+}
+
+// getBastionSecurityGroups returns a combination of openStackCluster.Spec.Bastion.Instance.SecurityGroups
+// and the security group managed by the OpenStackCluster.
+func getBastionSecurityGroups(openStackCluster *infrav1.OpenStackCluster) []infrav1.SecurityGroupFilter {
+	instanceSpecSecurityGroups := openStackCluster.Spec.Bastion.Instance.SecurityGroups
+	var managedSecurityGroup string
 	if openStackCluster.Spec.ManagedSecurityGroups {
 		if openStackCluster.Status.BastionSecurityGroup != nil {
-			instanceSpec.SecurityGroups = append(instanceSpec.SecurityGroups, infrav1.SecurityGroupFilter{
-				ID: openStackCluster.Status.BastionSecurityGroup.ID,
-			})
+			managedSecurityGroup = openStackCluster.Status.BastionSecurityGroup.ID
 		}
 	}
 
-	instanceSpec.Ports = openStackCluster.Spec.Bastion.Instance.Ports
-
-	return instanceSpec
+	if managedSecurityGroup != "" {
+		instanceSpecSecurityGroups = append(instanceSpecSecurityGroups, infrav1.SecurityGroupFilter{
+			ID: managedSecurityGroup,
+		})
+	}
+	return instanceSpecSecurityGroups
 }
 
 // bastionHashHasChanged returns a boolean whether if the latest bastion hash, built from the instance spec, has changed or not.