From 8f46364d6affa276494cbed2dc49085dae60bc67 Mon Sep 17 00:00:00 2001 From: wangjianyu Date: Mon, 31 Jul 2023 15:11:22 +0800 Subject: [PATCH] koord-descheduler: PodMigrationJob supports skipping all filters (#1505) Signed-off-by: wangjianyu.wjy Co-authored-by: wangjianyu.wjy --- pkg/descheduler/controllers/migration/controller.go | 6 +++--- pkg/descheduler/controllers/migration/controller_test.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/descheduler/controllers/migration/controller.go b/pkg/descheduler/controllers/migration/controller.go index 9e39a9ecd..fe4f50526 100644 --- 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 index 5c570a03f..71f4805d7 100644 --- 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)