Don't add finalizer if Workload doesn't have TopologyAssignment.

Author: mbobrovskyi

slice/internal/controller/workload_controller.go

@@ -89,7 +89,22 @@ func (r *WorkloadReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 }
 
 func (r *WorkloadReconciler) shouldFinalize(wl *kueue.Workload) bool {
-	return !wl.DeletionTimestamp.IsZero() || workload.IsFinished(wl) || workload.IsEvicted(wl) || !workload.IsActive(wl)
+	return !wl.DeletionTimestamp.IsZero() ||
+		workload.IsFinished(wl) ||
+		workload.IsEvicted(wl) ||
+		!workload.IsActive(wl) ||
+		!r.hasTopologyAssignment(wl)
+}
+
+func (r *WorkloadReconciler) hasTopologyAssignment(wl *kueue.Workload) bool {
+	if wl.Status.Admission != nil && wl.Status.Admission.PodSetAssignments != nil {
+		for _, psa := range wl.Status.Admission.PodSetAssignments {
+			if psa.TopologyAssignment != nil {
+				return true
+			}
+		}
+	}
+	return false
 }
 
 func (r *WorkloadReconciler) newEmptySlice(wl *kueue.Workload) *v1alpha1.Slice {
@@ -149,13 +164,6 @@ func (r *WorkloadReconciler) createSliceIfNotExist(ctx context.Context, wl *kueu
 		return err
 	}
 
-	// We should wait for TopologyAssignments.
-	if len(slice.Spec.NodeSelector) == 0 {
-		log := ctrl.LoggerFrom(ctx)
-		log.V(2).Info("Workload does not have TopologyAssignments. Skipping Slice creation for now.")
-		return nil
-	}
-
 	return r.client.Create(ctx, slice)
 }
 

slice/internal/controller/workload_controller_test.go

@@ -90,13 +90,19 @@ func TestWorkloadReconciler(t *testing.T) {
 			slice:         baseSliceWrapper.DeepCopy(),
 			wantWorkloads: []kueue.Workload{*baseWorkloadWrapper.Clone().Active(false).Obj()},
 		},
-		"should add a finalizer but shouldn't create a Slice because there's no TopologyAssignment yet": {
-			request:  baseRequest,
-			workload: baseWorkloadWrapper.Clone().UID(types.UID(baseWorkloadName)).Obj(),
+		"should delete finalizer because workload doesn't have PodSetAssignment": {
+			request:       baseRequest,
+			workload:      baseWorkloadWrapper.Clone().Obj(),
+			wantWorkloads: []kueue.Workload{*baseWorkloadWrapper.Clone().Obj()},
+		},
+		"should delete finalizer because workload doesn't have TopologyAssignment": {
+			request: baseRequest,
+			workload: baseWorkloadWrapper.Clone().
+				PodSetAssignments(utiltesting.MakePodSetAssignment("psa1").Obj()).
+				Obj(),
 			wantWorkloads: []kueue.Workload{
 				*baseWorkloadWrapper.Clone().
-					UID(types.UID(baseWorkloadName)).
-					Finalizers(CleanupSliceFinalizerName).
+					PodSetAssignments(utiltesting.MakePodSetAssignment("psa1").Obj()).
 					Obj(),
 			},
 		},