Removed deprecated use of result.Requeue (#2503)

Author: anshuman-agarwala

controllers/ibmpowervscluster_controller.go

@@ -201,8 +201,7 @@ func (r *IBMPowerVSClusterReconciler) reconcile(ctx context.Context, clusterScop
 	var errList []error
 	// receive return values from the channel and decide the requeue
 	for val := range ch {
-		//nolint:staticcheck
-		if val.Requeue {
+		if val.RequeueAfter > 0 {
 			requeue = true
 		}
 		if val.error != nil {
@@ -323,7 +322,7 @@ func (r *IBMPowerVSClusterReconciler) reconcilePowerVSResources(ctx context.Cont
 		return
 	} else if requeue {
 		log.Info("PowerVS service instance creation is pending, requeuing")
-		ch <- reconcileResult{reconcile.Result{Requeue: true}, nil}
+		ch <- reconcileResult{reconcile.Result{RequeueAfter: 20 * time.Second}, nil}
 		return
 	}
 	powerVSCluster.updateCondition(clusterv1beta1.Condition{
@@ -399,7 +398,7 @@ func (r *IBMPowerVSClusterReconciler) reconcileVPCResources(ctx context.Context,
 		return
 	} else if requeue {
 		log.Info("VPC creation is pending, requeuing")
-		ch <- reconcileResult{reconcile.Result{Requeue: true}, nil}
+		ch <- reconcileResult{reconcile.Result{RequeueAfter: 20 * time.Second}, nil}
 		return
 	}
 	powerVSCluster.updateCondition(clusterv1beta1.Condition{
@@ -432,7 +431,7 @@ func (r *IBMPowerVSClusterReconciler) reconcileVPCResources(ctx context.Context,
 		return
 	} else if requeue {
 		log.Info("VPC subnet creation is pending, requeuing")
-		ch <- reconcileResult{reconcile.Result{Requeue: true}, nil}
+		ch <- reconcileResult{reconcile.Result{RequeueAfter: 20 * time.Second}, nil}
 		return
 	}
 	powerVSCluster.updateCondition(clusterv1beta1.Condition{

controllers/ibmpowervscluster_controller_test.go

@@ -1370,7 +1370,7 @@ func TestReconcileVPCResources(t *testing.T) {
 			},
 			reconcileResult: reconcileResult{
 				Result: reconcile.Result{
-					Requeue: true,
+					RequeueAfter: 20 * time.Second,
 				},
 			},
 		},
@@ -1443,7 +1443,7 @@ func TestReconcileVPCResources(t *testing.T) {
 			},
 			reconcileResult: reconcileResult{
 				Result: reconcile.Result{
-					Requeue: true,
+					RequeueAfter: 20 * time.Second,
 				},
 			},
 			conditions: clusterv1beta1.Conditions{
@@ -1688,7 +1688,7 @@ func TestReconcilePowerVSResources(t *testing.T) {
 			},
 			reconcileResult: reconcileResult{
 				Result: reconcile.Result{
-					Requeue: true,
+					RequeueAfter: 20 * time.Second,
 				},
 			},
 		},

controllers/ibmpowervsmachine_controller_test.go

@@ -570,8 +570,6 @@ func TestIBMPowerVSMachineReconciler_ReconcileOperations(t *testing.T) {
 			mockvpc.EXPECT().GetLoadBalancer(gomock.AssignableToTypeOf(&vpcv1.GetLoadBalancerOptions{})).Return(loadBalancer, &core.DetailedResponse{}, nil)
 			result, err := reconciler.reconcileNormal(ctx, machineScope)
 			g.Expect(err).ToNot(BeNil())
-			//nolint:staticcheck
-			g.Expect(result.Requeue).To(BeFalse())
 			g.Expect(result.RequeueAfter).To(BeZero())
 			g.Expect(machineScope.IBMPowerVSMachine.Finalizers).To(ContainElement(infrav1.IBMPowerVSMachineFinalizer))
 			expectConditions(g, machineScope.IBMPowerVSMachine, []conditionAssertion{{infrav1.InstanceReadyCondition, corev1.ConditionFalse, clusterv1beta1.ConditionSeverityWarning, infrav1.IBMPowerVSMachineInstanceLoadBalancerConfigurationFailedV1Beta2Reason}})
@@ -885,8 +883,6 @@ func TestIBMPowerVSMachineReconciler_ReconcileOperations(t *testing.T) {
 		mockpowervs.EXPECT().GetInstance(gomock.AssignableToTypeOf("capi-test-machine-id")).Return(instance, nil)
 		result, err := reconciler.reconcileNormal(ctx, machineScope)
 		g.Expect(err).To(BeNil())
-		//nolint:staticcheck
-		g.Expect(result.Requeue).To(BeFalse())
 		g.Expect(result.RequeueAfter).To(BeZero())
 		g.Expect(machineScope.IBMPowerVSMachine.Status.Ready).To(Equal(true))
 		g.Expect(machineScope.IBMPowerVSMachine.Finalizers).To(ContainElement(infrav1.IBMPowerVSMachineFinalizer))