Merge pull request #1788 from shiftstack/ports

✨ Re-work ports management

api/v1alpha5/conversion_test.go

@@ -79,7 +79,7 @@ func TestConvertFrom(t *testing.T) {
 				Spec: OpenStackMachineSpec{},
 				ObjectMeta: metav1.ObjectMeta{
 					Annotations: map[string]string{
-						"cluster.x-k8s.io/conversion-data": "{\"spec\":{\"cloudName\":\"\",\"flavor\":\"\",\"image\":{}},\"status\":{\"ready\":false,\"referencedResources\":{}}}",
+						"cluster.x-k8s.io/conversion-data": "{\"spec\":{\"cloudName\":\"\",\"flavor\":\"\",\"image\":{}},\"status\":{\"dependentResources\":{},\"ready\":false,\"referencedResources\":{}}}",
 					},
 				},
 			},

api/v1alpha6/conversion.go

@@ -125,13 +125,16 @@ func restorev1alpha8ClusterStatus(previous *infrav1.OpenStackClusterStatus, dst
 		dst.Network = nil
 	}
 
-	if previous.Bastion != nil {
-		dst.Bastion.ReferencedResources = previous.Bastion.ReferencedResources
-	}
-
 	dst.ControlPlaneSecurityGroup = previous.ControlPlaneSecurityGroup
 	dst.WorkerSecurityGroup = previous.WorkerSecurityGroup
 	dst.BastionSecurityGroup = previous.BastionSecurityGroup
+
+	if previous.Bastion != nil {
+		dst.Bastion.ReferencedResources = previous.Bastion.ReferencedResources
+	}
+	if previous.Bastion != nil && previous.Bastion.DependentResources.PortsStatus != nil {
+		dst.Bastion.DependentResources.PortsStatus = previous.Bastion.DependentResources.PortsStatus
+	}
 }
 
 func restorev1alpha6ClusterSpec(previous *OpenStackClusterSpec, dst *OpenStackClusterSpec) {
@@ -375,7 +378,11 @@ var v1alpha8OpenStackMachineRestorer = conversion.RestorerFor[*infrav1.OpenStack
 		},
 		restorev1alpha8MachineSpec,
 	),
-
+	"depresources": conversion.UnconditionalFieldRestorer(
+		func(c *infrav1.OpenStackMachine) *infrav1.DependentMachineResources {
+			return &c.Status.DependentResources
+		},
+	),
 	// No equivalent in v1alpha6
 	"refresources": conversion.UnconditionalFieldRestorer(
 		func(c *infrav1.OpenStackMachine) *infrav1.ReferencedMachineResources {

api/v1alpha7/conversion.go

@@ -121,9 +121,13 @@ func restorev1alpha8ClusterStatus(previous *infrav1.OpenStackClusterStatus, dst
 	restorev1alpha8SecurityGroupStatus(previous.BastionSecurityGroup, dst.BastionSecurityGroup)
 
 	// ReferencedResources have no equivalent in v1alpha7
-	if dst.Bastion != nil {
+	if previous.Bastion != nil {
 		dst.Bastion.ReferencedResources = previous.Bastion.ReferencedResources
 	}
+
+	if previous.Bastion != nil && previous.Bastion.DependentResources.PortsStatus != nil {
+		dst.Bastion.DependentResources.PortsStatus = previous.Bastion.DependentResources.PortsStatus
+	}
 }
 
 var v1alpha8OpenStackClusterRestorer = conversion.RestorerFor[*infrav1.OpenStackCluster]{
@@ -349,6 +353,11 @@ var v1alpha8OpenStackMachineRestorer = conversion.RestorerFor[*infrav1.OpenStack
 		},
 		restorev1alpha8MachineSpec,
 	),
+	"depresources": conversion.UnconditionalFieldRestorer(
+		func(c *infrav1.OpenStackMachine) *infrav1.DependentMachineResources {
+			return &c.Status.DependentResources
+		},
+	),
 
 	// No equivalent in v1alpha7
 	"refresources": conversion.UnconditionalFieldRestorer(
@@ -688,3 +697,7 @@ func Convert_v1alpha7_SecurityGroup_To_v1alpha8_SecurityGroupStatus(in *Security
 func Convert_v1alpha7_OpenStackIdentityReference_To_v1alpha8_OpenStackIdentityReference(in *OpenStackIdentityReference, out *infrav1.OpenStackIdentityReference, s apiconversion.Scope) error {
 	return autoConvert_v1alpha7_OpenStackIdentityReference_To_v1alpha8_OpenStackIdentityReference(in, out, s)
 }
+
+func Convert_v1alpha8_OpenStackClusterStatus_To_v1alpha7_OpenStackClusterStatus(in *infrav1.OpenStackClusterStatus, out *OpenStackClusterStatus, s apiconversion.Scope) error {
+	return autoConvert_v1alpha8_OpenStackClusterStatus_To_v1alpha7_OpenStackClusterStatus(in, out, s)
+}

api/v1alpha8/openstackmachine_types.go

@@ -119,6 +119,9 @@ type OpenStackMachineStatus struct {
 	// ReferencedResources contains resolved references to resources that the machine depends on.
 	ReferencedResources ReferencedMachineResources `json:"referencedResources,omitempty"`
 
+	// DependentResources contains resolved dependent resources that were created by the machine.
+	DependentResources DependentMachineResources `json:"dependentResources,omitempty"`
+
 	FailureReason *errors.MachineStatusError `json:"failureReason,omitempty"`
 
 	// FailureMessage will be set in the event that there is a terminal problem

api/v1alpha8/types.go

@@ -147,6 +147,12 @@ type PortOpts struct {
 	ValueSpecs []ValueSpec `json:"valueSpecs,omitempty"`
 }
 
+type PortStatus struct {
+	// ID is the unique identifier of the port.
+	// +required
+	ID string `json:"id"`
+}
+
 type BindingProfile struct {
 	// OVSHWOffload enables or disables the OVS hardware offload feature.
 	OVSHWOffload bool `json:"ovsHWOffload,omitempty"`
@@ -175,6 +181,7 @@ type BastionStatus struct {
 	IP                  string                     `json:"ip,omitempty"`
 	FloatingIP          string                     `json:"floatingIP,omitempty"`
 	ReferencedResources ReferencedMachineResources `json:"referencedResources,omitempty"`
+	DependentResources  DependentMachineResources  `json:"dependentResources,omitempty"`
 }
 
 type RootVolume struct {
@@ -496,6 +503,16 @@ type ReferencedMachineResources struct {
 	// ImageID is the ID of the image to use for the machine and is calculated based on ImageFilter.
 	// +optional
 	ImageID string `json:"imageID,omitempty"`
+
+	// portsOpts is the list of ports options to create for the machine.
+	// +optional
+	PortsOpts []PortOpts `json:"portsOpts,omitempty"`
+}
+
+type DependentMachineResources struct {
+	// PortsStatus is the status of the ports created for the machine.
+	// +optional
+	PortsStatus []PortStatus `json:"portsStatus,omitempty"`
 }
 
 // ValueSpec represents a single value_spec key-value pair.