Skip to content

Commit 7a40347

Browse files
committed
fix: enable managedAPIServerLoadBalancer w/ existing network
Signed-off-by: Gregory Detal <[email protected]>
1 parent 2fe8b0b commit 7a40347

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

controllers/openstackcluster_controller.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,8 @@ func (r *OpenStackClusterReconciler) reconcileDelete(ctx context.Context, log lo
160160
log.Info("OpenStack router deleted successfully")
161161
}
162162

163-
if openStackCluster.Status.Network != nil {
163+
// if NodeCIDR was not set, no network was created.
164+
if openStackCluster.Status.Network != nil && openStackCluster.Spec.NodeCIDR != "" {
164165
log.Info("Deleting network", "name", openStackCluster.Status.Network.Name)
165166
if err := networkingService.DeleteNetwork(openStackCluster.Status.Network); err != nil {
166167
return ctrl.Result{}, errors.Errorf("failed to delete network: %v", err)
@@ -334,11 +335,12 @@ func (r *OpenStackClusterReconciler) reconcileNetworkComponents(log logr.Logger,
334335
if err != nil {
335336
return errors.Errorf("failed to reconcile router: %v", err)
336337
}
337-
if openStackCluster.Spec.ManagedAPIServerLoadBalancer {
338-
err = loadBalancerService.ReconcileLoadBalancer(clusterName, openStackCluster)
339-
if err != nil {
340-
return errors.Errorf("failed to reconcile load balancer: %v", err)
341-
}
338+
}
339+
340+
if openStackCluster.Spec.ManagedAPIServerLoadBalancer {
341+
err = loadBalancerService.ReconcileLoadBalancer(clusterName, openStackCluster)
342+
if err != nil {
343+
return errors.Errorf("failed to reconcile load balancer: %v", err)
342344
}
343345
}
344346

0 commit comments

Comments
 (0)