Merge pull request kubernetes-sigs#1762 from elastx/floating_ip_from_pool

✨ Adds IPAM support for floating ips in OpenStackMachine

Author: k8s-ci-robot

api/v1alpha5/zz_generated.conversion.go

@@ -166,6 +166,7 @@ func restorev1beta1MachineSpec(previous *infrav1.OpenStackMachineSpec, dst *infr
 	dst.AdditionalBlockDevices = previous.AdditionalBlockDevices
 	dst.ServerGroup = previous.ServerGroup
 	dst.Image = previous.Image
+	dst.FloatingIPPoolRef = previous.FloatingIPPoolRef
 }
 
 func convertNetworksToPorts(networks []NetworkParam, s apiconversion.Scope) ([]infrav1.PortOpts, error) {

api/v1alpha6/openstackmachine_conversion.go

@@ -142,6 +142,7 @@ func restorev1beta1MachineSpec(previous *infrav1.OpenStackMachineSpec, dst *infr
 			restorev1beta1Port(&previous.Ports[i], &dst.Ports[i])
 		}
 	}
+	dst.FloatingIPPoolRef = previous.FloatingIPPoolRef
 }
 
 func Convert_v1alpha7_OpenStackMachineSpec_To_v1beta1_OpenStackMachineSpec(in *OpenStackMachineSpec, out *infrav1.OpenStackMachineSpec, s apiconversion.Scope) error {

api/v1alpha6/zz_generated.conversion.go

@@ -53,3 +53,12 @@ const (
 	// FloatingIPErrorReason used when the floating ip could not be created or attached.
 	FloatingIPErrorReason = "FloatingIPError"
 )
+
+const (
+	// FloatingAddressFromPoolReadyCondition reports on the current status of the Floating IPs from ipam pool.
+	FloatingAddressFromPoolReadyCondition clusterv1.ConditionType = "FloatingAddressFromPoolReady"
+	// WaitingForIpamProviderReason used when machine is waiting for ipam provider to be ready before proceeding.
+	FloatingAddressFromPoolWaitingForIpamProviderReason = "WaitingForIPAMProvider"
+	// FloatingAddressFromPoolErrorReason is used when there is an error attaching an IP from the pool to an machine.
+	FloatingAddressFromPoolErrorReason = "FloatingIPError"
+)

api/v1alpha7/openstackmachine_conversion.go

@@ -27,7 +27,8 @@ import (
 const (
 	// MachineFinalizer allows ReconcileOpenStackMachine to clean up OpenStack resources associated with OpenStackMachine before
 	// removing it from the apiserver.
-	MachineFinalizer = "openstackmachine.infrastructure.cluster.x-k8s.io"
+	MachineFinalizer        = "openstackmachine.infrastructure.cluster.x-k8s.io"
+	IPClaimMachineFinalizer = "openstackmachine.infrastructure.cluster.x-k8s.io/ip-claim"
 )
 
 // OpenStackMachineSpec defines the desired state of OpenStackMachine.
@@ -90,6 +91,12 @@ type OpenStackMachineSpec struct {
 	// credentials specified in the cluster will be used.
 	// +optional
 	IdentityRef *OpenStackIdentityReference `json:"identityRef,omitempty"`
+
+	// floatingIPPoolRef is a reference to a IPPool that will be assigned
+	// to an IPAddressClaim. Once the IPAddressClaim is fulfilled, the FloatingIP
+	// will be assigned to the OpenStackMachine.
+	// +optional
+	FloatingIPPoolRef *corev1.TypedLocalObjectReference `json:"floatingIPPoolRef,omitempty"`
 }
 
 type ServerMetadata struct {

api/v1alpha7/zz_generated.conversion.go

@@ -4996,6 +4996,29 @@ spec:
                         description: The flavor reference for the flavor for your
                           server instance.
                         type: string
+                      floatingIPPoolRef:
+                        description: |-
+                          floatingIPPoolRef is a reference to a IPPool that will be assigned
+                          to an IPAddressClaim. Once the IPAddressClaim is fulfilled, the FloatingIP
+                          will be assigned to the OpenStackMachine.
+                        properties:
+                          apiGroup:
+                            description: |-
+                              APIGroup is the group for the resource being referenced.
+                              If APIGroup is not specified, the specified Kind must be in the core API group.
+                              For any other third-party types, APIGroup is required.
+                            type: string
+                          kind:
+                            description: Kind is the type of resource being referenced
+                            type: string
+                          name:
+                            description: Name is the name of resource being referenced
+                            type: string
+                        required:
+                        - kind
+                        - name
+                        type: object
+                        x-kubernetes-map-type: atomic
                       identityRef:
                         description: |-
                           IdentityRef is a reference to a secret holding OpenStack credentials

api/v1beta1/conditions_consts.go

@@ -2421,6 +2421,31 @@ spec:
                                 description: The flavor reference for the flavor for
                                   your server instance.
                                 type: string
+                              floatingIPPoolRef:
+                                description: |-
+                                  floatingIPPoolRef is a reference to a IPPool that will be assigned
+                                  to an IPAddressClaim. Once the IPAddressClaim is fulfilled, the FloatingIP
+                                  will be assigned to the OpenStackMachine.
+                                properties:
+                                  apiGroup:
+                                    description: |-
+                                      APIGroup is the group for the resource being referenced.
+                                      If APIGroup is not specified, the specified Kind must be in the core API group.
+                                      For any other third-party types, APIGroup is required.
+                                    type: string
+                                  kind:
+                                    description: Kind is the type of resource being
+                                      referenced
+                                    type: string
+                                  name:
+                                    description: Name is the name of resource being
+                                      referenced
+                                    type: string
+                                required:
+                                - kind
+                                - name
+                                type: object
+                                x-kubernetes-map-type: atomic
                               identityRef:
                                 description: |-
                                   IdentityRef is a reference to a secret holding OpenStack credentials