Skip to content

Commit 2633cb1

Browse files
committed
keep order same as tso
Signed-off-by: okjiang <819421878@qq.com>
1 parent b8edf30 commit 2633cb1

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

pkg/controllers/resourcemanager/builder.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,19 @@ func (r *Reconciler) NewRunner(state *tasks.ReconcileContext, reporter task.Task
2727
common.TaskTrack[scope.ResourceManager](state, r.Tracker),
2828
task.IfBreak(common.CondObjectHasBeenDeleted[scope.ResourceManager](state)),
2929

30+
common.TaskContextCluster[scope.ResourceManager](state, r.Client),
31+
task.IfBreak(common.CondClusterIsPaused(state)),
32+
task.IfBreak(common.CondClusterIsDeleting(state),
33+
common.TaskInstanceFinalizerDel[scope.ResourceManager](state, r.Client, common.DefaultInstanceSubresourceLister),
34+
),
35+
task.IfBreak(common.CondClusterPDAddrIsNotRegistered(state)),
3036
task.IfBreak(common.CondObjectIsDeleting[scope.ResourceManager](state),
3137
common.TaskInstanceFinalizerDel[scope.ResourceManager](state, r.Client, common.DefaultInstanceSubresourceLister),
3238
common.TaskInstanceConditionSynced[scope.ResourceManager](state),
3339
common.TaskInstanceConditionReady[scope.ResourceManager](state),
3440
common.TaskInstanceConditionRunning[scope.ResourceManager](state),
3541
common.TaskStatusPersister[scope.ResourceManager](state, r.Client),
3642
),
37-
38-
common.TaskContextCluster[scope.ResourceManager](state, r.Client),
39-
task.IfBreak(common.CondClusterIsPaused(state)),
40-
task.IfBreak(common.CondClusterIsDeleting(state),
41-
common.TaskInstanceFinalizerDel[scope.ResourceManager](state, r.Client, common.DefaultInstanceSubresourceLister),
42-
),
43-
task.IfBreak(common.CondClusterPDAddrIsNotRegistered(state)),
4443
common.TaskFinalizerAdd[scope.ResourceManager](state, r.Client),
4544

4645
common.TaskContextPod[scope.ResourceManager](state, r.Client),

pkg/controllers/resourcemanagergroup/builder.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ func (r *Reconciler) NewRunner(state *tasks.ReconcileContext, reporter task.Task
2727
common.TaskContextObject[scope.ResourceManagerGroup](state, r.Client),
2828
task.IfBreak(common.CondObjectHasBeenDeleted[scope.ResourceManagerGroup](state)),
2929

30+
common.TaskContextCluster[scope.ResourceManagerGroup](state, r.Client),
31+
task.IfBreak(common.CondClusterIsPaused(state)),
32+
task.IfBreak(common.CondFeatureGatesIsNotSynced[scope.ResourceManagerGroup](state)),
33+
34+
common.TaskContextSlice[scope.ResourceManagerGroup](state, r.Client),
35+
3036
task.IfBreak(common.CondObjectIsDeleting[scope.ResourceManagerGroup](state),
3137
common.TaskContextSlice[scope.ResourceManagerGroup](state, r.Client),
3238
common.TaskGroupFinalizerDel[scope.ResourceManagerGroup](state, r.Client),
@@ -36,11 +42,6 @@ func (r *Reconciler) NewRunner(state *tasks.ReconcileContext, reporter task.Task
3642
common.TaskStatusPersister[scope.ResourceManagerGroup](state, r.Client),
3743
),
3844

39-
common.TaskContextCluster[scope.ResourceManagerGroup](state, r.Client),
40-
task.IfBreak(common.CondClusterIsPaused(state)),
41-
task.IfBreak(common.CondFeatureGatesIsNotSynced[scope.ResourceManagerGroup](state)),
42-
43-
common.TaskContextSlice[scope.ResourceManagerGroup](state, r.Client),
4445
common.TaskFinalizerAdd[scope.ResourceManagerGroup](state, r.Client),
4546

4647
task.IfBreak(

0 commit comments

Comments
 (0)