kubernetes
/
autoscaler
mirror of https://github.com/kubernetes/autoscaler.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3598 from ryaneorth/cherry-pick-3570-1.18 

Merge pull request #3570 from towca/jtuznik/scale-down-after-delete-fix
This commit is contained in:
Kubernetes Prow Robot 2020-10-15 01:36:24 -07:00 committed by GitHub
parent d282d74286 221d03217e
commit b2962ef323
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster-autoscaler/core/static_autoscaler.go
View File

@ -516,7 +516,7 @@ func (a *StaticAutoscaler) RunOnce(currentTime time.Time) errors.AutoscalerError
scaleDownStatus.RemovedNodeGroups = removedNodeGroups scaleDownStatus.RemovedNodeGroups = removedNodeGroups
if scaleDownStatus.Result == status.ScaleDownNodeDeleted { if scaleDownStatus.Result == status.ScaleDownNodeDeleteStarted {
a.lastScaleDownDeleteTime = currentTime a.lastScaleDownDeleteTime = currentTime
a.clusterStateRegistry.Recalculate() a.clusterStateRegistry.Recalculate()
} }

2
cluster-autoscaler/processors/status/scale_down_status_processor.go
View File

@ -88,8 +88,6 @@ const (
ScaleDownNoUnneeded ScaleDownNoUnneeded
// ScaleDownNoNodeDeleted - unneeded nodes present but not available for deletion. // ScaleDownNoNodeDeleted - unneeded nodes present but not available for deletion.
ScaleDownNoNodeDeleted ScaleDownNoNodeDeleted
// ScaleDownNodeDeleted - a node was deleted.
ScaleDownNodeDeleted
// ScaleDownNodeDeleteStarted - a node deletion process was started. // ScaleDownNodeDeleteStarted - a node deletion process was started.
ScaleDownNodeDeleteStarted ScaleDownNodeDeleteStarted
// ScaleDownNotTried - the scale down wasn't even attempted, e.g. an autoscaling iteration was skipped, or // ScaleDownNotTried - the scale down wasn't even attempted, e.g. an autoscaling iteration was skipped, or