Remove duplicate checks for deletionTimestamp (#987)

Signed-off-by: Vince Prignano <[email protected]>
kubernetes-sigs · Jun 7, 2019 · aacb0c6 · aacb0c6
1 parent 5fd25dc
commit aacb0c6
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/pkg/controller/machinedeployment/machinedeployment_controller.go b/pkg/controller/machinedeployment/machinedeployment_controller.go
@@ -210,10 +210,6 @@ func (r *ReconcileMachineDeployment) reconcile(ctx context.Context, d *v1alpha1.
 		return reconcile.Result{}, err
 	}
 
-	if d.DeletionTimestamp != nil {
-		return reconcile.Result{}, r.sync(d, msList, machineMap)
-	}
-
 	if d.Spec.Paused {
 		return reconcile.Result{}, r.sync(d, msList, machineMap)
 	}

diff --git a/pkg/controller/machineset/machineset_controller.go b/pkg/controller/machineset/machineset_controller.go
@@ -197,11 +197,6 @@ func (r *ReconcileMachineSet) reconcile(ctx context.Context, machineSet *cluster
 		return reconcile.Result{Requeue: true}, nil
 	}
 
-	// Return early if the MachineSet is deleted.
-	if !machineSet.ObjectMeta.DeletionTimestamp.IsZero() {
-		return reconcile.Result{}, nil
-	}
-
 	// Filter out irrelevant machines (deleting/mismatch labels) and claim orphaned machines.
 	filteredMachines := make([]*clusterv1alpha1.Machine, 0, len(allMachines.Items))
 	for idx := range allMachines.Items {