Fix: Set Requeued condition for standalone workloads during admission check eviction

Previously, only job-managed workloads had the Requeued condition set
during admission check eviction (via jobframework). Standalone workloads
had no code path setting this condition.

This change adds the condition to standalone workloads, ensuring
consistent behavior between job-managed and standalone workloads.

Signed-off-by: Sohan Kunkerkar <[email protected]>

Author: sohankunkerkar

pkg/controller/core/workload_controller.go

@@ -289,8 +289,14 @@ func (r *WorkloadReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 		if wl.Status.RequeueState != nil && wl.Status.RequeueState.RequeueAt != nil {
 			requeueAfter := ptr.To(wl.Status.RequeueState.RequeueAt.Sub(r.clock.Now()))
 			if requeueAfter != nil && *requeueAfter > 0 {
-				log.V(3).Info("Waiting for backoff to finish", "backoff", *requeueAfter)
-				return reconcile.Result{RequeueAfter: *requeueAfter}, nil
+				// If the workload has retry checks and is not yet evicted (Pending),
+				// we should proceed to eviction instead of waiting.
+				if workload.HasRetryChecks(&wl) && workload.Status(&wl) != workload.StatusPending {
+					log.V(3).Info("Skipping backoff wait to proceed with eviction", "requeueAfter", *requeueAfter)
+				} else {
+					log.V(3).Info("Waiting for backoff to finish", "backoff", *requeueAfter)
+					return reconcile.Result{RequeueAfter: *requeueAfter}, nil
+				}
 			}
 
 			if workload.Status(&wl) == workload.StatusPending {
@@ -601,7 +607,15 @@ func (r *WorkloadReconciler) reconcileCheckBasedEviction(ctx context.Context, wl
 	}
 	// at this point we know a Workload has at least one Retry AdmissionCheck
 	message := "At least one admission check is false"
-	if err := workload.Evict(ctx, r.client, r.recorder, wl, kueue.WorkloadEvictedByAdmissionCheck, message, "", r.clock); err != nil {
+	// Calculate the retry time from admission checks before eviction resets them.
+	maxRetryTime := workload.GetMaxRetryTime(wl)
+	if err := workload.Evict(ctx, r.client, r.recorder, wl, kueue.WorkloadEvictedByAdmissionCheck, message, "", r.clock, workload.WithCustomPrepare(func(wl *kueue.Workload) {
+		// Set Requeued=false to track eviction, matching jobframework behavior
+		workload.SetRequeuedCondition(wl, kueue.WorkloadEvictedByAdmissionCheck, "Evicted due to admission check retry", false)
+		if !maxRetryTime.IsZero() {
+			workload.SetRequeueState(wl, maxRetryTime, false)
+		}
+	})); err != nil {
 		return false, err
 	}
 	return true, nil

pkg/controller/core/workload_controller_test.go

@@ -981,6 +981,12 @@ func TestReconcile(t *testing.T) {
 					Reason:  "AdmissionCheck",
 					Message: "At least one admission check is false",
 				}).
+				Condition(metav1.Condition{
+					Type:    "Requeued",
+					Status:  "False",
+					Reason:  "AdmissionCheck",
+					Message: "Evicted due to admission check retry",
+				}).
 				SchedulingStatsEviction(
 					kueue.WorkloadSchedulingStatsEviction{
 						Reason: kueue.WorkloadEvictedByAdmissionCheck,