Move floating IP control into machine

Author: mikaelgron

api/v1alpha5/zz_generated.conversion.go

@@ -75,12 +75,8 @@ type OpenStackClusterSpec struct {
 	// +optional
 	APIServerLoadBalancer APIServerLoadBalancer `json:"apiServerLoadBalancer,omitempty"`
 
-	// EnableWorkersFloatingIP determines whether or not to attempt to attach a floating
-	// IP to the worker nodes. This allows for the user to white list worker requests in
-	// external external services.
-	// It must be activated by setting `enabled: true`.
-	// +optional
-	EnableWorkersFloatingIP bool `json:"enableWorkersFloatingIP,omitempty"`
+	// Configure floating IP for the worker nodes
+	WorkerFloatingIPConfig WorkerFloatingIPConfig `json:"workerFloatingIPConfig,omitempty"`
 
 	// DisableAPIServerFloatingIP determines whether or not to attempt to attach a floating
 	// IP to the API server. This allows for the creation of clusters when attaching a floating

api/v1alpha6/zz_generated.conversion.go

@@ -29,6 +29,11 @@ type ExternalRouterIPParam struct {
 	Subnet SubnetFilter `json:"subnet"`
 }
 
+type WorkerFloatingIPConfig struct {
+	Enabled     bool     `json:"enabled,omitempty"`
+	IPAddresses []string `json:"ipAddresses,omitempty"`
+}
+
 type SecurityGroupFilter struct {
 	ID          string `json:"id,omitempty"`
 	Name        string `json:"name,omitempty"`

api/v1alpha7/openstackcluster_types.go

@@ -4166,12 +4166,6 @@ spec:
                   type: string
                 type: array
                 x-kubernetes-list-type: set
-              enableWorkersFloatingIP:
-                description: 'EnableWorkersFloatingIP determines whether or not to
-                  attempt to attach a floating IP to the worker nodes. This allows
-                  for the user to white list worker requests in external external
-                  services. It must be activated by setting `enabled: true`.'
-                type: boolean
               externalNetworkId:
                 description: ExternalNetworkID is the ID of an external OpenStack
                   Network. This is necessary to get public internet to the VMs.
@@ -4339,6 +4333,16 @@ spec:
                   type: string
                 type: array
                 x-kubernetes-list-type: set
+              workerFloatingIPConfig:
+                description: Configure floating IP for the worker nodes
+                properties:
+                  enabled:
+                    type: boolean
+                  ipAddresses:
+                    items:
+                      type: string
+                    type: array
+                type: object
             type: object
           status:
             description: OpenStackClusterStatus defines the observed state of OpenStackCluster.