Skip to content

Commit f695a54

Browse files
carmal891carmal891
committed
Refactor reconcileNormal function to accept context from caller
1 parent eb584e8 commit f695a54

4 files changed

+43
-40
lines changed

‎controllers/ibmpowervsmachine_controller.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ func (r *IBMPowerVSMachineReconciler) Reconcile(ctx context.Context, req ctrl.Re
156156
}
157157

158158
// Handle non-deleted machines.
159-
return r.reconcileNormal(machineScope)
159+
return r.reconcileNormal(ctx, machineScope)
160160
}
161161

162162
func (r *IBMPowerVSMachineReconciler) reconcileDelete(scope *scope.PowerVSMachineScope) (_ ctrl.Result, reterr error) {
@@ -207,26 +207,27 @@ func (r *IBMPowerVSMachineReconciler) handleLoadBalancerPoolMemberConfiguration(
207207
return ctrl.Result{}, nil
208208
}
209209

210-
func (r *IBMPowerVSMachineReconciler) reconcileNormal(machineScope *scope.PowerVSMachineScope) (ctrl.Result, error) {
211-
machineScope.Info("Reconciling IBMPowerVSMachine")
210+
func (r *IBMPowerVSMachineReconciler) reconcileNormal(ctx context.Context, machineScope *scope.PowerVSMachineScope) (ctrl.Result, error) {
211+
log := ctrl.LoggerFrom(ctx)
212+
log.V(3).Info("Reconciling IBMPowerVSMachine")
212213

213214
if !machineScope.Cluster.Status.InfrastructureReady {
214-
machineScope.Info("Cluster infrastructure is not ready yet")
215+
log.V(3).Info("Cluster infrastructure is not ready yet")
215216
conditions.MarkFalse(machineScope.IBMPowerVSMachine, infrav1beta2.InstanceReadyCondition, infrav1beta2.WaitingForClusterInfrastructureReason, capiv1beta1.ConditionSeverityInfo, "")
216217
return ctrl.Result{RequeueAfter: 1 * time.Minute}, nil
217218
}
218219

219220
if machineScope.IBMPowerVSImage != nil {
220221
if !machineScope.IBMPowerVSImage.Status.Ready {
221-
machineScope.Info("IBMPowerVSImage is not ready yet")
222+
log.V(3).Info("IBMPowerVSImage is not ready yet")
222223
conditions.MarkFalse(machineScope.IBMPowerVSMachine, infrav1beta2.InstanceReadyCondition, infrav1beta2.WaitingForIBMPowerVSImageReason, capiv1beta1.ConditionSeverityInfo, "")
223224
return ctrl.Result{RequeueAfter: 1 * time.Minute}, nil
224225
}
225226
}
226227

227228
// Make sure bootstrap data is available and populated.
228229
if machineScope.Machine.Spec.Bootstrap.DataSecretName == nil {
229-
machineScope.Info("Bootstrap data secret reference is not yet available")
230+
log.V(3).Info("Bootstrap data secret reference is not yet available")
230231
conditions.MarkFalse(machineScope.IBMPowerVSMachine, infrav1beta2.InstanceReadyCondition, infrav1beta2.WaitingForBootstrapDataReason, capiv1beta1.ConditionSeverityInfo, "")
231232
return ctrl.Result{RequeueAfter: 1 * time.Minute}, nil
232233
}
@@ -237,7 +238,7 @@ func (r *IBMPowerVSMachineReconciler) reconcileNormal(machineScope *scope.PowerV
237238

238239
ins, err := r.getOrCreate(machineScope)
239240
if err != nil {
240-
machineScope.Error(err, "Unable to create instance")
241+
log.V(3).Error(err, "Bootstrap data secret reference is not yet available")
241242
conditions.MarkFalse(machineScope.IBMPowerVSMachine, infrav1beta2.InstanceReadyCondition, infrav1beta2.InstanceProvisionFailedReason, capiv1beta1.ConditionSeverityError, "%s", err.Error())
242243
return ctrl.Result{}, fmt.Errorf("failed to reconcile VSI for IBMPowerVSMachine %s/%s: %w", machineScope.IBMPowerVSMachine.Namespace, machineScope.IBMPowerVSMachine.Name, err)
243244
}
@@ -278,7 +279,7 @@ func (r *IBMPowerVSMachineReconciler) reconcileNormal(machineScope *scope.PowerV
278279
return ctrl.Result{}, nil
279280
default:
280281
machineScope.SetNotReady()
281-
machineScope.Info("PowerVS instance state is undefined", "state", *instance.Status, "instance-id", machineScope.GetInstanceID())
282+
log.V(3).Info("PowerVS instance state is undefined", "state", *instance.Status, "instance-id", machineScope.GetInstanceID())
282283
conditions.MarkUnknown(machineScope.IBMPowerVSMachine, infrav1beta2.InstanceReadyCondition, "", "")
283284
}
284285
} else {
@@ -291,24 +292,23 @@ func (r *IBMPowerVSMachineReconciler) reconcileNormal(machineScope *scope.PowerV
291292
}
292293

293294
if machineScope.IBMPowerVSCluster.Spec.VPC == nil || machineScope.IBMPowerVSCluster.Spec.VPC.Region == nil {
294-
machineScope.Info("Skipping configuring machine to loadbalancer as VPC is not set")
295+
log.V(3).Info("Skipping configuring machine to loadbalancer as VPC is not set")
295296
return ctrl.Result{}, nil
296297
}
297298

298299
// Register instance with load balancer
299-
machineScope.Info("updating loadbalancer for machine", "name", machineScope.IBMPowerVSMachine.Name)
300+
log.V(3).Info("Updating loadbalancer for machine", "name", machineScope.IBMPowerVSMachine.Name)
300301
internalIP := machineScope.GetMachineInternalIP()
301302
if internalIP == "" {
302-
machineScope.Info("Unable to update the LoadBalancer, Machine internal IP not yet set", "machineName", machineScope.IBMPowerVSMachine.Name)
303+
log.V(3).Info("Unable to update the LoadBalancer, Machine internal IP not yet set", "machineName", machineScope.IBMPowerVSMachine.Name)
303304
return ctrl.Result{}, nil
304305
}
305306

306307
if util.IsControlPlaneMachine(machineScope.Machine) {
307-
machineScope.Info("Configuring loadbalancer configuration for control plane machine", "machineName", machineScope.IBMPowerVSMachine.Name)
308+
log.V(3).Info("Configuring loadbalancer configuration for control plane machine", "machineName", machineScope.IBMPowerVSMachine.Name)
308309
return r.handleLoadBalancerPoolMemberConfiguration(machineScope)
309310
}
310-
machineScope.Info("skipping loadbalancer configuration for worker machine", "machineName", machineScope.IBMPowerVSMachine.Name)
311-
311+
log.V(3).Info("skipping loadbalancer configuration for worker machine", "machineName", machineScope.IBMPowerVSMachine.Name)
312312
return ctrl.Result{}, nil
313313
}
314314

‎controllers/ibmpowervsmachine_controller_test.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ func TestIBMPowerVSMachineReconciler_ReconcileOperations(t *testing.T) {
389389
},
390390
IBMPowerVSMachine: &infrav1beta2.IBMPowerVSMachine{},
391391
}
392-
result, err := reconciler.reconcileNormal(machineScope)
392+
result, err := reconciler.reconcileNormal(ctx, machineScope)
393393
g.Expect(err).To(BeNil())
394394
g.Expect(result.RequeueAfter).To(Not(BeZero()))
395395
expectConditions(g, machineScope.IBMPowerVSMachine, []conditionAssertion{{infrav1beta2.InstanceReadyCondition, corev1.ConditionFalse, capiv1beta1.ConditionSeverityInfo, infrav1beta2.WaitingForClusterInfrastructureReason}})
@@ -412,7 +412,7 @@ func TestIBMPowerVSMachineReconciler_ReconcileOperations(t *testing.T) {
412412
},
413413
},
414414
}
415-
result, err := reconciler.reconcileNormal(machineScope)
415+
result, err := reconciler.reconcileNormal(ctx, machineScope)
416416
g.Expect(err).To(BeNil())
417417
g.Expect(result.RequeueAfter).To(Not(BeZero()))
418418
expectConditions(g, machineScope.IBMPowerVSMachine, []conditionAssertion{{infrav1beta2.InstanceReadyCondition, corev1.ConditionFalse, capiv1beta1.ConditionSeverityInfo, infrav1beta2.WaitingForIBMPowerVSImageReason}})
@@ -436,7 +436,7 @@ func TestIBMPowerVSMachineReconciler_ReconcileOperations(t *testing.T) {
436436
},
437437
},
438438
}
439-
result, err := reconciler.reconcileNormal(machineScope)
439+
result, err := reconciler.reconcileNormal(ctx, machineScope)
440440
g.Expect(err).To(BeNil())
441441
g.Expect(result.RequeueAfter).To(Not(BeZero()))
442442
expectConditions(g, machineScope.IBMPowerVSMachine, []conditionAssertion{{infrav1beta2.InstanceReadyCondition, corev1.ConditionFalse, capiv1beta1.ConditionSeverityInfo, infrav1beta2.WaitingForBootstrapDataReason}})
@@ -468,7 +468,7 @@ func TestIBMPowerVSMachineReconciler_ReconcileOperations(t *testing.T) {
468468
}
469469
mockpowervs.EXPECT().GetAllInstance().Return(instances, nil)
470470

471-
result, err := reconciler.reconcileNormal(machineScope)
471+
result, err := reconciler.reconcileNormal(ctx, machineScope)
472472
g.Expect(err).To(HaveOccurred())
473473
g.Expect(result.RequeueAfter).To(BeZero())
474474
g.Expect(machineScope.IBMPowerVSMachine.Finalizers).To(ContainElement(infrav1beta2.IBMPowerVSMachineFinalizer))
@@ -564,7 +564,7 @@ func TestIBMPowerVSMachineReconciler_ReconcileOperations(t *testing.T) {
564564
mockpowervs.EXPECT().GetAllInstance().Return(instanceReferences, nil)
565565
mockpowervs.EXPECT().GetInstance(gomock.AssignableToTypeOf("capi-test-machine-id")).Return(instance, nil)
566566
mockvpc.EXPECT().GetLoadBalancer(gomock.AssignableToTypeOf(&vpcv1.GetLoadBalancerOptions{})).Return(loadBalancer, &core.DetailedResponse{}, nil)
567-
result, err := reconciler.reconcileNormal(machineScope)
567+
result, err := reconciler.reconcileNormal(ctx, machineScope)
568568
g.Expect(err).ToNot(BeNil())
569569
g.Expect(result.Requeue).To((BeFalse()))
570570
g.Expect(result.RequeueAfter).To(BeZero())
@@ -683,7 +683,7 @@ func TestIBMPowerVSMachineReconciler_ReconcileOperations(t *testing.T) {
683683
mockvpc.EXPECT().ListLoadBalancerPoolMembers(gomock.AssignableToTypeOf(&vpcv1.ListLoadBalancerPoolMembersOptions{})).Return(loadBalancerPoolMemberCollection, &core.DetailedResponse{}, nil)
684684
mockvpc.EXPECT().CreateLoadBalancerPoolMember(gomock.AssignableToTypeOf(&vpcv1.CreateLoadBalancerPoolMemberOptions{})).Return(loadBalancerPoolMember, &core.DetailedResponse{}, nil)
685685
mockvpc.EXPECT().GetLoadBalancer(gomock.AssignableToTypeOf(&vpcv1.GetLoadBalancerOptions{})).Return(loadBalancer, &core.DetailedResponse{}, nil)
686-
result, err := reconciler.reconcileNormal(machineScope)
686+
result, err := reconciler.reconcileNormal(ctx, machineScope)
687687
g.Expect(err).To(BeNil())
688688
g.Expect(result.RequeueAfter).To(Not(BeZero()))
689689
g.Expect(machineScope.IBMPowerVSMachine.Status.Ready).To(Equal(true))
@@ -743,7 +743,7 @@ func TestIBMPowerVSMachineReconciler_ReconcileOperations(t *testing.T) {
743743

744744
mockpowervs.EXPECT().GetAllInstance().Return(instanceReferences, nil)
745745
mockpowervs.EXPECT().GetInstance(gomock.AssignableToTypeOf("capi-test-machine-id")).Return(instance, nil)
746-
result, err := reconciler.reconcileNormal(machineScope)
746+
result, err := reconciler.reconcileNormal(ctx, machineScope)
747747
g.Expect(err).To(BeNil())
748748
g.Expect(result.RequeueAfter).To(Not(BeZero()))
749749
g.Expect(machineScope.IBMPowerVSMachine.Status.Ready).To(Equal(false))
@@ -754,7 +754,7 @@ func TestIBMPowerVSMachineReconciler_ReconcileOperations(t *testing.T) {
754754
instance.Status = ptr.To("SHUTOFF")
755755
mockpowervs.EXPECT().GetAllInstance().Return(instanceReferences, nil)
756756
mockpowervs.EXPECT().GetInstance(gomock.AssignableToTypeOf("capi-test-machine-id")).Return(instance, nil)
757-
result, err = reconciler.reconcileNormal(machineScope)
757+
result, err = reconciler.reconcileNormal(ctx, machineScope)
758758
g.Expect(err).To(BeNil())
759759
g.Expect(result.RequeueAfter).To(BeZero())
760760
g.Expect(machineScope.IBMPowerVSMachine.Status.Ready).To(Equal(false))
@@ -765,7 +765,7 @@ func TestIBMPowerVSMachineReconciler_ReconcileOperations(t *testing.T) {
765765
instance.Status = ptr.To("ACTIVE")
766766
mockpowervs.EXPECT().GetAllInstance().Return(instanceReferences, nil)
767767
mockpowervs.EXPECT().GetInstance(gomock.AssignableToTypeOf("capi-test-machine-id")).Return(instance, nil)
768-
result, err = reconciler.reconcileNormal(machineScope)
768+
result, err = reconciler.reconcileNormal(ctx, machineScope)
769769
g.Expect(err).To(BeNil())
770770
g.Expect(result.RequeueAfter).To(BeZero())
771771
g.Expect(machineScope.IBMPowerVSMachine.Status.Ready).To(Equal(true))
@@ -777,7 +777,7 @@ func TestIBMPowerVSMachineReconciler_ReconcileOperations(t *testing.T) {
777777
instance.Fault = &models.PVMInstanceFault{Details: "Timeout creating instance"}
778778
mockpowervs.EXPECT().GetAllInstance().Return(instanceReferences, nil)
779779
mockpowervs.EXPECT().GetInstance(gomock.AssignableToTypeOf("capi-test-machine-id")).Return(instance, nil)
780-
result, err = reconciler.reconcileNormal(machineScope)
780+
result, err = reconciler.reconcileNormal(ctx, machineScope)
781781
g.Expect(err).To(BeNil())
782782
g.Expect(result.RequeueAfter).To(BeZero())
783783
g.Expect(machineScope.IBMPowerVSMachine.Status.Ready).To(Equal(false))
@@ -788,7 +788,7 @@ func TestIBMPowerVSMachineReconciler_ReconcileOperations(t *testing.T) {
788788
instance.Status = ptr.To("UNKNOWN")
789789
mockpowervs.EXPECT().GetAllInstance().Return(instanceReferences, nil)
790790
mockpowervs.EXPECT().GetInstance(gomock.AssignableToTypeOf("capi-test-machine-id")).Return(instance, nil)
791-
result, err = reconciler.reconcileNormal(machineScope)
791+
result, err = reconciler.reconcileNormal(ctx, machineScope)
792792
g.Expect(err).To(BeNil())
793793
g.Expect(result.RequeueAfter).To(Not(BeZero()))
794794
g.Expect(machineScope.IBMPowerVSMachine.Status.Ready).To(Equal(false))
@@ -876,7 +876,7 @@ func TestIBMPowerVSMachineReconciler_ReconcileOperations(t *testing.T) {
876876

877877
mockpowervs.EXPECT().GetAllInstance().Return(instanceReferences, nil)
878878
mockpowervs.EXPECT().GetInstance(gomock.AssignableToTypeOf("capi-test-machine-id")).Return(instance, nil)
879-
result, err := reconciler.reconcileNormal(machineScope)
879+
result, err := reconciler.reconcileNormal(ctx, machineScope)
880880
g.Expect(err).To(BeNil())
881881
g.Expect(result.Requeue).To(BeFalse())
882882
g.Expect(result.RequeueAfter).To(BeZero())

‎controllers/ibmvpcmachine_controller.go

+7-4
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func (r *IBMVPCMachineReconciler) Reconcile(ctx context.Context, req ctrl.Reques
130130
}
131131

132132
// Handle non-deleted machines.
133-
return r.reconcileNormal(machineScope)
133+
return r.reconcileNormal(ctx, machineScope)
134134
}
135135

136136
// SetupWithManager creates a new IBMVPCMachine controller for a manager.
@@ -140,14 +140,17 @@ func (r *IBMVPCMachineReconciler) SetupWithManager(mgr ctrl.Manager) error {
140140
Complete(r)
141141
}
142142

143-
func (r *IBMVPCMachineReconciler) reconcileNormal(machineScope *scope.MachineScope) (ctrl.Result, error) { //nolint:gocyclo
143+
func (r *IBMVPCMachineReconciler) reconcileNormal(ctx context.Context, machineScope *scope.MachineScope) (ctrl.Result, error) { //nolint:gocyclo
144+
log := ctrl.LoggerFrom(ctx)
145+
log.V(3).Info("Reconciling IBMVPCMachine")
146+
144147
if controllerutil.AddFinalizer(machineScope.IBMVPCMachine, infrav1beta2.MachineFinalizer) {
145148
return ctrl.Result{}, nil
146149
}
147150

148151
// Make sure bootstrap data is available and populated.
149152
if machineScope.Machine.Spec.Bootstrap.DataSecretName == nil {
150-
machineScope.Info("Bootstrap data secret reference is not yet available")
153+
log.V(3).Info("Bootstrap data secret reference is not yet available")
151154
return ctrl.Result{RequeueAfter: 1 * time.Minute}, nil
152155
}
153156

@@ -203,7 +206,7 @@ func (r *IBMVPCMachineReconciler) reconcileNormal(machineScope *scope.MachineSco
203206
machineRunning = true
204207
default:
205208
machineScope.SetNotReady()
206-
machineScope.V(3).Info("unexpected vpc instance status", "instanceStatus", *instance.Status, "instanceID", machineScope.GetInstanceID())
209+
log.V(3).Info("unexpected vpc instance status", "instanceStatus", *instance.Status, "instanceID", machineScope.GetInstanceID())
207210
conditions.MarkUnknown(machineScope.IBMVPCMachine, infrav1beta2.InstanceReadyCondition, "", "")
208211
}
209212
} else {

‎controllers/ibmvpcmachine_controller_test.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ func TestIBMVPCMachineReconciler_reconcile(t *testing.T) {
257257
g := NewWithT(t)
258258
setup(t)
259259
t.Cleanup(teardown)
260-
_, err := reconciler.reconcileNormal(machineScope)
260+
_, err := reconciler.reconcileNormal(ctx, machineScope)
261261
g.Expect(err).To(BeNil())
262262
g.Expect(machineScope.IBMVPCMachine.Finalizers).To(ContainElement(infrav1beta2.MachineFinalizer))
263263
})
@@ -271,7 +271,7 @@ func TestIBMVPCMachineReconciler_reconcile(t *testing.T) {
271271
machineScope.Machine.Spec.Bootstrap.DataSecretName = ptr.To("capi-machine")
272272
machineScope.IBMVPCCluster.Status.Subnet.ID = ptr.To("capi-subnet-id")
273273
mockvpc.EXPECT().ListInstances(options).Return(instancelist, response, errors.New("Failed to create or fetch instance"))
274-
_, err := reconciler.reconcileNormal(machineScope)
274+
_, err := reconciler.reconcileNormal(ctx, machineScope)
275275
g.Expect(err).To(Not(BeNil()))
276276
g.Expect(machineScope.IBMVPCMachine.Finalizers).To(ContainElement(infrav1beta2.MachineFinalizer))
277277
})
@@ -387,7 +387,7 @@ func TestIBMVPCMachineLBReconciler_reconcile(t *testing.T) {
387387
mockgt.EXPECT().GetTagByName(gomock.AssignableToTypeOf("capi-cluster")).Return(existingTag, nil)
388388
mockgt.EXPECT().AttachTag(gomock.AssignableToTypeOf(&globaltaggingv1.AttachTagOptions{})).Return(nil, &core.DetailedResponse{}, nil)
389389

390-
_, err := reconciler.reconcileNormal(machineScope)
390+
_, err := reconciler.reconcileNormal(ctx, machineScope)
391391
g.Expect(err).To((Not(BeNil())))
392392
g.Expect(machineScope.IBMVPCMachine.Finalizers).To(ContainElement(infrav1beta2.MachineFinalizer))
393393
})
@@ -402,7 +402,7 @@ func TestIBMVPCMachineLBReconciler_reconcile(t *testing.T) {
402402
mockvpc.EXPECT().GetLoadBalancer(gomock.AssignableToTypeOf(&vpcv1.GetLoadBalancerOptions{})).Return(loadBalancer, &core.DetailedResponse{}, nil)
403403
mockvpc.EXPECT().ListLoadBalancerPoolMembers(gomock.AssignableToTypeOf(&vpcv1.ListLoadBalancerPoolMembersOptions{})).Return(&vpcv1.LoadBalancerPoolMemberCollection{}, &core.DetailedResponse{}, errors.New("failed to list loadBalancerPoolMembers"))
404404

405-
_, err := reconciler.reconcileNormal(machineScope)
405+
_, err := reconciler.reconcileNormal(ctx, machineScope)
406406
g.Expect(err).To(Not(BeNil()))
407407
g.Expect(machineScope.IBMVPCMachine.Finalizers).To(ContainElement(infrav1beta2.MachineFinalizer))
408408
})
@@ -422,7 +422,7 @@ func TestIBMVPCMachineLBReconciler_reconcile(t *testing.T) {
422422
mockvpc.EXPECT().ListLoadBalancerPoolMembers(gomock.AssignableToTypeOf(&vpcv1.ListLoadBalancerPoolMembersOptions{})).Return(&vpcv1.LoadBalancerPoolMemberCollection{}, &core.DetailedResponse{}, nil)
423423
mockvpc.EXPECT().CreateLoadBalancerPoolMember(gomock.AssignableToTypeOf(&vpcv1.CreateLoadBalancerPoolMemberOptions{})).Return(customloadBalancerPoolMember, &core.DetailedResponse{}, nil)
424424

425-
result, err := reconciler.reconcileNormal(machineScope)
425+
result, err := reconciler.reconcileNormal(ctx, machineScope)
426426
// Requeue should be set when the Pool Member is found, but not yet ready (active).
427427
g.Expect(result.RequeueAfter).To(Not(BeZero()))
428428
g.Expect(err).To(BeNil())
@@ -446,7 +446,7 @@ func TestIBMVPCMachineLBReconciler_reconcile(t *testing.T) {
446446
mockvpc.EXPECT().ListLoadBalancerPoolMembers(gomock.AssignableToTypeOf(&vpcv1.ListLoadBalancerPoolMembersOptions{})).Return(&vpcv1.LoadBalancerPoolMemberCollection{}, &core.DetailedResponse{}, nil)
447447
mockvpc.EXPECT().CreateLoadBalancerPoolMember(gomock.AssignableToTypeOf(&vpcv1.CreateLoadBalancerPoolMemberOptions{})).Return(loadBalancerPoolMember, &core.DetailedResponse{}, nil)
448448

449-
_, err := reconciler.reconcileNormal(machineScope)
449+
_, err := reconciler.reconcileNormal(ctx, machineScope)
450450
g.Expect(err).To(BeNil())
451451
g.Expect(machineScope.IBMVPCMachine.Finalizers).To(ContainElement(infrav1beta2.MachineFinalizer))
452452
g.Expect(machineScope.IBMVPCMachine.Status.Ready).To(Equal(true))
@@ -488,7 +488,7 @@ func TestIBMVPCMachineLBReconciler_reconcile(t *testing.T) {
488488
}
489489
mockvpc.EXPECT().ListInstances(gomock.AssignableToTypeOf(&vpcv1.ListInstancesOptions{})).Return(customInstancelist, &core.DetailedResponse{}, nil)
490490

491-
result, err := reconciler.reconcileNormal(machineScope)
491+
result, err := reconciler.reconcileNormal(ctx, machineScope)
492492
g.Expect(err).To(BeNil())
493493
g.Expect(result.RequeueAfter).To(Not(BeZero()))
494494
g.Expect(machineScope.IBMVPCMachine.Status.Ready).To(Equal(false))
@@ -513,7 +513,7 @@ func TestIBMVPCMachineLBReconciler_reconcile(t *testing.T) {
513513
}
514514
mockvpc.EXPECT().ListInstances(gomock.AssignableToTypeOf(&vpcv1.ListInstancesOptions{})).Return(customInstancelist, &core.DetailedResponse{}, nil)
515515

516-
_, err := reconciler.reconcileNormal(machineScope)
516+
_, err := reconciler.reconcileNormal(ctx, machineScope)
517517
g.Expect(err).To(BeNil())
518518
g.Expect(machineScope.IBMVPCMachine.Status.Ready).To(Equal(true))
519519
})
@@ -537,7 +537,7 @@ func TestIBMVPCMachineLBReconciler_reconcile(t *testing.T) {
537537
}
538538
mockvpc.EXPECT().ListInstances(gomock.AssignableToTypeOf(&vpcv1.ListInstancesOptions{})).Return(customInstancelist, &core.DetailedResponse{}, nil)
539539

540-
result, err := reconciler.reconcileNormal(machineScope)
540+
result, err := reconciler.reconcileNormal(ctx, machineScope)
541541
g.Expect(err).To(BeNil())
542542
g.Expect(result.RequeueAfter).To(Not(BeZero()))
543543
g.Expect(machineScope.IBMVPCMachine.Status.Ready).To(Equal(false))
@@ -562,7 +562,7 @@ func TestIBMVPCMachineLBReconciler_reconcile(t *testing.T) {
562562
}
563563
mockvpc.EXPECT().ListInstances(gomock.AssignableToTypeOf(&vpcv1.ListInstancesOptions{})).Return(customInstancelist, &core.DetailedResponse{}, nil)
564564

565-
result, err := reconciler.reconcileNormal(machineScope)
565+
result, err := reconciler.reconcileNormal(ctx, machineScope)
566566
g.Expect(err).To(BeNil())
567567
g.Expect(result.RequeueAfter).To(BeZero())
568568
g.Expect(machineScope.IBMVPCMachine.Status.Ready).To(Equal(false))

0 commit comments

Comments
 (0)