Add ginkgo test changes

Add ginkgo test changes

Author: nmirasch

test/openshift/e2e/ginkgo/parallel/1-005_validate_route_tls_test.go

@@ -95,7 +95,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			Expect(serverRoute.Spec.TLS.InsecureEdgeTerminationPolicy).To(Equal(routev1.InsecureEdgeTerminationPolicyRedirect))
 			Expect(serverRoute.Spec.TLS.Termination).To(Equal(routev1.TLSTerminationReencrypt))
 
-			webhookRoute := &routev1.Route{ObjectMeta: metav1.ObjectMeta{Name: "example-applicationset-controller-webhook", Namespace: ns.Name}}
+			webhookRoute := &routev1.Route{ObjectMeta: metav1.ObjectMeta{Name: "example-appset-webhook", Namespace: ns.Name}}
 			Eventually(webhookRoute).Should(k8sFixture.ExistByName())
 			Expect(webhookRoute.Spec.To.Kind).To(Equal("Service"))
 			Expect(webhookRoute.Spec.To.Name).To(Equal("example-applicationset-controller"))

test/openshift/e2e/ginkgo/parallel/1-019_validate_volume_mounts_test.go

@@ -248,8 +248,11 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 				{
 					Name: "argocd-cmd-params-cm", VolumeSource: corev1.VolumeSource{
 						ConfigMap: &corev1.ConfigMapVolumeSource{
-							DefaultMode:          ptr.To(int32(420)),
-							Items:                []corev1.KeyToPath{{Key: "controller.profile.enabled", Path: "profiler.enabled"}},
+							DefaultMode: ptr.To(int32(420)),
+							Items: []corev1.KeyToPath{
+								{Key: "controller.profile.enabled", Path: "profiler.enabled"},
+								{Key: "controller.resource.health.persist", Path: "controller.resource.health.persist"},
+							},
 							LocalObjectReference: corev1.LocalObjectReference{Name: "argocd-cmd-params-cm"},
 							Optional:             ptr.To(true)},
 					},

test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go

@@ -85,9 +85,9 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 		It("verifies that toolchain versions have the expected values", func() {
 
 			// These variables need to be maintained according to the component matrix: https://spaces.redhat.com/display/GITOPS/GitOps+Component+Matrix
-			expected_kustomizeVersion := "v5.4.3"
-			expected_helmVersion := "v3.16.3"
-			expected_argocdVersion := "v2.14.4"
+			expected_kustomizeVersion := "v5.6.0"
+			expected_helmVersion := "v3.17.1"
+			expected_argocdVersion := "v3.0.11"
 
 			var expected_dexVersion string
 			var expected_redisVersion string
@@ -99,8 +99,8 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 
 			} else {
 				// when running against RC/ released version of gitops
-				expected_dexVersion = "v2.35.1"
-				expected_redisVersion = "6.2.7"
+				expected_dexVersion = "v2.41.1"
+				expected_redisVersion = "7.2.7"
 			}
 
 			By("locating pods containing toolchain in openshift-gitops")

test/openshift/e2e/ginkgo/parallel/1-067_validate_redis_secure_comm_no_autotls_ha_test.go

@@ -81,10 +81,14 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 
 				deploymentsShouldExist := []string{"argocd-redis-ha-haproxy", "argocd-server", "argocd-repo-server"}
 				for _, depl := range deploymentsShouldExist {
+					replicas := 1
+					if depl == "argocd-redis-ha-haproxy" {
+						replicas = 3
+					}
+
 					depl := &appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: depl, Namespace: ns.Name}}
 					Eventually(depl).Should(k8sFixture.ExistByName())
-					Eventually(depl).Should(deplFixture.HaveReplicas(1))
-					Eventually(depl).Should(deplFixture.HaveReadyReplicas(1))
+					Eventually(depl).Should(deplFixture.HaveReadyReplicas(replicas))
 				}
 
 				statefulsetsShouldExist := []string{"argocd-redis-ha-server", "argocd-application-controller"}

test/openshift/e2e/ginkgo/parallel/1-069_validate_redis_secure_comm_autotls_ha_test.go

@@ -79,10 +79,13 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 
 				deploymentsShouldExist := []string{"argocd-redis-ha-haproxy", "argocd-server", "argocd-repo-server"}
 				for _, depl := range deploymentsShouldExist {
+					replicas := 1
+					if depl == "argocd-redis-ha-haproxy" {
+						replicas = 3
+					}
 					depl := &appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: depl, Namespace: ns.Name}}
 					Eventually(depl).Should(k8sFixture.ExistByName())
-					Eventually(depl).Should(deplFixture.HaveReplicas(1))
-					Eventually(depl).Should(deplFixture.HaveReadyReplicas(1))
+					Eventually(depl).Should(deplFixture.HaveReadyReplicas(replicas))
 				}
 
 				statefulsetsShouldExist := []string{"argocd-redis-ha-server", "argocd-application-controller"}

test/openshift/e2e/ginkgo/sequential/1-020_validate_redis_ha_nonha_test.go

@@ -101,7 +101,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 					},
 				}))
 
-			Eventually(&appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "openshift-gitops-redis-ha-haproxy", Namespace: "openshift-gitops"}}, "60s", "5s").Should(deploymentFixture.HaveReadyReplicas(1))
+			Eventually(&appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "openshift-gitops-redis-ha-haproxy", Namespace: "openshift-gitops"}}, "60s", "5s").Should(deploymentFixture.HaveReadyReplicas(3))
 
 			By("verifying non-HA resources no longer exist, since HA is enabled")
 
@@ -132,7 +132,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			By("verifying Deployment and StatefulSet have expected resources that we set in previous step")
 
 			depl = &appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "openshift-gitops-redis-ha-haproxy", Namespace: "openshift-gitops"}}
-			Eventually(depl, "2m", "5s").Should(deploymentFixture.HaveReadyReplicas(1))
+			Eventually(depl, "2m", "5s").Should(deploymentFixture.HaveReadyReplicas(3))
 
 			haProxyContainer := deploymentFixture.GetTemplateSpecContainerByName("haproxy", *depl)