fix: accept events from global DWOC only

Signed-off-by: Oleksii Kurinnyi <[email protected]>

Author: akurinnoy

controllers/pruner/pruner_controller.go

@@ -27,12 +27,15 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"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/predicate"
+	"sigs.k8s.io/controller-runtime/pkg/source"
 
 	dwv2 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
 	"github.com/devfile/devworkspace-operator/pkg/conditions"
 	"github.com/devfile/devworkspace-operator/pkg/config"
+	"github.com/devfile/devworkspace-operator/pkg/infrastructure"
 
 	"github.com/operator-framework/operator-lib/prune"
 	"github.com/robfig/cron/v3"
@@ -126,7 +129,28 @@ func (r *DevWorkspacePrunerReconciler) SetupWithManager(mgr ctrl.Manager) error
 
 	return ctrl.NewControllerManagedBy(mgr).
 		WithOptions(controller.Options{MaxConcurrentReconciles: maxConcurrentReconciles}).
-		For(&controllerv1alpha1.DevWorkspaceOperatorConfig{}).
+		Named("DevWorkspacePruner").
+		Watches(&source.Kind{Type: &controllerv1alpha1.DevWorkspaceOperatorConfig{}},
+			handler.EnqueueRequestsFromMapFunc(func(object client.Object) []ctrl.Request {
+				objectNamespace := object.GetNamespace()
+				operatorNamespace, err := infrastructure.GetNamespace()
+
+				// Ignore events from other namespaces
+				if err != nil || objectNamespace != operatorNamespace {
+					log.Info("Received event from different namespace, ignoring", "namespace", objectNamespace)
+					return []ctrl.Request{}
+				}
+
+				return []ctrl.Request{
+					{
+						NamespacedName: client.ObjectKey{
+							Name:      object.GetName(),
+							Namespace: object.GetNamespace(),
+						},
+					},
+				}
+			}),
+		).
 		WithEventFilter(configPredicate).
 		Complete(r)
 }

controllers/pruner/pruner_controller_test.go

@@ -148,6 +148,28 @@ var _ = Describe("DevWorkspacePrunerReconciler", func() {
 			Expect(reconciler.cron.Entries()).To(BeEmpty())
 		})
 
+		It("Should not start cron if received event from different namespace", func() {
+			dwoc := &controllerv1alpha1.DevWorkspaceOperatorConfig{
+				ObjectMeta: metav1.ObjectMeta{Name: nameNamespace.Name, Namespace: "other-namespace"},
+				Config: &controllerv1alpha1.OperatorConfiguration{
+					Workspace: &controllerv1alpha1.WorkspaceConfig{
+						CleanupCronJob: &controllerv1alpha1.CleanupCronJobConfig{
+							Enable:   pointer.Bool(true),
+							Schedule: "* * * * *",
+						},
+					},
+				},
+			}
+			Expect(fakeClient.Create(ctx, dwoc)).To(Succeed())
+			result, err := reconciler.Reconcile(ctx, ctrl.Request{NamespacedName: types.NamespacedName{
+				Name:      nameNamespace.Name,
+				Namespace: nameNamespace.Namespace,
+			}})
+			Expect(err).ToNot(HaveOccurred())
+			Expect(result).To(Equal(ctrl.Result{}))
+			Expect(reconciler.cron.Entries()).To(BeEmpty())
+		})
+
 		It("Should not start cron if CleanupCronJob is nil", func() {
 			dwoc := &controllerv1alpha1.DevWorkspaceOperatorConfig{
 				ObjectMeta: metav1.ObjectMeta{Name: nameNamespace.Name, Namespace: nameNamespace.Namespace},