Skip to content

Commit 23642f8

Browse files
committed
fix: enable managedAPIServerLoadBalancer w/ existing network
Signed-off-by: Gregory Detal <[email protected]>
1 parent 631b1ff commit 23642f8

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

controllers/openstackcluster_controller.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,8 @@ func (r *OpenStackClusterReconciler) reconcileDelete(ctx context.Context, log lo
158158
log.Info("OpenStack router deleted successfully")
159159
}
160160

161-
if openStackCluster.Status.Network != nil {
161+
// if NodeCIDR was not set, no network was created.
162+
if openStackCluster.Status.Network != nil && openStackCluster.Spec.NodeCIDR != "" {
162163
log.Info("Deleting network", "name", openStackCluster.Status.Network.Name)
163164
if err := networkingService.DeleteNetwork(openStackCluster.Status.Network); err != nil {
164165
return ctrl.Result{}, errors.Errorf("failed to delete network: %v", err)
@@ -249,6 +250,13 @@ func (r *OpenStackClusterReconciler) reconcileNormal(ctx context.Context, log lo
249250
Name: subnetList[0].Name,
250251
CIDR: subnetList[0].CIDR,
251252
}
253+
254+
if openStackCluster.Spec.ManagedAPIServerLoadBalancer {
255+
err = loadBalancerService.ReconcileLoadBalancer(clusterName, openStackCluster)
256+
if err != nil {
257+
return reconcile.Result{}, errors.Errorf("failed to reconcile load balancer: %v", err)
258+
}
259+
}
252260
} else {
253261
err := networkingService.ReconcileNetwork(clusterName, openStackCluster)
254262
if err != nil {

0 commit comments

Comments
 (0)