simplify retry

Author: castlemilk

cmd/manager/main.go

@@ -47,12 +47,6 @@ var (
 	deleteCNRRequeue                 = app.Flag("delete-cnr-requeue", "How often to check if a CNR can be deleted").Default("24h").Duration()
 	defaultCNScyclingExpiry          = app.Flag("default-cns-cycling-expiry", "Fail the CNS if it has been cycling for this long").Default("3h").Duration()
 	unhealthyPodTerminationThreshold = app.Flag("unhealthy-pod-termination-after", "How long to tolerate an un-evictable yet unhealthy pod before forcefully removing it").Default("5m").Duration()
-
-	// Retry configuration flags
-	awsRetryEnabled   = app.Flag("aws-retry-enabled", "Enable retry logic for transient AWS API errors").Default("true").Bool()
-	awsMaxRetries     = app.Flag("aws-max-retries", "Maximum number of retry attempts for transient AWS errors").Default("5").Int()
-	awsInitialDelayMs = app.Flag("aws-initial-delay-ms", "Initial delay in milliseconds before the first retry (exponential backoff)").Default("5000").Int()
-	awsMaxDelayMs     = app.Flag("aws-max-delay-ms", "Maximum delay in milliseconds between retry attempts").Default("60000").Int()
 )
 
 var log = logf.Log.WithName("cmd")
@@ -101,8 +95,9 @@ func main() {
 	// Register the custom metrics
 	metrics.Register(mgr.GetClient(), log, *namespace)
 
-	// Setup the cloud provider with retry configuration
-	cloudProvider, err := builder.BuildCloudProviderWithRetryConfig(*cloudProviderName, logger, *awsRetryEnabled, *awsMaxRetries, *awsInitialDelayMs, *awsMaxDelayMs)
+	// Setup the cloud provider
+	// Uses AWS SDK's built-in retry behavior
+	cloudProvider, err := builder.BuildCloudProvider(*cloudProviderName, logger)
 	if err != nil {
 		log.Error(err, "Unable to build cloud provider")
 		os.Exit(1)

pkg/cloudprovider/aws/aws.go

@@ -71,15 +71,13 @@ type provider struct {
 	autoScalingService autoscalingiface.AutoScalingAPI
 	ec2Service         ec2iface.EC2API
 	logger             logr.Logger
-	retryConfig        RetryConfig
 }
 
 type autoscalingGroups struct {
 	autoScalingService autoscalingiface.AutoScalingAPI
 	ec2Service         ec2iface.EC2API
 	groups             []*autoscaling.Group
 	logger             logr.Logger
-	retryConfig        RetryConfig
 }
 
 type instance struct {
@@ -95,17 +93,9 @@ func (p *provider) Name() string {
 
 // GetNodeGroups gets a Autoscaling groups
 func (p *provider) GetNodeGroups(names []string) (cloudprovider.NodeGroups, error) {
-	var result *autoscaling.DescribeAutoScalingGroupsOutput
-	var err error
-
-	// Retry with exponential backoff for transient errors
-	err = retryOnTransientErrorWithConfig(func() error {
-		result, err = p.autoScalingService.DescribeAutoScalingGroups(&autoscaling.DescribeAutoScalingGroupsInput{
-			AutoScalingGroupNames: aws.StringSlice(names),
-		})
-		return err
-	}, p.logger, p.retryConfig)
-
+	result, err := p.autoScalingService.DescribeAutoScalingGroups(&autoscaling.DescribeAutoScalingGroupsInput{
+		AutoScalingGroupNames: aws.StringSlice(names),
+	})
 	if err != nil {
 		return nil, err
 	}
@@ -120,7 +110,6 @@ func (p *provider) GetNodeGroups(names []string) (cloudprovider.NodeGroups, erro
 		autoScalingService: p.autoScalingService,
 		ec2Service:         p.ec2Service,
 		logger:             p.logger,
-		retryConfig:        p.retryConfig,
 	}, nil
 }
 
@@ -140,19 +129,11 @@ func (p *provider) InstancesExist(providerIDs []string) (map[string]interface{},
 		instanceIDs = append(instanceIDs, instanceID)
 	}
 
-	var output *ec2.DescribeInstancesOutput
-	var err error
-
-	// Retry with exponential backoff for transient errors
-	err = retryOnTransientErrorWithConfig(func() error {
-		output, err = p.ec2Service.DescribeInstances(
-			&ec2.DescribeInstancesInput{
-				InstanceIds: aws.StringSlice(instanceIDs),
-			},
-		)
-		return err
-	}, p.logger, p.retryConfig)
-
+	output, err := p.ec2Service.DescribeInstances(
+		&ec2.DescribeInstancesInput{
+			InstanceIds: aws.StringSlice(instanceIDs),
+		},
+	)
 	if err != nil {
 		return nil, err
 	}
@@ -179,14 +160,9 @@ func (p *provider) TerminateInstance(providerID string) error {
 		return err
 	}
 
-	// Retry with exponential backoff for transient errors
-	err = retryOnTransientErrorWithConfig(func() error {
-		_, err := p.ec2Service.TerminateInstances(&ec2.TerminateInstancesInput{
-			InstanceIds: aws.StringSlice([]string{instanceID}),
-		})
-		return err
-	}, p.logger, p.retryConfig)
-
+	_, err = p.ec2Service.TerminateInstances(&ec2.TerminateInstancesInput{
+		InstanceIds: aws.StringSlice([]string{instanceID}),
+	})
 	return err
 }