Merge pull request #6336 from RainbowMango/automated-cherry-pick-of-#6284-upstream-release-1.12

karmada-bot · web-flow · commit 8ae94db8e9c0 · 2025-04-30T14:09:15.000+08:00
Automated cherry pick of #6284: update to 'predicate.GenerationChangedPredicate' in
diff --git a/pkg/controllers/status/cluster_status_controller.go b/pkg/controllers/status/cluster_status_controller.go
@@ -172,7 +172,7 @@ func (c *ClusterStatusController) SetupWithManager(mgr controllerruntime.Manager
 	}
 	return controllerruntime.NewControllerManagedBy(mgr).
 		Named(ControllerName).
-		For(&clusterv1alpha1.Cluster{}, builder.WithPredicates(c.PredicateFunc)).
+		For(&clusterv1alpha1.Cluster{}, builder.WithPredicates(c.PredicateFunc, predicate.GenerationChangedPredicate{})).
 		WithOptions(controller.Options{
 			RateLimiter: ratelimiterflag.DefaultControllerRateLimiter[controllerruntime.Request](c.RateLimiterOptions),
 		}).Complete(c)

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ func (c *ClusterStatusController) SetupWithManager(mgr controllerruntime.Manager`
`172`	`172`	`}`
`173`	`173`	`return controllerruntime.NewControllerManagedBy(mgr).`
`174`	`174`	`Named(ControllerName).`
`175`		`- For(&clusterv1alpha1.Cluster{}, builder.WithPredicates(c.PredicateFunc)).`
	`175`	`+ For(&clusterv1alpha1.Cluster{}, builder.WithPredicates(c.PredicateFunc, predicate.GenerationChangedPredicate{})).`
`176`	`176`	`WithOptions(controller.Options{`
`177`	`177`	`RateLimiter: ratelimiterflag.DefaultControllerRateLimiter[controllerruntime.Request](c.RateLimiterOptions),`
`178`	`178`	`}).Complete(c)`