Skip to content

Commit 480a755

Browse files
committed
only use loadbalaner reference if needed
1 parent 881c24b commit 480a755

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

controllers/openstackcluster_controller.go

+12-8
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,15 @@ 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+
143+
loadBalancerService, err := loadbalancer.NewService(osProviderClient, clientOpts, log)
144+
if err != nil {
145+
return reconcile.Result{}, err
146+
}
147+
147148
if err = loadBalancerService.DeleteLoadBalancer(openStackCluster, clusterName); err != nil {
148149
handleUpdateOSCError(openStackCluster, errors.Errorf("failed to delete load balancer: %v", err))
149150
return reconcile.Result{}, errors.Errorf("failed to delete load balancer: %v", err)
@@ -365,16 +366,19 @@ func reconcileBastion(log logr.Logger, osProviderClient *gophercloud.ProviderCli
365366
}
366367

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

370372
networkingService, err := networking.NewService(osProviderClient, clientOpts, log)
371373
if err != nil {
372374
return err
373375
}
374376

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

380384
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)