only use loadbalaner reference if needed

kubernetes-sigs · Sep 1, 2021 · da1f9f3 · da1f9f3
1 parent 4e178f0
commit da1f9f3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/controllers/openstackcluster_controller.go b/controllers/openstackcluster_controller.go
@@ -136,14 +136,14 @@ func reconcileDelete(ctx context.Context, log logr.Logger, client client.Client,
 		return reconcile.Result{}, err
 	}
 
-	loadBalancerService, err := loadbalancer.NewService(osProviderClient, clientOpts, log)
-	if err != nil {
-		return reconcile.Result{}, err
-	}
-
 	clusterName := fmt.Sprintf("%s-%s", cluster.Namespace, cluster.Name)
 
 	if openStackCluster.Spec.ManagedAPIServerLoadBalancer {
+		loadBalancerService, err := loadbalancer.NewService(osProviderClient, clientOpts, log)
+		if err != nil {
+			return reconcile.Result{}, err
+		}
+
 		if err = loadBalancerService.DeleteLoadBalancer(openStackCluster, clusterName); err != nil {
 			handleUpdateOSCError(openStackCluster, errors.Errorf("failed to delete load balancer: %v", err))
 			return reconcile.Result{}, errors.Errorf("failed to delete load balancer: %v", err)
@@ -365,18 +365,14 @@ func reconcileBastion(log logr.Logger, osProviderClient *gophercloud.ProviderCli
 }
 
 func reconcileNetworkComponents(log logr.Logger, osProviderClient *gophercloud.ProviderClient, clientOpts *clientconfig.ClientOpts, cluster *clusterv1.Cluster, openStackCluster *infrav1.OpenStackCluster) error {
+	var loadBalancerService *loadbalancer.Service
 	clusterName := fmt.Sprintf("%s-%s", cluster.Namespace, cluster.Name)
 
 	networkingService, err := networking.NewService(osProviderClient, clientOpts, log)
 	if err != nil {
 		return err
 	}
 
-	loadBalancerService, err := loadbalancer.NewService(osProviderClient, clientOpts, log)
-	if err != nil {
-		return err
-	}
-
 	log.Info("Reconciling network components")
 
 	err = networkingService.ReconcileExternalNetwork(openStackCluster)
@@ -468,6 +464,11 @@ func reconcileNetworkComponents(log logr.Logger, osProviderClient *gophercloud.P
 	}
 
 	if openStackCluster.Spec.ManagedAPIServerLoadBalancer {
+		loadBalancerService, err = loadbalancer.NewService(osProviderClient, clientOpts, log)
+		if err != nil {
+			return err
+		}
+
 		err = loadBalancerService.ReconcileLoadBalancer(openStackCluster, clusterName)
 		if err != nil {
 			handleUpdateOSCError(openStackCluster, errors.Errorf("failed to reconcile load balancer: %v", err))

diff --git a/controllers/openstackmachine_controller.go b/controllers/openstackmachine_controller.go
@@ -205,11 +205,12 @@ func (r *OpenStackMachineReconciler) reconcileDelete(ctx context.Context, logger
 		return ctrl.Result{}, err
 	}
 
-	loadBalancerService, err := loadbalancer.NewService(osProviderClient, clientOpts, logger)
-	if err != nil {
-		return ctrl.Result{}, err
-	}
 	if openStackCluster.Spec.ManagedAPIServerLoadBalancer {
+		loadBalancerService, err := loadbalancer.NewService(osProviderClient, clientOpts, logger)
+		if err != nil {
+			return ctrl.Result{}, err
+		}
+
 		err = loadBalancerService.DeleteLoadBalancerMember(openStackCluster, machine, openStackMachine, clusterName)
 		if err != nil {
 			return ctrl.Result{}, err