Merge pull request kubernetes#5191 from x13n/scaledown

Don't depend on IsNodeBeingDeleted implementation

Author: k8s-ci-robot

cluster-autoscaler/core/scaledown/eligibility/eligibility.go

@@ -108,9 +108,6 @@ func (c *Checker) FilterOutUnremovable(context *context.AutoscalingContext, scal
 func (c *Checker) unremovableReasonAndNodeUtilization(context *context.AutoscalingContext, timestamp time.Time, nodeInfo *schedulerframework.NodeInfo, utilLogsQuota *klogx.Quota) (simulator.UnremovableReason, *utilization.Info) {
 	node := nodeInfo.Node()
 
-	// Skip nodes marked to be deleted, if they were marked recently.
-	// Old-time marked nodes are again eligible for deletion - something went wrong with them
-	// and they have not been deleted.
 	if actuation.IsNodeBeingDeleted(node, timestamp) {
 		klog.V(1).Infof("Skipping %s from delete consideration - the node is currently being deleted", node.Name)
 		return simulator.CurrentlyBeingDeleted, nil

cluster-autoscaler/core/scaledown/eligibility/eligibility_test.go

@@ -46,10 +46,6 @@ func TestFilterOutUnremovable(t *testing.T) {
 	justDeletedNode.Spec.Taints = []apiv1.Taint{{Key: deletetaint.ToBeDeletedTaint, Value: strconv.FormatInt(now.Unix()-30, 10)}}
 	SetNodeReadyState(justDeletedNode, true, time.Time{})
 
-	tooOldDeletedNode := BuildTestNode("tooOldDeleted", 1000, 10)
-	tooOldDeletedNode.Spec.Taints = []apiv1.Taint{{Key: deletetaint.ToBeDeletedTaint, Value: strconv.FormatInt(now.Unix()-301, 10)}}
-	SetNodeReadyState(tooOldDeletedNode, true, time.Time{})
-
 	noScaleDownNode := BuildTestNode("noScaleDown", 1000, 10)
 	noScaleDownNode.Annotations = map[string]string{ScaleDownDisabledKey: "true"}
 	SetNodeReadyState(noScaleDownNode, true, time.Time{})
@@ -76,11 +72,6 @@ func TestFilterOutUnremovable(t *testing.T) {
 			nodes: []*apiv1.Node{regularNode, justDeletedNode},
 			want:  []string{"regular"},
 		},
-		{
-			desc:  "deleted long time ago stays",
-			nodes: []*apiv1.Node{regularNode, tooOldDeletedNode},
-			want:  []string{"regular", "tooOldDeleted"},
-		},
 		{
 			desc:  "marked no scale down is filtered out",
 			nodes: []*apiv1.Node{noScaleDownNode, regularNode},