Merge pull request #1998 from elastx/issue#1997

🐛 Make floatingIPNetwork a pointer and if there's only one external network use it as default
kubernetes-sigs · Apr 4, 2024 · d2d1cb2 · d2d1cb2
2 parents 78f7b3f + 9c66684
commit d2d1cb2
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 4 deletions.
diff --git a/api/v1alpha1/conditions_consts.go b/api/v1alpha1/conditions_consts.go
@@ -22,4 +22,7 @@ const (
 
 	// MaxIPsReachedReason is set when the maximum number of floating IPs has been reached.
 	MaxIPsReachedReason = "MaxIPsReached"
+
+	// UnableToFindFloatingIPNetworkReason is used when the floating ip network is not found.
+	UnableToFindNetwork = "UnableToFindNetwork"
 )
diff --git a/api/v1alpha1/openstackfloatingippool_types.go b/api/v1alpha1/openstackfloatingippool_types.go
@@ -63,10 +63,9 @@ type OpenStackFloatingIPPoolSpec struct {
 
 	// FloatingIPNetwork is the external network to use for floating ips, if there's only one external network it will be used by default
 	// +optional
-	FloatingIPNetwork infrav1.NetworkParam `json:"floatingIPNetwork"`
+	FloatingIPNetwork *infrav1.NetworkParam `json:"floatingIPNetwork"`
 
 	// The stratergy to use for reclaiming floating ips when they are released from a machine
-	// +kubebuilder:validation:Optional
 	// +kubebuilder:validation:Enum=Retain;Delete
 	ReclaimPolicy ReclaimPolicy `json:"reclaimPolicy"`
 }

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/api/v1beta1/conditions_consts.go b/api/v1beta1/conditions_consts.go
@@ -61,4 +61,6 @@ const (
 	FloatingAddressFromPoolWaitingForIpamProviderReason = "WaitingForIPAMProvider"
 	// FloatingAddressFromPoolErrorReason is used when there is an error attaching an IP from the pool to an machine.
 	FloatingAddressFromPoolErrorReason = "FloatingIPError"
+	// UnableToFindFloatingIPNetworkReason is used when the floating ip network is not found.
+	UnableToFindFloatingIPNetworkReason = "UnableToFindFloatingIPNetwork"
 )
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackfloatingippools.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackfloatingippools.yaml
diff --git a/controllers/openstackfloatingippool_controller.go b/controllers/openstackfloatingippool_controller.go
@@ -398,8 +398,19 @@ func (r *OpenStackFloatingIPPoolReconciler) reconcileFloatingIPNetwork(scope *sc
 		return err
 	}
 
-	network, err := networkingService.GetNetworkByParam(&pool.Spec.FloatingIPNetwork)
+	// If the pool does not have a network, we default to a external network if there's only one
+	var networkParam *infrav1.NetworkParam
+	if pool.Spec.FloatingIPNetwork == nil {
+		networkParam = &infrav1.NetworkParam{
+			Filter: &infrav1.NetworkFilter{},
+		}
+	} else {
+		networkParam = pool.Spec.FloatingIPNetwork
+	}
+
+	network, err := networkingService.GetNetworkByParam(networkParam, networking.ExternalNetworksOnly)
 	if err != nil {
+		conditions.MarkFalse(pool, infrav1alpha1.OpenstackFloatingIPPoolReadyCondition, infrav1alpha1.UnableToFindNetwork, clusterv1.ConditionSeverityError, "Failed to find network: %v", err)
 		return fmt.Errorf("failed to find network: %w", err)
 	}