Try fix - 3

Signed-off-by: Pannaga Rao Bhoja Ramamanohara

Author: PannagaRao

pkg/controller/jobs/leaderworkerset/leaderworkerset_reconciler.go

@@ -177,7 +177,9 @@ func (r *Reconciler) filterWorkloads(lws *leaderworkersetv1.LeaderWorkerSet, exi
 		replicas = ptr.Deref(lws.Spec.Replicas, 1)
 	)
 
-	if lws.Status.Replicas > replicas {
+	maxSurge := getMaxSurge(lws)
+	isRollingUpdate := maxSurge > 0 && lws.Status.UpdatedReplicas < replicas
+	if isRollingUpdate && lws.Status.Replicas > replicas {
 		replicas = lws.Status.Replicas
 	}
 
@@ -194,32 +196,6 @@ func (r *Reconciler) filterWorkloads(lws *leaderworkersetv1.LeaderWorkerSet, exi
 		}
 	}
 
-	maxSurge := getMaxSurge(lws)
-	isRollingUpdate := maxSurge > 0 && lws.Status.UpdatedReplicas < ptr.Deref(lws.Spec.Replicas, 1)
-
-	if !isRollingUpdate {
-		specReplicas := ptr.Deref(lws.Spec.Replicas, 1)
-
-		var updatedToCreate []workloadToCreate
-		for _, wc := range toCreate {
-			if wc.index < int(specReplicas) {
-				updatedToCreate = append(updatedToCreate, wc)
-			}
-		}
-		toCreate = updatedToCreate
-
-		var updatedToUpdate []*kueue.Workload
-		for _, wl := range toUpdate {
-			index := getWorkloadIndex(wl)
-			if index >= 0 && index >= int(specReplicas) {
-				toDelete[wl.Name] = wl
-			} else {
-				updatedToUpdate = append(updatedToUpdate, wl)
-			}
-		}
-		toUpdate = updatedToUpdate
-	}
-
 	return toCreate, toUpdate, slices.Collect(maps.Values(toDelete))
 }
 
@@ -230,20 +206,6 @@ func getMaxSurge(lws *leaderworkersetv1.LeaderWorkerSet) int32 {
 	return int32(lws.Spec.RolloutStrategy.RollingUpdateConfiguration.MaxSurge.IntValue())
 }
 
-func getWorkloadIndex(wl *kueue.Workload) int {
-	if wl.Annotations == nil {
-		return -1
-	}
-	indexStr, ok := wl.Annotations[constants.ComponentWorkloadIndexAnnotation]
-	if !ok {
-		return -1
-	}
-	index, err := strconv.Atoi(indexStr)
-	if err != nil {
-		return -1
-	}
-	return index
-}
 
 func (r *Reconciler) createPrebuiltWorkload(ctx context.Context, lws *leaderworkersetv1.LeaderWorkerSet, workloadName string, index int) error {
 	createdWorkload, err := r.constructWorkload(lws, workloadName, index)