Fix EnqueueRequestsFromMapFunc for secretSync

Author: RadekManak

pkg/controllers/secretsync/secret_sync_controller.go

@@ -62,7 +62,7 @@ type UserDataSecretController struct {
 	Scheme *runtime.Scheme
 }
 
-// Reconcile reconciles the user data secrets
+// Reconcile reconciles the user data secret.
 func (r *UserDataSecretController) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	log := ctrl.LoggerFrom(ctx).WithName(controllerName)
 	secretName := req.Name
@@ -178,7 +178,7 @@ func (r *UserDataSecretController) SetupWithManager(mgr ctrl.Manager) error {
 		).
 		Watches(
 			&corev1.Secret{},
-			handler.EnqueueRequestsFromMapFunc(toUserDataSecret),
+			handler.EnqueueRequestsFromMapFunc(toUserDataSecret(r.ManagedNamespace)),
 			builder.WithPredicates(userDataSecretPredicate(SecretSourceNamespace)),
 		).
 		Complete(r); err != nil {

pkg/controllers/secretsync/secret_sync_controller_test.go

@@ -168,12 +168,12 @@ var _ = Describe("User Data Secret controller", func() {
 				mgrCtxCancel()
 				Eventually(mgrStopped, timeout).Should(BeClosed())
 
-				coOperator := &configv1.ClusterOperator{
+				co := &configv1.ClusterOperator{
 					ObjectMeta: metav1.ObjectMeta{
 						Name: controllers.ClusterOperatorName,
 					},
 				}
-				Expect(test.CleanupAndWait(ctx, cl, coOperator)).To(Succeed())
+				Expect(test.CleanupAndWait(ctx, cl, co)).To(Succeed())
 
 				By("Cleanup resources")
 				allSecrets := &corev1.SecretList{}
@@ -185,9 +185,9 @@ var _ = Describe("User Data Secret controller", func() {
 				sourceSecret = nil
 
 				// Creating the cluster api operator
-				coOperator = &configv1.ClusterOperator{}
-				coOperator.SetName(controllers.ClusterOperatorName)
-				Expect(cl.Create(context.Background(), coOperator.DeepCopy())).To(Succeed())
+				co = &configv1.ClusterOperator{}
+				co.SetName(controllers.ClusterOperatorName)
+				Expect(cl.Create(context.Background(), co.DeepCopy())).To(Succeed())
 			})
 
 			It("secret should be synced up after first reconcile", func() {

pkg/controllers/secretsync/watch_predicates.go

@@ -19,27 +19,28 @@ import (
 	"context"
 
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
 
-func toUserDataSecret(ctx context.Context, obj client.Object) []reconcile.Request {
-	secret, ok := obj.(*corev1.Secret)
-	if !ok {
-		return nil
-	}
+func toUserDataSecret(namespace string) func(context.Context, client.Object) []reconcile.Request {
+	return func(ctx context.Context, obj client.Object) []reconcile.Request {
+		secret, ok := obj.(*corev1.Secret)
+		if !ok {
+			return nil
+		}
 
-	// Map the source secret to the target secret with the same name
-	return []reconcile.Request{{
-		NamespacedName: client.ObjectKey{Name: secret.GetName(), Namespace: SecretSourceNamespace},
-	}}
+		// Map the source secret to the target secret with the same name
+		return []reconcile.Request{{
+			NamespacedName: client.ObjectKey{Name: secret.GetName(), Namespace: namespace},
+		}}
+	}
 }
 
 func userDataSecretPredicate(targetNamespace string) predicate.Funcs {
-	isOwnedUserDataSecret := func(obj runtime.Object) bool {
+	isOwnedUserDataSecret := func(obj client.Object) bool {
 		secret, ok := obj.(*corev1.Secret)
 		if !ok {
 			return false