Retry throttling errors, disable retry rate-limiting

eksctl-io · Jul 10, 2024 · 07324eb · 07324eb
1 parent d0829b1
commit 07324eb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/pkg/eks/retryer_v2.go b/pkg/eks/retryer_v2.go
@@ -1,15 +1,14 @@
 package eks
 
 import (
+	"errors"
 	"net/http"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
-
 	"github.com/aws/aws-sdk-go-v2/aws/retry"
 
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/smithy-go"
-	"github.com/pkg/errors"
 )
 
 const (
@@ -39,7 +38,10 @@ func (r *RetryerV2) IsErrorRetryable(err error) bool {
 	}
 
 	var oe *smithy.OperationError
-	return errors.As(err, &oe) && oe.Err != nil && isErrorRetryable(oe.Err)
+	if !errors.As(err, &oe) {
+		return true
+	}
+	return oe.Err != nil && isErrorRetryable(oe.Err)
 }
 
 func isErrorRetryable(err error) bool {

diff --git a/pkg/eks/services_v2.go b/pkg/eks/services_v2.go
@@ -5,6 +5,7 @@ import (
 	"sync"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/aws/ratelimit"
 	"github.com/aws/aws-sdk-go-v2/aws/retry"
 	"github.com/aws/aws-sdk-go-v2/service/cloudformation"
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
@@ -85,6 +86,7 @@ func (s *ServicesV2) CloudFormation() awsapi.CloudFormation {
 				o.StandardOptions = []func(*retry.StandardOptions){
 					func(so *retry.StandardOptions) {
 						so.MaxAttempts = maxRetries
+						so.RateLimiter = ratelimit.None
 					},
 				}
 			})