Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Oct 15, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b98e02
Merge pull request #3570 from towca/jtuznik/scale-down-after-delete-fix
k8s-ci-robot Oct 1, 2020
a02e9a5
Merge remote-tracking branch 'upstream/cluster-autoscaler-release-1.1…
wf-ryanorth Oct 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cluster-autoscaler/core/static_autoscaler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
2 changes: 0 additions & 2 deletions cluster-autoscaler/processors/status/scale_down_status_processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down