fix: Replace RestrictedEnqueueRequestForOwner with EnqueueRequestForO…

…wner (#1792)

* debug RestrictedEnqueueRequestForOwner

* debug RestrictedEnqueueRequestForOwner

* debug RestrictedEnqueueRequestForOwner

* replace with EnqueueRequestForOwner

* delete RestrictedEnqueueRequestForOwner

* add ResourceVersionChangedPredicate

* replace with ResourceVersionChangedPredicate

* only have ResourceVersionChangedPredicate for Manifest CR

* only have ResourceVersionChangedPredicate for Manifest CR

* add predicate for manifest controller setup

* add predicate for manifest controller setup

internal/controller/kyma/setup.go

@@ -57,18 +57,17 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager, opts ctrlruntime.Options
 	if err := mgr.Add(runnableListener); err != nil {
 		return fmt.Errorf("KymaReconciler %w", err)
 	}
-
 	predicates := predicate.Or(predicate.GenerationChangedPredicate{}, predicate.LabelChangedPredicate{})
 	if err := ctrl.NewControllerManagedBy(mgr).For(&v1beta2.Kyma{}).
 		Named(controllerName).
 		WithOptions(opts).
-		WithEventFilter(predicates).
 		Watches(&v1beta2.ModuleTemplate{},
 			handler.EnqueueRequestsFromMapFunc(watch.NewTemplateChangeHandler(r).Watch()),
 			builder.WithPredicates(predicates)).
-		Watches(&apicorev1.Secret{}, handler.Funcs{}).
+		Watches(&apicorev1.Secret{}, handler.Funcs{}, builder.WithPredicates(predicates)).
 		Watches(&v1beta2.Manifest{},
-			&watch.RestrictedEnqueueRequestForOwner{Log: ctrl.Log, OwnerType: &v1beta2.Kyma{}, IsController: true}).
+			handler.EnqueueRequestForOwner(mgr.GetScheme(), mgr.GetRESTMapper(), &v1beta2.Kyma{},
+				handler.OnlyControllerOwner()), builder.WithPredicates(predicate.ResourceVersionChangedPredicate{})).
 		WatchesRawSource(source.Channel(runnableListener.ReceivedEvents, r.skrEventHandler())).
 		Complete(r); err != nil {
 		return fmt.Errorf("failed to setup manager for kyma controller: %w", err)
@@ -79,7 +78,9 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager, opts ctrlruntime.Options
 
 func (r *Reconciler) skrEventHandler() *handler.Funcs {
 	return &handler.Funcs{
-		GenericFunc: func(ctx context.Context, evnt event.GenericEvent, queue workqueue.TypedRateLimitingInterface[ctrl.Request]) {
+		GenericFunc: func(ctx context.Context, evnt event.GenericEvent,
+			queue workqueue.TypedRateLimitingInterface[ctrl.Request],
+		) {
 			logger := ctrl.Log.WithName("listener")
 			unstructWatcherEvt, conversionOk := evnt.Object.(*unstructured.Unstructured)
 			if !conversionOk {

internal/controller/mandatorymodule/setup.go

@@ -5,7 +5,6 @@ import (
 
 	apicorev1 "k8s.io/api/core/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/builder"
 	ctrlruntime "sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
@@ -20,16 +19,14 @@ const (
 )
 
 func (r *InstallationReconciler) SetupWithManager(mgr ctrl.Manager, opts ctrlruntime.Options) error {
-	predicates := predicate.Or(predicate.GenerationChangedPredicate{}, predicate.LabelChangedPredicate{})
 	if err := ctrl.NewControllerManagedBy(mgr).
 		For(&v1beta2.Kyma{}).
 		Named(installationControllerName).
 		WithOptions(opts).
-		WithEventFilter(predicates).
+		WithEventFilter(predicate.Or(predicate.GenerationChangedPredicate{}, predicate.LabelChangedPredicate{})).
 		Watches(
 			&v1beta2.ModuleTemplate{},
 			handler.EnqueueRequestsFromMapFunc(watch.NewMandatoryTemplateChangeHandler(r).Watch()),
-			builder.WithPredicates(predicates),
 		).
 		Watches(&apicorev1.Secret{}, handler.Funcs{}).
 		Complete(r); err != nil {
@@ -43,7 +40,7 @@ func (r *DeletionReconciler) SetupWithManager(mgr ctrl.Manager, opts ctrlruntime
 		For(&v1beta2.ModuleTemplate{}).
 		Named(deletionControllerName).
 		WithOptions(opts).
-		WithEventFilter(predicate.GenerationChangedPredicate{}).
+		WithEventFilter(predicate.Or(predicate.GenerationChangedPredicate{}, predicate.LabelChangedPredicate{})).
 		Complete(r); err != nil {
 		return fmt.Errorf("failed to setup manager for mandatory module deletion controller: %w", err)
 	}

internal/controller/manifest/setup.go

@@ -11,11 +11,13 @@ import (
 	apicorev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/util/workqueue"
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	ctrlruntime "sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
+	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
 	"github.com/kyma-project/lifecycle-manager/api/v1beta2"
@@ -60,7 +62,9 @@ func SetupWithManager(mgr manager.Manager,
 	}
 
 	addSkrEventToQueueFunc := &handler.Funcs{
-		GenericFunc: func(ctx context.Context, evnt event.GenericEvent, queue workqueue.TypedRateLimitingInterface[ctrl.Request]) {
+		GenericFunc: func(ctx context.Context, evnt event.GenericEvent,
+			queue workqueue.TypedRateLimitingInterface[ctrl.Request],
+		) {
 			ctrl.Log.WithName("listener").Info(
 				fmt.Sprintf(
 					"event coming from SKR, adding %s to queue",
@@ -75,7 +79,9 @@ func SetupWithManager(mgr manager.Manager,
 	if err := ctrl.NewControllerManagedBy(mgr).
 		For(&v1beta2.Manifest{}).
 		Named(controllerName).
-		Watches(&apicorev1.Secret{}, handler.Funcs{}).
+		Watches(&apicorev1.Secret{}, handler.Funcs{},
+			builder.WithPredicates(predicate.Or(predicate.GenerationChangedPredicate{},
+				predicate.LabelChangedPredicate{}))).
 		WatchesRawSource(skrEventChannel).
 		WithOptions(opts).
 		Complete(NewReconciler(mgr, requeueIntervals, manifestMetrics, mandatoryModulesMetrics)); err != nil {