Merge pull request kubernetes#3570 from towca/jtuznik/scale-down-after-delete-fix

k8s-ci-robot · web-flow · commit b774e576c360 · 2020-10-01T02:30:54.000-07:00
Remove ScaleDownNodeDeleted status since we no longer delete nodes synchronously
diff --git a/cluster-autoscaler/core/static_autoscaler.go b/cluster-autoscaler/core/static_autoscaler.go
@@ -529,7 +529,7 @@ func (a *StaticAutoscaler) RunOnce(currentTime time.Time) errors.AutoscalerError
 
 			scaleDownStatus.RemovedNodeGroups = removedNodeGroups
 
-			if scaleDownStatus.Result == status.ScaleDownNodeDeleted {
+			if scaleDownStatus.Result == status.ScaleDownNodeDeleteStarted {
 				a.lastScaleDownDeleteTime = currentTime
 				a.clusterStateRegistry.Recalculate()
 			}
diff --git a/cluster-autoscaler/processors/status/scale_down_status_processor.go b/cluster-autoscaler/processors/status/scale_down_status_processor.go
@@ -88,8 +88,6 @@ const (
 	ScaleDownNoUnneeded
 	// ScaleDownNoNodeDeleted - unneeded nodes present but not available for deletion.
 	ScaleDownNoNodeDeleted
-	// ScaleDownNodeDeleted - a node was deleted.
-	ScaleDownNodeDeleted
 	// ScaleDownNodeDeleteStarted - a node deletion process was started.
 	ScaleDownNodeDeleteStarted
 	// ScaleDownNotTried - the scale down wasn't even attempted, e.g. an autoscaling iteration was skipped, or

Original file line number	Diff line number	Diff line change
`@@ -529,7 +529,7 @@ func (a *StaticAutoscaler) RunOnce(currentTime time.Time) errors.AutoscalerError`
`529`	`529`
`530`	`530`	`scaleDownStatus.RemovedNodeGroups = removedNodeGroups`
`531`	`531`
`532`		`- if scaleDownStatus.Result == status.ScaleDownNodeDeleted {`
	`532`	`+ if scaleDownStatus.Result == status.ScaleDownNodeDeleteStarted {`
`533`	`533`	`a.lastScaleDownDeleteTime = currentTime`
`534`	`534`	`a.clusterStateRegistry.Recalculate()`
`535`	`535`	`}`