Move FloatingIP to Bastion spec

EmilienM · EmilienM · commit 86a2308a2511 · 2023-11-01T14:52:25.000-04:00
diff --git a/api/v1alpha5/conversion.go b/api/v1alpha5/conversion.go
@@ -437,3 +437,7 @@ 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_Bastion_To_v1alpha5_Bastion(in *infrav1.Bastion, out *Bastion, s conversion.Scope) error {
+	return autoConvert_v1alpha7_Bastion_To_v1alpha5_Bastion(in, out, s)
+}
diff --git a/api/v1alpha5/zz_generated.conversion.go b/api/v1alpha5/zz_generated.conversion.go
diff --git a/api/v1alpha6/conversion.go b/api/v1alpha6/conversion.go
@@ -659,3 +659,7 @@ 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_Bastion_To_v1alpha6_Bastion(in *infrav1.Bastion, out *Bastion, s apiconversion.Scope) error {
+	return autoConvert_v1alpha7_Bastion_To_v1alpha6_Bastion(in, out, s)
+}
diff --git a/api/v1alpha6/zz_generated.conversion.go b/api/v1alpha6/zz_generated.conversion.go
diff --git a/api/v1alpha7/openstackmachine_types.go b/api/v1alpha7/openstackmachine_types.go
@@ -60,10 +60,6 @@ type OpenStackMachineSpec struct {
 	// If not specified a default port will be added for the default cluster network.
 	Ports []PortOpts `json:"ports,omitempty"`
 
-	// The floatingIP which will be associated to the machine, only used for master.
-	// The floatingIP should have been created and haven't been associated.
-	FloatingIP string `json:"floatingIP,omitempty"`
-
 	// The names of the security groups to assign to the instance
 	SecurityGroups []SecurityGroupFilter `json:"securityGroups,omitempty"`
 
diff --git a/api/v1alpha7/types.go b/api/v1alpha7/types.go
@@ -344,6 +344,11 @@ type Bastion struct {
 
 	//+optional
 	AvailabilityZone string `json:"availabilityZone,omitempty"`
+
+	// The floatingIP which will be associated to the bastion machine.
+	// The floatingIP should have been created and hasn't been associated.
+	//+optional
+	FloatingIP string `json:"floatingIP,omitempty"`
 }
 
 type APIServerLoadBalancer struct {
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml
@@ -3767,6 +3767,11 @@ spec:
                     type: string
                   enabled:
                     type: boolean
+                  floatingIP:
+                    description: The floatingIP which will be associated to the bastion
+                      machine. The floatingIP should have been created and hasn't
+                      been associated.
+                    type: string
                   instance:
                     description: Instance for the bastion itself
                     properties:
@@ -3842,11 +3847,6 @@ spec:
                         description: The flavor reference for the flavor for your
                           server instance.
                         type: string
-                      floatingIP:
-                        description: The floatingIP which will be associated to the
-                          machine, only used for master. The floatingIP should have
-                          been created and haven't been associated.
-                        type: string
                       identityRef:
                         description: IdentityRef is a reference to a identity to be
                           used when reconciling this cluster
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclustertemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclustertemplates.yaml
@@ -1607,6 +1607,11 @@ spec:
                             type: string
                           enabled:
                             type: boolean
+                          floatingIP:
+                            description: The floatingIP which will be associated to
+                              the bastion machine. The floatingIP should have been
+                              created and hasn't been associated.
+                            type: string
                           instance:
                             description: Instance for the bastion itself
                             properties:
@@ -1688,11 +1693,6 @@ spec:
                                 description: The flavor reference for the flavor for
                                   your server instance.
                                 type: string
-                              floatingIP:
-                                description: The floatingIP which will be associated
-                                  to the machine, only used for master. The floatingIP
-                                  should have been created and haven't been associated.
-                                type: string
                               identityRef:
                                 description: IdentityRef is a reference to a identity
                                   to be used when reconciling this cluster
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachines.yaml
@@ -1226,11 +1226,6 @@ spec:
               flavor:
                 description: The flavor reference for the flavor for your server instance.
                 type: string
-              floatingIP:
-                description: The floatingIP which will be associated to the machine,
-                  only used for master. The floatingIP should have been created and
-                  haven't been associated.
-                type: string
               identityRef:
                 description: IdentityRef is a reference to a identity to be used when
                   reconciling this cluster
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachinetemplates.yaml
@@ -1030,11 +1030,6 @@ spec:
                         description: The flavor reference for the flavor for your
                           server instance.
                         type: string
-                      floatingIP:
-                        description: The floatingIP which will be associated to the
-                          machine, only used for master. The floatingIP should have
-                          been created and haven't been associated.
-                        type: string
                       identityRef:
                         description: IdentityRef is a reference to a identity to be
                           used when reconciling this cluster
diff --git a/controllers/openstackcluster_controller.go b/controllers/openstackcluster_controller.go
@@ -359,7 +359,7 @@ func reconcileBastion(scope scope.Scope, cluster *clusterv1.Cluster, openStackCl
 		return err
 	}
 	clusterName := fmt.Sprintf("%s-%s", cluster.Namespace, cluster.Name)
-	fp, err := networkingService.GetOrCreateFloatingIP(openStackCluster, openStackCluster, clusterName, openStackCluster.Spec.Bastion.Instance.FloatingIP)
+	fp, err := networkingService.GetOrCreateFloatingIP(openStackCluster, openStackCluster, clusterName, openStackCluster.Spec.Bastion.FloatingIP)
 	if err != nil {
 		handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to get or create floating IP for bastion: %w", err))
 		return fmt.Errorf("failed to get or create floating IP for bastion: %w", err)
diff --git a/docs/book/src/topics/crd-changes/v1alpha6-to-v1alpha7.md b/docs/book/src/topics/crd-changes/v1alpha6-to-v1alpha7.md
@@ -258,6 +258,10 @@ known to cause some issues in some environments.
 
 ### `OpenStackCluster`
 
+#### ⚠️ Change to floatingIP
+
+The `floatingIP` field has moved from the `OpenStackMachineSpec` to the `OpenStackClusterSpec` into the `Bastion` spec.
+
 #### Change to externalRouterIPs.subnet
 
 The `uuid` field is renamed to `id`, and all fields from `filter` are moved directly into the `subnet`.

Original file line number	Diff line number	Diff line change
`@@ -437,3 +437,7 @@ func Convert_v1alpha5_OpenStackClusterStatus_To_v1alpha7_OpenStackClusterStatus(`
`437`	`437`	`func Convert_v1alpha7_OpenStackMachineSpec_To_v1alpha5_OpenStackMachineSpec(in infrav1.OpenStackMachineSpec, out OpenStackMachineSpec, s conversion.Scope) error {`
`438`	`438`	`return autoConvert_v1alpha7_OpenStackMachineSpec_To_v1alpha5_OpenStackMachineSpec(in, out, s)`
`439`	`439`	`}`
	`440`	`+`
	`441`	`+func Convert_v1alpha7_Bastion_To_v1alpha5_Bastion(in infrav1.Bastion, out Bastion, s conversion.Scope) error {`
	`442`	`+ return autoConvert_v1alpha7_Bastion_To_v1alpha5_Bastion(in, out, s)`
	`443`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -659,3 +659,7 @@ func Convert_v1alpha6_OpenStackClusterStatus_To_v1alpha7_OpenStackClusterStatus(`
`659`	`659`	`func Convert_v1alpha7_OpenStackMachineSpec_To_v1alpha6_OpenStackMachineSpec(in infrav1.OpenStackMachineSpec, out OpenStackMachineSpec, s apiconversion.Scope) error {`
`660`	`660`	`return autoConvert_v1alpha7_OpenStackMachineSpec_To_v1alpha6_OpenStackMachineSpec(in, out, s)`
`661`	`661`	`}`
	`662`	`+`
	`663`	`+func Convert_v1alpha7_Bastion_To_v1alpha6_Bastion(in infrav1.Bastion, out Bastion, s apiconversion.Scope) error {`
	`664`	`+ return autoConvert_v1alpha7_Bastion_To_v1alpha6_Bastion(in, out, s)`
	`665`	`+}`