chore: fixing lint issues

Author: nexus49

controller/lifecycle/conditions.go

@@ -98,12 +98,12 @@ func setSubroutineCondition(conditions *[]metav1.Condition, subroutine Subroutin
 	conditionName, conditionMessage := getConditionNameAndMessage(subroutine, isFinalize)
 
 	// processing complete
-	if subroutineErr == nil && !subroutineResult.Requeue && subroutineResult.RequeueAfter == 0 {
+	if subroutineErr == nil && subroutineResult.RequeueAfter == 0 {
 		return meta.SetStatusCondition(conditions,
 			metav1.Condition{Type: conditionName, Status: metav1.ConditionTrue, Message: fmt.Sprintf(subroutineMessageCompleteFormatString, conditionMessage), Reason: reasonComplete})
 	}
 	// processing is still processing
-	if subroutineErr == nil && (subroutineResult.RequeueAfter > 0 || subroutineResult.Requeue) {
+	if subroutineErr == nil && subroutineResult.RequeueAfter > 0 {
 		return meta.SetStatusCondition(conditions,
 			metav1.Condition{Type: conditionName, Status: metav1.ConditionUnknown, Message: fmt.Sprintf(subroutineMessageProcessingFormatString, conditionMessage), Reason: reasonProcessing})
 	}

controller/lifecycle/lifecycle.go

@@ -163,22 +163,19 @@ func (l *LifecycleManager) Reconcile(ctx context.Context, req ctrl.Request, inst
 			}
 			return subResult, err
 		}
-		if subResult.Requeue {
-			result.Requeue = subResult.Requeue
-		}
 		if subResult.RequeueAfter > 0 {
 			if subResult.RequeueAfter < result.RequeueAfter || result.RequeueAfter == 0 {
 				result.RequeueAfter = subResult.RequeueAfter
 			}
 		}
 		if l.manageConditions {
-			if !subResult.Requeue && subResult.RequeueAfter == 0 {
+			if subResult.RequeueAfter == 0 {
 				setSubroutineCondition(&conditions, subroutine, subResult, err, inDeletion, log)
 			}
 		}
 	}
 
-	if !result.Requeue && result.RequeueAfter == 0 {
+	if result.RequeueAfter == 0 {
 		// Reconciliation was successful
 		l.markResourceAsFinal(instance, log, conditions, v1.ConditionTrue)
 	} else {
@@ -401,7 +398,7 @@ func (l *LifecycleManager) removeFinalizerIfNeeded(ctx context.Context, instance
 		return nil
 	}
 
-	if !result.Requeue && result.RequeueAfter == 0 {
+	if result.RequeueAfter == 0 {
 		update := false
 		original := instance.DeepCopyObject().(client.Object)
 		for _, f := range subroutine.Finalizers() {

controller/lifecycle/lifecycle_test.go

@@ -143,7 +143,6 @@ func TestLifecycle(t *testing.T) {
 
 		assert.NoError(t, err)
 		assert.Equal(t, 1, len(instance.Finalizers))
-		assert.True(t, res.Requeue)
 		assert.Equal(t, time.Duration(0), res.RequeueAfter)
 	})
 
@@ -174,7 +173,6 @@ func TestLifecycle(t *testing.T) {
 
 		assert.NoError(t, err)
 		assert.Equal(t, 1, len(instance.Finalizers))
-		assert.False(t, res.Requeue)
 		assert.Equal(t, 2*time.Second, res.RequeueAfter)
 	})