github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 03:03:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #106280 from nckturner/max-results

Browse Source 
[AWS] Set max results if its not set
This commit is contained in:
Kubernetes Prow Robot 2021-12-28 10:47:56 -08:00 committed by GitHub
commit f5be5052e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
staging/src/k8s.io/legacy-cloud-providers/aws/aws.go
View File

@ -960,6 +960,13 @@ func (s *awsSdkEC2) DescribeInstances(request *ec2.DescribeInstancesInput) ([]*e
results := []*ec2.Instance{} results := []*ec2.Instance{}
var nextToken *string var nextToken *string
requestTime := time.Now() requestTime := time.Now()
if request.MaxResults == nil && request.InstanceIds == nil {
// MaxResults must be set in order for pagination to work
// MaxResults cannot be set with InstanceIds
request.MaxResults = aws.Int64(1000)
}
for { for {
response, err := s.ec2.DescribeInstances(request) response, err := s.ec2.DescribeInstances(request)
if err != nil { if err != nil {