Skip to content

Commit 05bab1d

Browse files
committed
only use loadbalaner reference if needed
1 parent 4e178f0 commit 05bab1d

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

controllers/openstackcluster_controller.go

+11-8
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,14 @@ func reconcileDelete(ctx context.Context, log logr.Logger, client client.Client,
136136
return reconcile.Result{}, err
137137
}
138138

139-
loadBalancerService, err := loadbalancer.NewService(osProviderClient, clientOpts, log)
140-
if err != nil {
141-
return reconcile.Result{}, err
142-
}
143-
144139
clusterName := fmt.Sprintf("%s-%s", cluster.Namespace, cluster.Name)
145140

146141
if openStackCluster.Spec.ManagedAPIServerLoadBalancer {
142+
loadBalancerService, err := loadbalancer.NewService(osProviderClient, clientOpts, log)
143+
if err != nil {
144+
return reconcile.Result{}, err
145+
}
146+
147147
if err = loadBalancerService.DeleteLoadBalancer(openStackCluster, clusterName); err != nil {
148148
handleUpdateOSCError(openStackCluster, errors.Errorf("failed to delete load balancer: %v", err))
149149
return reconcile.Result{}, errors.Errorf("failed to delete load balancer: %v", err)
@@ -365,16 +365,19 @@ func reconcileBastion(log logr.Logger, osProviderClient *gophercloud.ProviderCli
365365
}
366366

367367
func reconcileNetworkComponents(log logr.Logger, osProviderClient *gophercloud.ProviderClient, clientOpts *clientconfig.ClientOpts, cluster *clusterv1.Cluster, openStackCluster *infrav1.OpenStackCluster) error {
368+
var loadBalancerService *loadbalancer.Service
368369
clusterName := fmt.Sprintf("%s-%s", cluster.Namespace, cluster.Name)
369370

370371
networkingService, err := networking.NewService(osProviderClient, clientOpts, log)
371372
if err != nil {
372373
return err
373374
}
374375

375-
loadBalancerService, err := loadbalancer.NewService(osProviderClient, clientOpts, log)
376-
if err != nil {
377-
return err
376+
if openStackCluster.Spec.ManagedAPIServerLoadBalancer {
377+
loadBalancerService, err = loadbalancer.NewService(osProviderClient, clientOpts, log)
378+
if err != nil {
379+
return err
380+
}
378381
}
379382

380383
log.Info("Reconciling network components")

controllers/openstackmachine_controller.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -205,11 +205,12 @@ func (r *OpenStackMachineReconciler) reconcileDelete(ctx context.Context, logger
205205
return ctrl.Result{}, err
206206
}
207207

208-
loadBalancerService, err := loadbalancer.NewService(osProviderClient, clientOpts, logger)
209-
if err != nil {
210-
return ctrl.Result{}, err
211-
}
212208
if openStackCluster.Spec.ManagedAPIServerLoadBalancer {
209+
loadBalancerService, err := loadbalancer.NewService(osProviderClient, clientOpts, logger)
210+
if err != nil {
211+
return ctrl.Result{}, err
212+
}
213+
213214
err = loadBalancerService.DeleteLoadBalancerMember(openStackCluster, machine, openStackMachine, clusterName)
214215
if err != nil {
215216
return ctrl.Result{}, err

0 commit comments

Comments
 (0)