Merge pull request kubernetes-sigs#2029 from eytan-avisror/flag-exponential-backoff-tg

Add max backoff flag for TargetGroupBinding reconciler

Author: k8s-ci-robot

controllers/elbv2/targetgroupbinding_controller.go

@@ -19,10 +19,13 @@ package controllers
 import (
 "context"
 "fmt"
+"time"
+
 "github.com/aws/aws-sdk-go/aws"
 "github.com/pkg/errors"
 corev1 "k8s.io/api/core/v1"
 "k8s.io/client-go/tools/record"
+"k8s.io/client-go/util/workqueue"
 "sigs.k8s.io/aws-load-balancer-controller/controllers/elbv2/eventhandlers"
 "sigs.k8s.io/aws-load-balancer-controller/pkg/config"
 "sigs.k8s.io/aws-load-balancer-controller/pkg/k8s"
@@ -55,7 +58,8 @@ func NewTargetGroupBindingReconciler(k8sClient client.Client, eventRecorder reco
 tgbResourceManager: tgbResourceManager,
 logger: logger,
 
-maxConcurrentReconciles: config.TargetGroupBindingMaxConcurrentReconciles,
+maxConcurrentReconciles: config.TargetGroupBindingMaxConcurrentReconciles,
+maxExponentialBackoffDelay: config.TargetGroupBindingMaxExponentialBackoffDelay,
 }
 }
 
@@ -67,7 +71,8 @@ type targetGroupBindingReconciler struct {
 tgbResourceManager targetgroupbinding.ResourceManager
 logger logr.Logger
 
-maxConcurrentReconciles int
+maxConcurrentReconciles int
+maxExponentialBackoffDelay time.Duration
 }
 
 // +kubebuilder:rbac:groups=elbv2.k8s.aws,resources=targetgroupbindings,verbs=get;list;watch;update;patch;create;delete
@@ -157,7 +162,9 @@ func (r *targetGroupBindingReconciler) SetupWithManager(ctx context.Context, mgr
 Watches(&source.Kind{Type: &corev1.Service{}}, svcEventHandler).
 Watches(&source.Kind{Type: &corev1.Endpoints{}}, epsEventsHandler).
 Watches(&source.Kind{Type: &corev1.Node{}}, nodeEventsHandler).
-WithOptions(controller.Options{MaxConcurrentReconciles: r.maxConcurrentReconciles}).
+WithOptions(controller.Options{
+MaxConcurrentReconciles: r.maxConcurrentReconciles,
+RateLimiter: workqueue.NewItemExponentialFailureRateLimiter(5*time.Millisecond, r.maxExponentialBackoffDelay)}).
 Complete(r)
 }
 

pkg/config/controller_config.go

@@ -1,6 +1,8 @@
 package config
 
 import (
+"time"
+
 "github.com/pkg/errors"
 "github.com/spf13/pflag"
 "k8s.io/apimachinery/pkg/util/sets"
@@ -9,16 +11,18 @@ import (
 )
 
 const (
-flagLogLevel = "log-level"
-flagK8sClusterName = "cluster-name"
-flagDefaultTags = "default-tags"
-flagExternalManagedTags = "external-managed-tags"
-flagServiceMaxConcurrentReconciles = "service-max-concurrent-reconciles"
-flagTargetGroupBindingMaxConcurrentReconciles = "targetgroupbinding-max-concurrent-reconciles"
-flagDefaultSSLPolicy = "default-ssl-policy"
-defaultLogLevel = "info"
-defaultMaxConcurrentReconciles = 3
-defaultSSLPolicy = "ELBSecurityPolicy-2016-08"
+flagLogLevel = "log-level"
+flagK8sClusterName = "cluster-name"
+flagDefaultTags = "default-tags"
+flagExternalManagedTags = "external-managed-tags"
+flagServiceMaxConcurrentReconciles = "service-max-concurrent-reconciles"
+flagTargetGroupBindingMaxConcurrentReconciles = "targetgroupbinding-max-concurrent-reconciles"
+flagTargetGroupBindingMaxExponentialBackoffDelay = "targetgroupbinding-max-exponential-backoff-delay"
+flagDefaultSSLPolicy = "default-ssl-policy"
+defaultLogLevel = "info"
+defaultMaxConcurrentReconciles = 3
+defaultMaxExponentialBackoffDelay = time.Second * 1000
+defaultSSLPolicy = "ELBSecurityPolicy-2016-08"
 )
 
 var (
@@ -62,6 +66,8 @@ type ControllerConfig struct {
 ServiceMaxConcurrentReconciles int
 // Max concurrent reconcile loops for TargetGroupBinding objects
 TargetGroupBindingMaxConcurrentReconciles int
+// Max exponential backoff delay for reconcile failures of TargetGroupBinding
+TargetGroupBindingMaxExponentialBackoffDelay time.Duration
 }
 
 // BindFlags binds the command line flags to the fields in the config object
@@ -77,6 +83,8 @@ func (cfg *ControllerConfig) BindFlags(fs *pflag.FlagSet) {
 "Maximum number of concurrently running reconcile loops for service")
 fs.IntVar(&cfg.TargetGroupBindingMaxConcurrentReconciles, flagTargetGroupBindingMaxConcurrentReconciles, defaultMaxConcurrentReconciles,
 "Maximum number of concurrently running reconcile loops for targetGroupBinding")
+fs.DurationVar(&cfg.TargetGroupBindingMaxExponentialBackoffDelay, flagTargetGroupBindingMaxExponentialBackoffDelay, defaultMaxExponentialBackoffDelay,
+"Maximum duration of exponential backoff for targetGroupBinding reconcile failures")
 fs.StringVar(&cfg.DefaultSSLPolicy, flagDefaultSSLPolicy, defaultSSLPolicy,
 "Default SSL policy for load balancers listeners")