Add e2e ginkgo tests for extraCommandargs and Application Health Status

Signed-off-by: Rizwana777 <[email protected]>

Author: Rizwana777

test/openshift/e2e/ginkgo/parallel/1-115_validate_controller_extra_command_args_test.go

@@ -20,6 +20,7 @@ import (
 	"context"
 
 	argov1beta1api "github.com/argoproj-labs/argocd-operator/api/v1beta1"
+	argoprojv1a1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture"
@@ -28,7 +29,9 @@ import (
 	statefulsetFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/statefulset"
 	fixtureUtils "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/utils"
 	appsv1 "k8s.io/api/apps/v1"
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -49,8 +52,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 
 		})
 
-		It("ensuring that extra arguments can be added to application controller", func() {
-
+		It("ensuring extra arguments are deduplicated, replaced, or preserved as expected in application-controller", func() {
 			By("creating a simple ArgoCD CR and waiting for it to become available")
 			ns, cleanupFunc := fixture.CreateRandomE2ETestNamespaceWithCleanupFunc()
 			defer cleanupFunc()
@@ -62,61 +64,250 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 				},
 			}
 			Expect(k8sClient.Create(ctx, argoCD)).To(Succeed())
-
 			Eventually(argoCD, "5m", "5s").Should(argocdFixture.BeAvailable())
 
-			By("verifying app controller becomes availables")
 			appControllerSS := &appsv1.StatefulSet{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "example-argocd-application-controller",
 					Namespace: ns.Name,
 				},
 			}
-
 			Eventually(appControllerSS).Should(k8sFixture.ExistByName())
 			Eventually(appControllerSS).Should(statefulsetFixture.HaveReadyReplicas(1))
 
-			By("adding a new parameter via .spec.controller.extraCommandArgs")
+			// 1: Add new flag
+			By("adding a new flag via extraCommandArgs")
 			argocdFixture.Update(argoCD, func(ac *argov1beta1api.ArgoCD) {
-				ac.Spec.Controller.ExtraCommandArgs = []string{"--app-hard-resync"}
+				ac.Spec.Controller.ExtraCommandArgs = []string{"--app-hard-resync", "2"}
 			})
-
-			By("verifying new parameter is added, and the existing paramaters are still present")
 			Eventually(appControllerSS).Should(statefulsetFixture.HaveContainerCommandSubstring("--app-hard-resync", 0))
 
-			Expect(len(appControllerSS.Spec.Template.Spec.Containers[0].Command)).To(BeNumerically(">=", 10))
+			// 2: Replace existing non-repeatable flag
+			By("replacing existing default flag with extraCommandArgs")
+			argocdFixture.Update(argoCD, func(ac *argov1beta1api.ArgoCD) {
+				ac.Spec.Controller.ExtraCommandArgs = []string{
+					"--status-processors", "15",
+					"--kubectl-parallelism-limit", "20",
+				}
+			})
+
+			// Expect new values to appear
+			Eventually(appControllerSS).Should(statefulsetFixture.HaveContainerCommandSubstring("--status-processors", 0))
+			Eventually(appControllerSS).Should(statefulsetFixture.HaveContainerCommandSubstring("15", 0))
+			Eventually(appControllerSS).Should(statefulsetFixture.HaveContainerCommandSubstring("--kubectl-parallelism-limit", 0))
+			Eventually(appControllerSS).Should(statefulsetFixture.HaveContainerCommandSubstring("20", 0))
 
-			By("removing the extra command arg")
+			// Expect default values to be replaced (old default 10 should not appear)
+			Consistently(func() bool {
+				cmd := appControllerSS.Spec.Template.Spec.Containers[0].Command
+				for i := range cmd {
+					if cmd[i] == "--status-processors" && i+1 < len(cmd) && cmd[i+1] == "10" {
+						return true
+					}
+				}
+				return false
+			}).Should(BeFalse())
+
+			// 3: Add duplicate flag+value pairs, which should be ignored
+			By("adding duplicate flags with same values")
 			argocdFixture.Update(argoCD, func(ac *argov1beta1api.ArgoCD) {
-				ac.Spec.Controller.ExtraCommandArgs = nil
+				ac.Spec.Controller.ExtraCommandArgs = []string{
+					"--status-processors", "15", // duplicate
+					"--kubectl-parallelism-limit", "20", // duplicate
+					"--hydrator-enabled",
+				}
 			})
+			// Verify --hydrator-enabled gets added
+			Eventually(appControllerSS).Should(statefulsetFixture.HaveContainerCommandSubstring("--hydrator-enabled", 0))
+
+			// But no duplicate --status-processors or --kubectl-parallelism-limit
+			Consistently(func() bool {
+				cmd := appControllerSS.Spec.Template.Spec.Containers[0].Command
 
-			By("verifying the parameter has been removed")
-			Eventually(appControllerSS).ShouldNot(statefulsetFixture.HaveContainerCommandSubstring("--app-hard-resync", 0))
-			Consistently(appControllerSS).ShouldNot(statefulsetFixture.HaveContainerCommandSubstring("--app-hard-resync", 0))
-			Expect(len(appControllerSS.Spec.Template.Spec.Containers[0].Command)).To(BeNumerically(">=", 10))
+				statusProcessorsCount := 0
+				kubectlLimitCount := 0
+
+				for i := 0; i < len(cmd); i++ {
+					if cmd[i] == "--status-processors" {
+						statusProcessorsCount++
+					}
+					if cmd[i] == "--kubectl-parallelism-limit" {
+						kubectlLimitCount++
+					}
+				}
 
-			By("adding a new extra command arg that has the same name as existing parameters")
+				// Fail if either flag appears more than once
+				return statusProcessorsCount > 1 || kubectlLimitCount > 1
+			}).Should(BeFalse())
+
+			// 4: Add a repeatable flag multiple times with different values
+			By("adding a repeatable flag with multiple values")
 			argocdFixture.Update(argoCD, func(ac *argov1beta1api.ArgoCD) {
 				ac.Spec.Controller.ExtraCommandArgs = []string{
-					"--status-processors",
-					"15",
-					"--kubectl-parallelism-limit",
-					"20",
+					"--metrics-application-labels", "application.argoproj.io/template-version",
+					"--metrics-application-labels", "application.argoproj.io/chart-version",
 				}
 			})
 
-			// TODO: These lines are currently failing: they are ported correctly from the original kuttl test, but the original kuttl test did not check them correctly (and thus either the behaviour in the operator changed, or the tests never worked)
+			Eventually(appControllerSS).Should(statefulsetFixture.HaveContainerCommandSubstring("--metrics-application-labels", 0))
 
-			// Eventually(appControllerSS).ShouldNot(statefulsetFixture.HaveContainerCommandSubstring("--status-processors 15", 0))
+			// Check that both --metrics-application-labels flags are present
+			Eventually(func() bool {
+				cmd := appControllerSS.Spec.Template.Spec.Containers[0].Command
 
-			// Consistently(appControllerSS).ShouldNot(statefulsetFixture.HaveContainerCommandSubstring("--status-processors 15", 0))
+				metricVals := []string{}
+				for i := 0; i < len(cmd); i++ {
+					if cmd[i] == "--metrics-application-labels" && i+1 < len(cmd) {
+						metricVals = append(metricVals, cmd[i+1])
+					}
+				}
 
-			// Eventually(appControllerSS).ShouldNot(statefulsetFixture.HaveContainerCommandSubstring("--kubectl-parallelism-limit 20", 0))
+				// Ensure both values are present
+				hasMetricLabelTemplate := false
+				hasMetricLabelChart := false
+				for _, v := range metricVals {
+					if v == "application.argoproj.io/template-version" {
+						hasMetricLabelTemplate = true
+					}
+					if v == "application.argoproj.io/chart-version" {
+						hasMetricLabelChart = true
+					}
+				}
+				return hasMetricLabelTemplate && hasMetricLabelChart
+			}).Should(BeTrue())
 
-			// Consistently(appControllerSS).ShouldNot(statefulsetFixture.HaveContainerCommandSubstring("--kubectl-parallelism-limit 20", 0))
+			// 5: Remove all extra args
+			By("removing all extra args")
+			argocdFixture.Update(argoCD, func(ac *argov1beta1api.ArgoCD) {
+				ac.Spec.Controller.ExtraCommandArgs = nil
+			})
 
+			// Expect all custom flags to disappear
+			Eventually(appControllerSS).ShouldNot(statefulsetFixture.HaveContainerCommandSubstring("--metrics-application-labels", 0))
+			Eventually(appControllerSS).ShouldNot(statefulsetFixture.HaveContainerCommandSubstring("--status-processors 15", 0))
+			Eventually(appControllerSS).ShouldNot(statefulsetFixture.HaveContainerCommandSubstring("--kubectl-parallelism-limit 20", 0))
+			Eventually(appControllerSS).ShouldNot(statefulsetFixture.HaveContainerCommandSubstring("--hydrator-enabled", 0))
 		})
+	})
+
+})
+
+var _ = Describe("ArgoCD Resource Health Persist", func() {
+	var (
+		argoCDName   = "example-argocd"
+		appName      = "guestbook"
+		appNamespace = "guestbook"
+	)
+
+	var (
+		k8sClient client.Client
+		ctx       context.Context
+	)
+
+	BeforeEach(func() {
+		fixture.EnsureParallelCleanSlate()
+
+		k8sClient, _ = fixtureUtils.GetE2ETestKubeClient()
+		ctx = context.Background()
+
+	})
+
+	Context("1-115_validate_resource_health_persisted_in_application_status", func() {
+		It("should persist resource health in Application CR status when configured", func() {
+			ns, cleanupFunc := fixture.CreateRandomE2ETestNamespaceWithCleanupFunc()
+			defer cleanupFunc()
+
+			err := k8sClient.Get(ctx, client.ObjectKey{
+				Name:      ns.Name,
+				Namespace: ns.Namespace,
+			}, ns)
+			Expect(err).Should(BeNil())
 
+			By("Creating ArgoCD CR with controller.resource.health.persist=true")
+			argoCD := &argov1beta1api.ArgoCD{
+				ObjectMeta: metav1.ObjectMeta{Name: "example-argocd", Namespace: ns.Name},
+				Spec: argov1beta1api.ArgoCDSpec{
+					Controller: argov1beta1api.ArgoCDApplicationControllerSpec{},
+				},
+			}
+			Expect(k8sClient.Create(ctx, argoCD)).To(Succeed())
+			Eventually(argoCD, "5m", "5s").Should(argocdFixture.BeAvailable())
+
+			By("Waiting for Application Controller to be ready")
+			Eventually(func() bool {
+				deploy := &appsv1.StatefulSet{}
+				err := k8sClient.Get(ctx, client.ObjectKey{
+					Name:      argoCDName + "-application-controller",
+					Namespace: ns.Name,
+				}, deploy)
+				return err == nil && deploy.Status.ReadyReplicas > 0
+			}, "1m", "5s").Should(BeTrue())
+
+			targetNamespace := &corev1.Namespace{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: appNamespace,
+					Labels: map[string]string{
+						"argocd.argoproj.io/managed-by": ns.Name,
+					},
+				},
+			}
+			By("Creating target namespace for Application")
+			Expect(k8sClient.Create(ctx, targetNamespace)).To(Succeed())
+
+			By("Creating ArgoCD Application CR")
+			app := &argoprojv1a1.Application{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      appName,
+					Namespace: ns.Name,
+				},
+				Spec: argoprojv1a1.ApplicationSpec{
+					Project: "default",
+					Source: &argoprojv1a1.ApplicationSource{
+						RepoURL:        "https://github.com/Rizwana777/argocd-example-apps",
+						Path:           "guestbook",
+						TargetRevision: "HEAD",
+					},
+					Destination: argoprojv1a1.ApplicationDestination{
+						Server:    "https://kubernetes.default.svc",
+						Namespace: targetNamespace.Name,
+					},
+					SyncPolicy: &argoprojv1a1.SyncPolicy{
+						Automated: &argoprojv1a1.SyncPolicyAutomated{},
+					},
+				},
+			}
+			Expect(k8sClient.Create(ctx, app)).To(Succeed())
+
+			By("Validating that resource health is persisted in Application CR")
+			Eventually(func() bool {
+				var fetched argoprojv1a1.Application
+				err := k8sClient.Get(ctx, types.NamespacedName{
+					Name:      appName,
+					Namespace: ns.Name,
+				}, &fetched)
+				if err != nil {
+					return false
+				}
+
+				// Check if application has resources with health information
+				if len(fetched.Status.Resources) == 0 {
+					return false
+				}
+
+				for _, res := range fetched.Status.Resources {
+					if res.Health == nil {
+						return false
+					}
+					if res.Health.Status == "" {
+						return false
+					}
+				}
+
+				// Validate resourceHealthSource is NOT present (it is omitted when health is persisted)
+				return len(fetched.Status.ResourceHealthSource) == 0
+			}, "3m", "5s").Should(BeTrue())
+
+			Expect(k8sClient.Delete(ctx, targetNamespace)).To(Succeed())
+		})
 	})
 })