Merge pull request #2504 from k8s-infra-cherrypick-robot/cherry-pick-2503-to-release-0.11

k8s-ci-robot · web-flow · commit 19f074a16877 · 2025-03-28T08:08:35.000-07:00
[release-0.11] 🐛 fix openstackserver controller concurrency
diff --git a/controllers/openstackserver_controller.go b/controllers/openstackserver_controller.go
@@ -169,7 +169,7 @@ func patchServer(ctx context.Context, patchHelper *patch.Helper, openStackServer
 	return patchHelper.Patch(ctx, openStackServer, options...)
 }
 
-func (r *OpenStackServerReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, _ controller.Options) error {
+func (r *OpenStackServerReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {
 	const imageRefPath = "spec.image.imageRef.name"
 
 	log := ctrl.LoggerFrom(ctx)
@@ -189,6 +189,7 @@ func (r *OpenStackServerReconciler) SetupWithManager(ctx context.Context, mgr ct
 	}
 
 	return ctrl.NewControllerManagedBy(mgr).
+		WithOptions(options).
 		For(&infrav1alpha1.OpenStackServer{}).
 		Watches(&orcv1alpha1.Image{},
 			handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, obj client.Object) []reconcile.Request {

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ func patchServer(ctx context.Context, patchHelper *patch.Helper, openStackServer`
`169`	`169`	`return patchHelper.Patch(ctx, openStackServer, options...)`
`170`	`170`	`}`
`171`	`171`
`172`		`-func (r *OpenStackServerReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, _ controller.Options) error {`
	`172`	`+func (r *OpenStackServerReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {`
`173`	`173`	`const imageRefPath = "spec.image.imageRef.name"`
`174`	`174`
`175`	`175`	`log := ctrl.LoggerFrom(ctx)`
`@@ -189,6 +189,7 @@ func (r *OpenStackServerReconciler) SetupWithManager(ctx context.Context, mgr ct`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`return ctrl.NewControllerManagedBy(mgr).`
	`192`	`+ WithOptions(options).`
`192`	`193`	`For(&infrav1alpha1.OpenStackServer{}).`
`193`	`194`	`Watches(&orcv1alpha1.Image{},`
`194`	`195`	`handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, obj client.Object) []reconcile.Request {`