Added command check when namespace-scoped Argo CD instance in testing

Signed-off-by: nmirasch <neus.miras@gmail.com>

Author: nmirasch

controllers/argocd/notifications.go

@@ -914,7 +914,7 @@ func (r *ReconcileArgoCD) setManagedNotificationsSourceNamespaces(cr *argoproj.A
 	return nil
 }
 
-// removeUnmanagedNotificationsSourceNamespaceResources cleansup resources from NotificationsSourceNamespaces if namespace is not managed by argocd instance.
+// removeUnmanagedNotificationsSourceNamespaceResources cleanup resources from NotificationsSourceNamespaces if namespace is not managed by argocd instance.
 // ManagedNotificationsSourceNamespaces var keeps track of namespaces with notifications resources.
 func (r *ReconcileArgoCD) removeUnmanagedNotificationsSourceNamespaceResources(cr *argoproj.ArgoCD) error {
 

tests/ginkgo/parallel/1-055_validate_notification_controller_test.go

@@ -18,6 +18,7 @@ package parallel
 
 import (
 	"context"
+	"strings"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -200,6 +201,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 
 			By("verifying Argo CD and notification controller start as expected")
 			Eventually(argocd, "4m", "5s").Should(argocdFixture.HaveNotificationControllerStatus("Running"))
+			Eventually(argocd, "5m", "5s").Should(argocdFixture.BeAvailable())
 
 			By("verifying that sourceNamespace cmd args don't exist")
 			depl := &appsv1.Deployment{
@@ -209,7 +211,18 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 				},
 			}
 			Eventually(depl).Should(k8sFixture.ExistByName())
-			// TODO: add check to test "--application-namespaces" cmd arg is not present in the notification deployment container args
+			Eventually(func() bool {
+				err := k8sClient.Get(ctx, client.ObjectKeyFromObject(depl), depl)
+				if err != nil {
+					return false
+				}
+				if len(depl.Spec.Template.Spec.Containers) == 0 {
+					return false
+				}
+				cmd := depl.Spec.Template.Spec.Containers[0].Command
+				cmdStr := strings.Join(cmd, " ")
+				return !strings.Contains(cmdStr, "--application-namespaces")
+			}, "2m", "5s").Should(BeTrue())
 
 			By("verifying sourceNamespace rbac resources are not created")
 			clusterRole := &rbacv1.ClusterRole{