Skip to content

Commit aacb0c6

Browse files
vinceprik8s-ci-robot
authored andcommitted
Remove duplicate checks for deletionTimestamp (kubernetes-sigs#987)
Signed-off-by: Vince Prignano <[email protected]>
1 parent 5fd25dc commit aacb0c6

File tree

2 files changed

+0
-9
lines changed

2 files changed

+0
-9
lines changed

pkg/controller/machinedeployment/machinedeployment_controller.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,6 @@ func (r *ReconcileMachineDeployment) reconcile(ctx context.Context, d *v1alpha1.
210210
return reconcile.Result{}, err
211211
}
212212

213-
if d.DeletionTimestamp != nil {
214-
return reconcile.Result{}, r.sync(d, msList, machineMap)
215-
}
216-
217213
if d.Spec.Paused {
218214
return reconcile.Result{}, r.sync(d, msList, machineMap)
219215
}

pkg/controller/machineset/machineset_controller.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,11 +197,6 @@ func (r *ReconcileMachineSet) reconcile(ctx context.Context, machineSet *cluster
197197
return reconcile.Result{Requeue: true}, nil
198198
}
199199

200-
// Return early if the MachineSet is deleted.
201-
if !machineSet.ObjectMeta.DeletionTimestamp.IsZero() {
202-
return reconcile.Result{}, nil
203-
}
204-
205200
// Filter out irrelevant machines (deleting/mismatch labels) and claim orphaned machines.
206201
filteredMachines := make([]*clusterv1alpha1.Machine, 0, len(allMachines.Items))
207202
for idx := range allMachines.Items {

0 commit comments

Comments
 (0)