argoproj-labs
diff --git a/‎controllers/argocd/applicationset_test.go
Lines changed: 11 additions & 1 deletion b/‎controllers/argocd/applicationset_test.go
Lines changed: 11 additions & 1 deletion
diff --git a/‎controllers/argocd/custommapper.go
Lines changed: 21 additions & 3 deletions b/‎controllers/argocd/custommapper.go
Lines changed: 21 additions & 3 deletions
diff --git a/‎controllers/argocd/custommapper_test.go
Lines changed: 312 additions & 1 deletion b/‎controllers/argocd/custommapper_test.go
Lines changed: 312 additions & 1 deletion
@@ -481,7 +481,17 @@ func TestReconcileApplicationSet_Deployments_Command(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
 
 			a := makeTestArgoCD()
-			resObjs := []client.Object{a}
+			ns1 := v1.Namespace{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "foo",
+				},
+			}
+			ns2 := v1.Namespace{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "bar",
+				},
+			}
+			resObjs := []client.Object{a, &ns1, &ns2}
 			subresObjs := []client.Object{a}
 			runtimeObjs := []runtime.Object{}
 			sch := makeTestReconcilerScheme(argoproj.AddToScheme)
 
@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/argoproj/argo-cd/v2/util/glob"
+
 	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
 	"github.com/argoproj-labs/argocd-operator/common"
 
@@ -130,17 +132,16 @@ func (r *ReconcileArgoCD) tlsSecretMapper(ctx context.Context, o client.Object)
 func (r *ReconcileArgoCD) namespaceResourceMapper(ctx context.Context, o client.Object) []reconcile.Request {
 	var result = []reconcile.Request{}
 
+	argocds := &argoproj.ArgoCDList{}
 	labels := o.GetLabels()
+	namespaceName := o.GetName()
 	if v, ok := labels[common.ArgoCDManagedByLabel]; ok {
-		argocds := &argoproj.ArgoCDList{}
 		if err := r.Client.List(context.TODO(), argocds, &client.ListOptions{Namespace: v}); err != nil {
 			return result
 		}
-
 		if len(argocds.Items) != 1 {
 			return result
 		}
-
 		argocd := argocds.Items[0]
 		namespacedName := client.ObjectKey{
 			Name:      argocd.Name,
@@ -149,6 +150,23 @@ func (r *ReconcileArgoCD) namespaceResourceMapper(ctx context.Context, o client.
 		result = []reconcile.Request{
 			{NamespacedName: namespacedName},
 		}
+	} else {
+		// If the namespace does not have the expected managed-by label,
+		// iterate through each ArgoCD instance to identify if the observed namespace
+		// matches any configured sourceNamespace pattern. If a match is found,
+		// generate a reconcile request for the instances.
+		if err := r.Client.List(ctx, argocds, &client.ListOptions{}); err != nil {
+			return result
+		}
+		for _, argocd := range argocds.Items {
+			if glob.MatchStringInList(argocd.Spec.SourceNamespaces, namespaceName, false) {
+				namespacedName := client.ObjectKey{
+					Name:      argocd.Name,
+					Namespace: argocd.Namespace,
+				}
+				result = append(result, reconcile.Request{NamespacedName: namespacedName})
+			}
+		}
 	}
 
 	return result
 
@@ -569,7 +569,7 @@ func TestReconcileArgoCD_tlsSecretMapperRedis(t *testing.T) {
 
 }
 
-func TestReconcileArgoCD_namespaceResourceMapper(t *testing.T) {
+func TestReconcileArgoCD_namespaceResourceMapperWithManagedByLabel(t *testing.T) {
 	a := makeTestArgoCD()
 
 	resObjs := []client.Object{a}
@@ -631,3 +631,314 @@ func TestReconcileArgoCD_namespaceResourceMapper(t *testing.T) {
 		})
 	}
 }
+
+func TestReconcileArgoCD_namespaceResourceMapperForSpecificNamespaceWithoutManagedByLabel(t *testing.T) {
+	argocd1 := makeTestArgoCD()
+	resObjs := []client.Object{argocd1}
+	subresObjs := []client.Object{argocd1}
+	runtimeObjs := []runtime.Object{}
+	sch := makeTestReconcilerScheme(argoproj.AddToScheme)
+	cl := makeTestReconcilerClient(sch, resObjs, subresObjs, runtimeObjs)
+	r := makeTestReconciler(cl, sch)
+
+	argocd1.Name = "argocd1"
+	argocd1.Namespace = "argo-test-1"
+	argocd1.Spec.SourceNamespaces = append(argocd1.Spec.SourceNamespaces, "test-namespace-1")
+	// Fake client returns an error if ResourceVersion is not nil
+	argocd1.ResourceVersion = ""
+
+	assert.NoError(t, r.Client.Create(context.TODO(), argocd1))
+
+	type test struct {
+		name string
+		o    client.Object
+		want []reconcile.Request
+	}
+
+	tests := []test{
+		{
+			name: "Reconcile for Namespace 'test-namespace-1'",
+			o: &corev1.Namespace{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "test-namespace-1",
+				},
+			},
+			want: []reconcile.Request{
+				{
+					NamespacedName: types.NamespacedName{
+						Name:      argocd1.Name,
+						Namespace: argocd1.Namespace,
+					},
+				},
+			},
+		},
+		{
+			name: "No Reconcile for Namespace 'test-namespace-2'",
+			o: &corev1.Namespace{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "test-namespace-2",
+				},
+			},
+			want: []reconcile.Request{},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := r.namespaceResourceMapper(context.TODO(), tt.o); !assert.ElementsMatch(t, got, tt.want) {
+				t.Errorf("ReconcileArgoCD.sourceNamespaceMapper(), got = %v, want = %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestReconcileArgoCD_namespaceResourceMapperForWildCardPatternNamespaceWithoutManagedByLabel(t *testing.T) {
+	argocd1 := makeTestArgoCD()
+	resObjs := []client.Object{argocd1}
+	subresObjs := []client.Object{argocd1}
+	runtimeObjs := []runtime.Object{}
+	sch := makeTestReconcilerScheme(argoproj.AddToScheme)
+	cl := makeTestReconcilerClient(sch, resObjs, subresObjs, runtimeObjs)
+	r := makeTestReconciler(cl, sch)
+
+	argocd1.Name = "argocd1"
+	argocd1.Namespace = "argo-test-1"
+	argocd1.Spec.SourceNamespaces = append(argocd1.Spec.SourceNamespaces, "test*")
+	// Fake client returns an error if ResourceVersion is not nil
+	argocd1.ResourceVersion = ""
+
+	assert.NoError(t, r.Client.Create(context.TODO(), argocd1))
+
+	type test struct {
+		name string
+		o    client.Object
+		want []reconcile.Request
+	}
+
+	tests := []test{
+		{
+			name: "Reconcile for Namespace 'test-namespace-1'",
+			o: &corev1.Namespace{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "test-namespace-1",
+				},
+			},
+			want: []reconcile.Request{
+				{
+					NamespacedName: types.NamespacedName{
+						Name:      argocd1.Name,
+						Namespace: argocd1.Namespace,
+					},
+				},
+			},
+		},
+		{
+			name: "Reconcile for Namespace 'test-namespace-2'",
+			o: &corev1.Namespace{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "test-namespace-2",
+				},
+			},
+			want: []reconcile.Request{
+				{
+					NamespacedName: types.NamespacedName{
+						Name:      argocd1.Name,
+						Namespace: argocd1.Namespace,
+					},
+				},
+			},
+		},
+		{
+			name: "No Reconcile for Namespace 'prod-namespace-1'",
+			o: &corev1.Namespace{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "prod-namespace-1",
+				},
+			},
+			want: []reconcile.Request{},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := r.namespaceResourceMapper(context.TODO(), tt.o); !assert.ElementsMatch(t, got, tt.want) {
+				t.Errorf("ReconcileArgoCD.sourceNamespaceMapper(), got = %v, want = %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestReconcileArgoCD_namespaceResourceMapperForMultipleSourceNamespacesWithoutManagedByLabel(t *testing.T) {
+	argocd1 := makeTestArgoCD()
+	resObjs := []client.Object{argocd1}
+	subresObjs := []client.Object{argocd1}
+	runtimeObjs := []runtime.Object{}
+	sch := makeTestReconcilerScheme(argoproj.AddToScheme)
+	cl := makeTestReconcilerClient(sch, resObjs, subresObjs, runtimeObjs)
+	r := makeTestReconciler(cl, sch)
+
+	argocd1.Name = "argocd1"
+	argocd1.Namespace = "argo-test-1"
+	argocd1.Spec.SourceNamespaces = append(argocd1.Spec.SourceNamespaces, "test*", "dev*")
+	// Fake client returns an error if ResourceVersion is not nil
+	argocd1.ResourceVersion = ""
+
+	assert.NoError(t, r.Client.Create(context.TODO(), argocd1))
+
+	type test struct {
+		name string
+		o    client.Object
+		want []reconcile.Request
+	}
+
+	tests := []test{
+		{
+			name: "Reconcile for Namespace 'test-namespace-1'",
+			o: &corev1.Namespace{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "test-namespace-1",
+				},
+			},
+			want: []reconcile.Request{
+				{
+					NamespacedName: types.NamespacedName{
+						Name:      argocd1.Name,
+						Namespace: argocd1.Namespace,
+					},
+				},
+			},
+		},
+		{
+			name: "Reconcile for Namespace 'test-namespace-2'",
+			o: &corev1.Namespace{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "test-namespace-2",
+				},
+			},
+			want: []reconcile.Request{
+				{
+					NamespacedName: types.NamespacedName{
+						Name:      argocd1.Name,
+						Namespace: argocd1.Namespace,
+					},
+				},
+			},
+		},
+		{
+			name: "Reconcile for Namespace 'dev-namespace-1'",
+			o: &corev1.Namespace{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "dev-namespace-1",
+				},
+			},
+			want: []reconcile.Request{
+				{
+					NamespacedName: types.NamespacedName{
+						Name:      argocd1.Name,
+						Namespace: argocd1.Namespace,
+					},
+				},
+			},
+		},
+		{
+			name: "No Reconcile for Namespace 'prod-namespace-1'",
+			o: &corev1.Namespace{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "prod-namespace-1",
+				},
+			},
+			want: []reconcile.Request{},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := r.namespaceResourceMapper(context.TODO(), tt.o); !assert.ElementsMatch(t, got, tt.want) {
+				t.Errorf("ReconcileArgoCD.sourceNamespaceMapper(), got = %v, want = %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestReconcileArgoCD_namespaceResourceMapperForWildCardNamespaceWithoutManagedByLabel(t *testing.T) {
+	argocd1 := makeTestArgoCD()
+	resObjs := []client.Object{argocd1}
+	subresObjs := []client.Object{argocd1}
+	runtimeObjs := []runtime.Object{}
+	sch := makeTestReconcilerScheme(argoproj.AddToScheme)
+	cl := makeTestReconcilerClient(sch, resObjs, subresObjs, runtimeObjs)
+	r := makeTestReconciler(cl, sch)
+
+	argocd1.Name = "argocd1"
+	argocd1.Namespace = "argo-test-1"
+	argocd1.Spec.SourceNamespaces = append(argocd1.Spec.SourceNamespaces, "*")
+	// Fake client returns an error if ResourceVersion is not nil
+	argocd1.ResourceVersion = ""
+
+	assert.NoError(t, r.Client.Create(context.TODO(), argocd1))
+
+	type test struct {
+		name string
+		o    client.Object
+		want []reconcile.Request
+	}
+
+	tests := []test{
+		{
+			name: "Reconcile for Namespace 'test-namespace-1'",
+			o: &corev1.Namespace{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "test-namespace-1",
+				},
+			},
+			want: []reconcile.Request{
+				{
+					NamespacedName: types.NamespacedName{
+						Name:      argocd1.Name,
+						Namespace: argocd1.Namespace,
+					},
+				},
+			},
+		},
+		{
+			name: "Reconcile for Namespace 'test-namespace-2'",
+			o: &corev1.Namespace{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "test-namespace-2",
+				},
+			},
+			want: []reconcile.Request{
+				{
+					NamespacedName: types.NamespacedName{
+						Name:      argocd1.Name,
+						Namespace: argocd1.Namespace,
+					},
+				},
+			},
+		},
+		{
+			name: "Reconcile for Namespace 'prod-namespace-1'",
+			o: &corev1.Namespace{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "prod-namespace-1",
+				},
+			},
+			want: []reconcile.Request{
+				{
+					NamespacedName: types.NamespacedName{
+						Name:      argocd1.Name,
+						Namespace: argocd1.Namespace,
+					},
+				},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := r.namespaceResourceMapper(context.TODO(), tt.o); !assert.ElementsMatch(t, got, tt.want) {
+				t.Errorf("ReconcileArgoCD.sourceNamespaceMapper(), got = %v, want = %v", got, tt.want)
+			}
+		})
+	}
+}