Skip to content

only use loadbalaner reference if needed #978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 1, 2021
Merged

only use loadbalaner reference if needed #978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions controllers/openstackcluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -372,11 +372,6 @@ func reconcileNetworkComponents(log logr.Logger, osProviderClient *gophercloud.P
return err
}

loadBalancerService, err := loadbalancer.NewService(osProviderClient, clientOpts, log)
if err != nil {
return err
}

log.Info("Reconciling network components")

err = networkingService.ReconcileExternalNetwork(openStackCluster)
Expand Down Expand Up @@ -468,6 +463,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))
Expand Down
9 changes: 5 additions & 4 deletions controllers/openstackmachine_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down