koord-descheduler: PodMigrationJob supports skipping all filters (#1505)

Signed-off-by: wangjianyu.wjy <wangjianyu.wjy@alibaba-inc.com> Co-authored-by: wangjianyu.wjy <wangjianyu.wjy@alibaba-inc.com>
koordinator-sh · Jul 31, 2023 · 8f46364 · 8f46364
1 parent 05b892f
commit 8f46364
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/descheduler/controllers/migration/controller.go b/pkg/descheduler/controllers/migration/controller.go
@@ -422,9 +422,9 @@ func (r *Reconciler) preparePendingJob(ctx context.Context, job *sev1alpha1.PodM
 			}
 			return reconcile.Result{}, err
 		}
-	}
-	if requeue, err := r.requeueJobIfRetryablePodFilterFailed(ctx, pod, job); requeue || err != nil {
-		return reconcile.Result{RequeueAfter: defaultRequeueAfter}, err
+		if requeue, err := r.requeueJobIfRetryablePodFilterFailed(ctx, pod, job); requeue || err != nil {
+			return reconcile.Result{RequeueAfter: defaultRequeueAfter}, err
+		}
 	}
 
 	job.Status.Phase = sev1alpha1.PodMigrationJobRunning

diff --git a/pkg/descheduler/controllers/migration/controller_test.go b/pkg/descheduler/controllers/migration/controller_test.go
@@ -2686,7 +2686,7 @@ func TestAllowAnnotatedPodMigrationJobPassFilter(t *testing.T) {
 	assert.Nil(t, reconciler.Client.Create(context.TODO(), pod))
 
 	result, err := reconciler.preparePendingJob(context.TODO(), job)
-	assert.True(t, enterRetryable)
+	assert.False(t, enterRetryable)
 	assert.False(t, enterNonRetryable)
 	assert.Nil(t, err)
 	assert.Equal(t, reconcile.Result{}, result)