Skip to content

Commit 1948e33

Browse files
committed
Code Improvements
1 parent f735079 commit 1948e33

File tree

2 files changed

+87
-237
lines changed

2 files changed

+87
-237
lines changed

controllers/ibmpowervsmachine_controller.go

+5-6
Original file line numberDiff line numberDiff line change
@@ -200,10 +200,6 @@ func (r *IBMPowerVSMachineReconciler) getOrCreate(scope *scope.PowerVSMachineSco
200200

201201
// handleLoadBalancerPoolMemberConfiguration handles loadbalancer pool member creation flow.
202202
func (r *IBMPowerVSMachineReconciler) handleLoadBalancerPoolMemberConfiguration(machineScope *scope.PowerVSMachineScope) (ctrl.Result, error) {
203-
if !util.IsControlPlaneMachine(machineScope.Machine) {
204-
return ctrl.Result{}, nil
205-
}
206-
machineScope.Info("Configuring control plane machine to backend LoadBalancer pool", "machine name", machineScope.IBMPowerVSMachine.Name)
207203
poolMember, err := machineScope.CreateVPCLoadBalancerPoolMember()
208204
if err != nil {
209205
return ctrl.Result{}, fmt.Errorf("failed CreateVPCLoadBalancerPoolMember %s: %w", machineScope.IBMPowerVSMachine.Name, err)
@@ -216,6 +212,8 @@ func (r *IBMPowerVSMachineReconciler) handleLoadBalancerPoolMemberConfiguration(
216212
}
217213

218214
func (r *IBMPowerVSMachineReconciler) reconcileNormal(machineScope *scope.PowerVSMachineScope) (ctrl.Result, error) {
215+
ctx := context.Background()
216+
log := ctrl.LoggerFrom(ctx)
219217
machineScope.Info("Reconciling IBMPowerVSMachine")
220218

221219
if !machineScope.Cluster.Status.InfrastructureReady {
@@ -307,8 +305,9 @@ func (r *IBMPowerVSMachineReconciler) reconcileNormal(machineScope *scope.PowerV
307305
return ctrl.Result{}, nil
308306
}
309307

310-
if poolMemberReconcileResult, err := r.handleLoadBalancerPoolMemberConfiguration(machineScope); err != nil || poolMemberReconcileResult.RequeueAfter > 0 {
311-
return poolMemberReconcileResult, err
308+
if util.IsControlPlaneMachine(machineScope.Machine) {
309+
log.V(3).Info("skipping loadbalancer configuration as it is not control plane machine", "machineName", machineScope.IBMPowerVSMachine.Name)
310+
return r.handleLoadBalancerPoolMemberConfiguration(machineScope)
312311
}
313312

314313
return ctrl.Result{}, nil

0 commit comments

Comments
 (0)