diff --git a/cluster-autoscaler/cloudprovider/aws/auto_scaling_groups.go b/cluster-autoscaler/cloudprovider/aws/auto_scaling_groups.go index d39f4685f63b48c48382e5b54a0b54110a63711a..f15c778d9eee38942b008ac52466b8df211d4371 100644 --- a/cluster-autoscaler/cloudprovider/aws/auto_scaling_groups.go +++ b/cluster-autoscaler/cloudprovider/aws/auto_scaling_groups.go @@ -479,7 +479,6 @@ func (m *asgCache) createPlaceholdersForDesiredNonStartedInstances(groups []*aut func (m *asgCache) isNodeGroupAvailable(group *autoscaling.Group) (bool, error) { input := &autoscaling.DescribeScalingActivitiesInput{ AutoScalingGroupName: group.AutoScalingGroupName, - MaxRecords: aws.Int64(1), // We only care about the most recent event } start := time.Now() @@ -496,6 +495,7 @@ func (m *asgCache) isNodeGroupAvailable(group *autoscaling.Group) (bool, error) if activity.StartTime.Before(lut) { break } else if *activity.StatusCode == "Failed" { + klog.Warningf("ASG %s scaling failed with %s", asgRef.Name, *activity) return false, nil } } else { diff --git a/cluster-autoscaler/cloudprovider/aws/auto_scaling_groups_test.go b/cluster-autoscaler/cloudprovider/aws/auto_scaling_groups_test.go index f619af1e2da679e29e832715fa33e8090904e4a4..c5078b03b5b72b15ddbd42a9229a61345bbfe62f 100644 --- a/cluster-autoscaler/cloudprovider/aws/auto_scaling_groups_test.go +++ b/cluster-autoscaler/cloudprovider/aws/auto_scaling_groups_test.go @@ -128,7 +128,6 @@ func TestCreatePlaceholders(t *testing.T) { if shouldCallDescribeScalingActivities { a.On("DescribeScalingActivities", &autoscaling.DescribeScalingActivitiesInput{ AutoScalingGroupName: asgName, - MaxRecords: aws.Int64(1), }).Return( &autoscaling.DescribeScalingActivitiesOutput{Activities: tc.activities}, tc.describeErr, diff --git a/cluster-autoscaler/cloudprovider/aws/aws_cloud_provider_test.go b/cluster-autoscaler/cloudprovider/aws/aws_cloud_provider_test.go index 2753daabd2dc4d5abf7b3815da2f28890ccbb99c..e1d6a92a1ef93852933c8337b408ba8d66a21ce7 100644 --- a/cluster-autoscaler/cloudprovider/aws/aws_cloud_provider_test.go +++ b/cluster-autoscaler/cloudprovider/aws/aws_cloud_provider_test.go @@ -466,7 +466,6 @@ func TestDeleteNodesWithPlaceholder(t *testing.T) { a.On("DescribeScalingActivities", &autoscaling.DescribeScalingActivitiesInput{ AutoScalingGroupName: aws.String("test-asg"), - MaxRecords: aws.Int64(1), }, ).Return(&autoscaling.DescribeScalingActivitiesOutput{}, nil) diff --git a/cluster-autoscaler/cloudprovider/aws/aws_manager_test.go b/cluster-autoscaler/cloudprovider/aws/aws_manager_test.go index 79d8a2d619a32573759997d5247bd0c122ddf362..50df508f8df639e03c4457618f72d9d09701b599 100644 --- a/cluster-autoscaler/cloudprovider/aws/aws_manager_test.go +++ b/cluster-autoscaler/cloudprovider/aws/aws_manager_test.go @@ -394,7 +394,6 @@ func TestFetchExplicitAsgs(t *testing.T) { a.On("DescribeScalingActivities", &autoscaling.DescribeScalingActivitiesInput{ AutoScalingGroupName: aws.String("coolasg"), - MaxRecords: aws.Int64(1), }, ).Return(&autoscaling.DescribeScalingActivitiesOutput{}, nil) @@ -559,7 +558,6 @@ func TestFetchAutoAsgs(t *testing.T) { a.On("DescribeScalingActivities", &autoscaling.DescribeScalingActivitiesInput{ AutoScalingGroupName: aws.String("coolasg"), - MaxRecords: aws.Int64(1), }, ).Return(&autoscaling.DescribeScalingActivitiesOutput{}, nil)