fixup (#2139)

Signed-off-by: jose.vazquez <[email protected]>

Author: josvazg

internal/controller/registry.go

@@ -6,6 +6,7 @@ import (
 
 	"go.uber.org/zap"
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/cluster"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -68,28 +69,28 @@ func (r *Registry) RegisterWithManager(mgr ctrl.Manager, skipNameValidation bool
 
 func (r *Registry) registerControllers(c cluster.Cluster, ap atlas.Provider) {
 	var reconcilers []AkoReconciler
-	reconcilers = append(reconcilers, atlasproject.NewAtlasProjectReconciler(c, r.legacyPredicates(), ap, r.deletionProtection, r.logger))
-	reconcilers = append(reconcilers, atlasdeployment.NewAtlasDeploymentReconciler(c, r.legacyPredicates(), ap, r.deletionProtection, r.independentSyncPeriod, r.logger))
-	reconcilers = append(reconcilers, atlasdatabaseuser.NewAtlasDatabaseUserReconciler(c, r.legacyPredicates(), ap, r.deletionProtection, r.independentSyncPeriod, r.featureFlags, r.logger))
-	reconcilers = append(reconcilers, atlasdatafederation.NewAtlasDataFederationReconciler(c, r.legacyPredicates(), ap, r.deletionProtection, r.logger))
-	reconcilers = append(reconcilers, atlasfederatedauth.NewAtlasFederatedAuthReconciler(c, r.legacyPredicates(), ap, r.deletionProtection, r.logger))
-	reconcilers = append(reconcilers, atlasstream.NewAtlasStreamsInstanceReconciler(c, r.legacyPredicates(), ap, r.deletionProtection, r.logger))
-	reconcilers = append(reconcilers, atlasstream.NewAtlasStreamsConnectionReconciler(c, r.legacyPredicates(), ap, r.deletionProtection, r.logger))
-	reconcilers = append(reconcilers, atlassearchindexconfig.NewAtlasSearchIndexConfigReconciler(c, r.legacyPredicates(), ap, r.deletionProtection, r.logger))
-	reconcilers = append(reconcilers, atlasbackupcompliancepolicy.NewAtlasBackupCompliancePolicyReconciler(c, r.legacyPredicates(), ap, r.deletionProtection, r.logger))
-	reconcilers = append(reconcilers, atlascustomrole.NewAtlasCustomRoleReconciler(c, r.legacyPredicates(), ap, r.deletionProtection, r.independentSyncPeriod, r.logger))
+	reconcilers = append(reconcilers, atlasproject.NewAtlasProjectReconciler(c, r.deprecatedPredicates(), ap, r.deletionProtection, r.logger))
+	reconcilers = append(reconcilers, atlasdeployment.NewAtlasDeploymentReconciler(c, r.deprecatedPredicates(), ap, r.deletionProtection, r.independentSyncPeriod, r.logger))
+	reconcilers = append(reconcilers, atlasdatabaseuser.NewAtlasDatabaseUserReconciler(c, r.deprecatedPredicates(), ap, r.deletionProtection, r.independentSyncPeriod, r.featureFlags, r.logger))
+	reconcilers = append(reconcilers, atlasdatafederation.NewAtlasDataFederationReconciler(c, r.deprecatedPredicates(), ap, r.deletionProtection, r.logger))
+	reconcilers = append(reconcilers, atlasfederatedauth.NewAtlasFederatedAuthReconciler(c, r.deprecatedPredicates(), ap, r.deletionProtection, r.logger))
+	reconcilers = append(reconcilers, atlasstream.NewAtlasStreamsInstanceReconciler(c, r.deprecatedPredicates(), ap, r.deletionProtection, r.logger))
+	reconcilers = append(reconcilers, atlasstream.NewAtlasStreamsConnectionReconciler(c, r.deprecatedPredicates(), ap, r.deletionProtection, r.logger))
+	reconcilers = append(reconcilers, atlassearchindexconfig.NewAtlasSearchIndexConfigReconciler(c, r.deprecatedPredicates(), ap, r.deletionProtection, r.logger))
+	reconcilers = append(reconcilers, atlasbackupcompliancepolicy.NewAtlasBackupCompliancePolicyReconciler(c, r.deprecatedPredicates(), ap, r.deletionProtection, r.logger))
+	reconcilers = append(reconcilers, atlascustomrole.NewAtlasCustomRoleReconciler(c, r.deprecatedPredicates(), ap, r.deletionProtection, r.independentSyncPeriod, r.logger))
 	reconcilers = append(reconcilers, atlasprivateendpoint.NewAtlasPrivateEndpointReconciler(c, r.defaultPredicates(), ap, r.deletionProtection, r.independentSyncPeriod, r.logger))
 	reconcilers = append(reconcilers, atlasipaccesslist.NewAtlasIPAccessListReconciler(c, r.defaultPredicates(), ap, r.deletionProtection, r.independentSyncPeriod, r.logger))
 	r.reconcilers = reconcilers
 }
 
-// legacyPredicates are to be phased out in favor of defaultPredicates
-func (r *Registry) legacyPredicates() []predicate.Predicate {
-	return append(r.sharedPredicates, watch.CommonPredicates())
+// deprecatedPredicates are to be phased out in favor of defaultPredicates
+func (r *Registry) deprecatedPredicates() []predicate.Predicate {
+	return append(r.sharedPredicates, watch.DeprecatedCommonPredicates())
 }
 
 // defaultPredicates minimize the reconciliations controllers actually do, avoiding
 // spurious after delete handling and acting on finalizers setting or unsetting
 func (r *Registry) defaultPredicates() []predicate.Predicate {
-	return append(r.sharedPredicates, watch.DefaultPredicates())
+	return append(r.sharedPredicates, watch.DefaultPredicates[client.Object]())
 }

internal/controller/watch/predicates.go

@@ -3,15 +3,16 @@ package watch
 import (
 	"reflect"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 )
 
-// CommonPredicates returns the predicate which filter out the changes done to any field except for spec (e.g. status)
+// DeprecatedCommonPredicates returns the predicate which filter out the changes done to any field except for spec (e.g. status)
 // Also we should reconcile if finalizers have changed (see https://blog.openshift.com/kubernetes-operators-best-practices/)
 // This will be phased out gradually to be replaced by DefaultPredicates
-func CommonPredicates() predicate.Funcs {
+func DeprecatedCommonPredicates() predicate.Funcs {
 	return predicate.Funcs{
 		UpdateFunc: func(e event.UpdateEvent) bool {
 			if e.ObjectOld.GetResourceVersion() == e.ObjectNew.GetResourceVersion() {
@@ -45,27 +46,27 @@ func SelectNamespacesPredicate(namespaces []string) predicate.Funcs {
 
 // GlobalResyncAwareGenerationChangePredicate reconcile on unfrequent global
 // resyncs or on spec generation changes, but ignore finalizer changes
-func GlobalResyncAwareGenerationChangePredicate() predicate.Predicate {
-	return predicate.Or[client.Object](
-		predicate.Not[client.Object](predicate.ResourceVersionChangedPredicate{}), // for the global resync
-		predicate.GenerationChangedPredicate{},
+func GlobalResyncAwareGenerationChangePredicate[T metav1.Object]() predicate.TypedPredicate[T] {
+	return predicate.Or[T](
+		predicate.Not[T](predicate.TypedResourceVersionChangedPredicate[T]{}), // for the global resync
+		predicate.TypedGenerationChangedPredicate[T]{},
 	)
 }
 
 // IgnoreDeletedPredicate ignore after deletion handling, use unless some after
 // deletion cleanup is needed
-func IgnoreDeletedPredicate() predicate.Predicate {
-	return predicate.Funcs{
-		DeleteFunc: func(e event.DeleteEvent) bool {
+func IgnoreDeletedPredicate[T metav1.Object]() predicate.TypedPredicate[T] {
+	return predicate.TypedFuncs[T]{
+		DeleteFunc: func(e event.TypedDeleteEvent[T]) bool {
 			return false
 		},
 	}
 }
 
 // DefaultPredicates avoid spurious after deletion or finalizer changes handling
-func DefaultPredicates() predicate.Predicate {
-	return predicate.And(
-		GlobalResyncAwareGenerationChangePredicate(),
-		IgnoreDeletedPredicate(),
+func DefaultPredicates[T metav1.Object]() predicate.TypedPredicate[T] {
+	return predicate.And[T](
+		GlobalResyncAwareGenerationChangePredicate[T](),
+		IgnoreDeletedPredicate[T](),
 	)
 }

internal/operator/builder.go

@@ -266,7 +266,6 @@ func mergeDefaults(b *Builder) {
 
 	if len(b.predicates) == 0 {
 		b.predicates = []predicate.Predicate{
-			watch.CommonPredicates(),
 			watch.SelectNamespacesPredicate(b.namespaces),
 		}
 	}