controllers: fixes options usage

f41gh7 · f41gh7 · commit eac040c947ab · 2023-01-09T14:11:09.000+01:00
previosly flag values were ignored
diff --git a/controllers/controllers.go b/controllers/controllers.go
@@ -23,10 +23,19 @@ var (
 	maxConcurrency   = flag.Int("controller.maxConcurrentReconciles", 1, "Configures number of concurrent reconciles. It should improve performance for clusters with many objects.")
 )
 
-var defaultOptions = controller.Options{
-	RateLimiter:             workqueue.NewItemExponentialFailureRateLimiter(2*time.Second, 2*time.Minute),
-	CacheSyncTimeout:        *cacheSyncTimeout,
-	MaxConcurrentReconciles: *maxConcurrency,
+var (
+	optionsInit    sync.Once
+	defaultOptions *controller.Options
+)
+
+func getDefaultOptions() controller.Options {
+	optionsInit.Do(func() {
+		defaultOptions = &controller.Options{
+			RateLimiter:             workqueue.NewItemExponentialFailureRateLimiter(2*time.Second, 2*time.Minute),
+			CacheSyncTimeout:        *cacheSyncTimeout,
+			MaxConcurrentReconciles: *maxConcurrency}
+	})
+	return *defaultOptions
 }
 
 var (
diff --git a/controllers/vmagent_controller.go b/controllers/vmagent_controller.go
@@ -157,6 +157,6 @@ func (r *VMAgentReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Owns(&v1.Service{}, builder.OnlyMetadata).
 		Owns(&v1.Secret{}, builder.OnlyMetadata).
 		Owns(&v1.ServiceAccount{}, builder.OnlyMetadata).
-		WithOptions(defaultOptions).
+		WithOptions(getDefaultOptions()).
 		Complete(r)
 }
diff --git a/controllers/vmalert_controller.go b/controllers/vmalert_controller.go
@@ -139,6 +139,6 @@ func (r *VMAlertReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Owns(&v1.ConfigMap{}, builder.OnlyMetadata).
 		Owns(&v1.Secret{}, builder.OnlyMetadata).
 		Owns(&v1.ServiceAccount{}, builder.OnlyMetadata).
-		WithOptions(defaultOptions).
+		WithOptions(getDefaultOptions()).
 		Complete(r)
 }
diff --git a/controllers/vmalertmanager_controller.go b/controllers/vmalertmanager_controller.go
@@ -121,6 +121,6 @@ func (r *VMAlertmanagerReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Owns(&victoriametricsv1beta1.VMServiceScrape{}, builder.OnlyMetadata).
 		Owns(&v1.Secret{}, builder.OnlyMetadata).
 		Owns(&v1.ServiceAccount{}, builder.OnlyMetadata).
-		WithOptions(defaultOptions).
+		WithOptions(getDefaultOptions()).
 		Complete(r)
 }
diff --git a/controllers/vmalertmanagerconfig_controller.go b/controllers/vmalertmanagerconfig_controller.go
@@ -98,6 +98,6 @@ func (r *VMAlertmanagerConfigReconciler) Reconcile(ctx context.Context, req ctrl
 func (r *VMAlertmanagerConfigReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&operatorv1beta1.VMAlertmanagerConfig{}).
-		WithOptions(defaultOptions).
+		WithOptions(getDefaultOptions()).
 		Complete(r)
 }
diff --git a/controllers/vmauth_controller.go b/controllers/vmauth_controller.go
@@ -115,6 +115,6 @@ func (r *VMAuthReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Owns(&v1.Service{}, builder.OnlyMetadata).
 		Owns(&v1.ServiceAccount{}, builder.OnlyMetadata).
 		Owns(&operatorv1beta1.VMServiceScrape{}, builder.OnlyMetadata).
-		WithOptions(defaultOptions).
+		WithOptions(getDefaultOptions()).
 		Complete(r)
 }
diff --git a/controllers/vmcluster_controller.go b/controllers/vmcluster_controller.go
@@ -121,6 +121,6 @@ func (r *VMClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Owns(&victoriametricsv1beta1.VMServiceScrape{}, builder.OnlyMetadata).
 		Owns(&appsv1.StatefulSet{}, builder.OnlyMetadata).
 		Owns(&v1.ServiceAccount{}, builder.OnlyMetadata).
-		WithOptions(defaultOptions).
+		WithOptions(getDefaultOptions()).
 		Complete(r)
 }
diff --git a/controllers/vmnodescrape_controller.go b/controllers/vmnodescrape_controller.go
@@ -110,6 +110,6 @@ func (r *VMNodeScrapeReconciler) Reconcile(ctx context.Context, req ctrl.Request
 func (r *VMNodeScrapeReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&operatorv1beta1.VMNodeScrape{}).
-		WithOptions(defaultOptions).
+		WithOptions(getDefaultOptions()).
 		Complete(r)
 }
diff --git a/controllers/vmpodscrape_controller.go b/controllers/vmpodscrape_controller.go
@@ -110,6 +110,6 @@ func (r *VMPodScrapeReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 func (r *VMPodScrapeReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&victoriametricsv1beta1.VMPodScrape{}).
-		WithOptions(defaultOptions).
+		WithOptions(getDefaultOptions()).
 		Complete(r)
 }
diff --git a/controllers/vmprobe_controller.go b/controllers/vmprobe_controller.go
@@ -105,6 +105,6 @@ func (r *VMProbeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 func (r *VMProbeReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&operatorv1beta1.VMProbe{}).
-		WithOptions(defaultOptions).
+		WithOptions(getDefaultOptions()).
 		Complete(r)
 }
diff --git a/controllers/vmrule_controller.go b/controllers/vmrule_controller.go
@@ -115,6 +115,6 @@ func (r *VMRuleReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
 func (r *VMRuleReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&victoriametricsv1beta1.VMRule{}).
-		WithOptions(defaultOptions).
+		WithOptions(getDefaultOptions()).
 		Complete(r)
 }
diff --git a/controllers/vmservicescrape_controller.go b/controllers/vmservicescrape_controller.go
@@ -105,6 +105,6 @@ func (r *VMServiceScrapeReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 func (r *VMServiceScrapeReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&victoriametricsv1beta1.VMServiceScrape{}).
-		WithOptions(defaultOptions).
+		WithOptions(getDefaultOptions()).
 		Complete(r)
 }
diff --git a/controllers/vmsingle_controller.go b/controllers/vmsingle_controller.go
@@ -118,6 +118,6 @@ func (r *VMSingleReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Owns(&v1.Service{}, builder.OnlyMetadata).
 		Owns(&victoriametricsv1beta1.VMServiceScrape{}).
 		Owns(&v1.ServiceAccount{}, builder.OnlyMetadata).
-		WithOptions(defaultOptions).
+		WithOptions(getDefaultOptions()).
 		Complete(r)
 }
diff --git a/controllers/vmstaticscrape_controller.go b/controllers/vmstaticscrape_controller.go
@@ -92,6 +92,6 @@ func (r *VMStaticScrapeReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 func (r *VMStaticScrapeReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&victoriametricsv1beta1.VMStaticScrape{}).
-		WithOptions(defaultOptions).
+		WithOptions(getDefaultOptions()).
 		Complete(r)
 }
diff --git a/controllers/vmuser_controller.go b/controllers/vmuser_controller.go
@@ -250,6 +250,6 @@ func (r *VMUserReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&operatorv1beta1.VMUser{}).
 		Owns(&v1.Secret{}, builder.OnlyMetadata).
-		WithOptions(defaultOptions).
+		WithOptions(getDefaultOptions()).
 		Complete(r)
 }

Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,6 @@ func (r *VMAgentReconciler) SetupWithManager(mgr ctrl.Manager) error {`
`157`	`157`	`Owns(&v1.Service{}, builder.OnlyMetadata).`
`158`	`158`	`Owns(&v1.Secret{}, builder.OnlyMetadata).`
`159`	`159`	`Owns(&v1.ServiceAccount{}, builder.OnlyMetadata).`
`160`		`- WithOptions(defaultOptions).`
	`160`	`+ WithOptions(getDefaultOptions()).`
`161`	`161`	`Complete(r)`
`162`	`162`	`}`
Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,6 @@ func (r *VMAlertReconciler) SetupWithManager(mgr ctrl.Manager) error {`
`139`	`139`	`Owns(&v1.ConfigMap{}, builder.OnlyMetadata).`
`140`	`140`	`Owns(&v1.Secret{}, builder.OnlyMetadata).`
`141`	`141`	`Owns(&v1.ServiceAccount{}, builder.OnlyMetadata).`
`142`		`- WithOptions(defaultOptions).`
	`142`	`+ WithOptions(getDefaultOptions()).`
`143`	`143`	`Complete(r)`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,6 @@ func (r *VMAlertmanagerReconciler) SetupWithManager(mgr ctrl.Manager) error {`
`121`	`121`	`Owns(&victoriametricsv1beta1.VMServiceScrape{}, builder.OnlyMetadata).`
`122`	`122`	`Owns(&v1.Secret{}, builder.OnlyMetadata).`
`123`	`123`	`Owns(&v1.ServiceAccount{}, builder.OnlyMetadata).`
`124`		`- WithOptions(defaultOptions).`
	`124`	`+ WithOptions(getDefaultOptions()).`
`125`	`125`	`Complete(r)`
`126`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,6 @@ func (r *VMAlertmanagerConfigReconciler) Reconcile(ctx context.Context, req ctrl`
`98`	`98`	`func (r *VMAlertmanagerConfigReconciler) SetupWithManager(mgr ctrl.Manager) error {`
`99`	`99`	`return ctrl.NewControllerManagedBy(mgr).`
`100`	`100`	`For(&operatorv1beta1.VMAlertmanagerConfig{}).`
`101`		`- WithOptions(defaultOptions).`
	`101`	`+ WithOptions(getDefaultOptions()).`
`102`	`102`	`Complete(r)`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,6 @@ func (r *VMAuthReconciler) SetupWithManager(mgr ctrl.Manager) error {`
`115`	`115`	`Owns(&v1.Service{}, builder.OnlyMetadata).`
`116`	`116`	`Owns(&v1.ServiceAccount{}, builder.OnlyMetadata).`
`117`	`117`	`Owns(&operatorv1beta1.VMServiceScrape{}, builder.OnlyMetadata).`
`118`		`- WithOptions(defaultOptions).`
	`118`	`+ WithOptions(getDefaultOptions()).`
`119`	`119`	`Complete(r)`
`120`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,6 @@ func (r *VMClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {`
`121`	`121`	`Owns(&victoriametricsv1beta1.VMServiceScrape{}, builder.OnlyMetadata).`
`122`	`122`	`Owns(&appsv1.StatefulSet{}, builder.OnlyMetadata).`
`123`	`123`	`Owns(&v1.ServiceAccount{}, builder.OnlyMetadata).`
`124`		`- WithOptions(defaultOptions).`
	`124`	`+ WithOptions(getDefaultOptions()).`
`125`	`125`	`Complete(r)`
`126`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,6 @@ func (r *VMNodeScrapeReconciler) Reconcile(ctx context.Context, req ctrl.Request`
`110`	`110`	`func (r *VMNodeScrapeReconciler) SetupWithManager(mgr ctrl.Manager) error {`
`111`	`111`	`return ctrl.NewControllerManagedBy(mgr).`
`112`	`112`	`For(&operatorv1beta1.VMNodeScrape{}).`
`113`		`- WithOptions(defaultOptions).`
	`113`	`+ WithOptions(getDefaultOptions()).`
`114`	`114`	`Complete(r)`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,6 @@ func (r *VMPodScrapeReconciler) Reconcile(ctx context.Context, req ctrl.Request)`
`110`	`110`	`func (r *VMPodScrapeReconciler) SetupWithManager(mgr ctrl.Manager) error {`
`111`	`111`	`return ctrl.NewControllerManagedBy(mgr).`
`112`	`112`	`For(&victoriametricsv1beta1.VMPodScrape{}).`
`113`		`- WithOptions(defaultOptions).`
	`113`	`+ WithOptions(getDefaultOptions()).`
`114`	`114`	`Complete(r)`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,6 @@ func (r *VMProbeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct`
`105`	`105`	`func (r *VMProbeReconciler) SetupWithManager(mgr ctrl.Manager) error {`
`106`	`106`	`return ctrl.NewControllerManagedBy(mgr).`
`107`	`107`	`For(&operatorv1beta1.VMProbe{}).`
`108`		`- WithOptions(defaultOptions).`
	`108`	`+ WithOptions(getDefaultOptions()).`
`109`	`109`	`Complete(r)`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,6 @@ func (r *VMRuleReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr`
`115`	`115`	`func (r *VMRuleReconciler) SetupWithManager(mgr ctrl.Manager) error {`
`116`	`116`	`return ctrl.NewControllerManagedBy(mgr).`
`117`	`117`	`For(&victoriametricsv1beta1.VMRule{}).`
`118`		`- WithOptions(defaultOptions).`
	`118`	`+ WithOptions(getDefaultOptions()).`
`119`	`119`	`Complete(r)`
`120`	`120`	`}`