Update

Author: jgwest

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

@@ -79,17 +79,30 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 				By("waiting for ArgoCD CR to be reconciled and the instance to be ready")
 				Eventually(argoCD, "5m", "10s").Should(argocdFixture.BeAvailable())
 
-				deploymentsShouldExist := []string{"argocd-redis-ha-haproxy", "argocd-server", "argocd-repo-server"}
+				// 1 replica
+				deploymentsShouldExist := []string{"argocd-repo-server", "argocd-server"}
 				for _, depl := range deploymentsShouldExist {
 					depl := &appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: depl, Namespace: ns.Name}}
+					By("checking " + depl.Name)
 					Eventually(depl).Should(k8sFixture.ExistByName())
 					Eventually(depl).Should(deplFixture.HaveReplicas(1))
 					Eventually(depl).Should(deplFixture.HaveReadyReplicas(1))
 				}
 
+				// 3 replicas
+				deploymentsShouldExist = []string{"argocd-redis-ha-haproxy"}
+				for _, depl := range deploymentsShouldExist {
+					depl := &appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: depl, Namespace: ns.Name}}
+					By("checking " + depl.Name)
+					Eventually(depl).Should(k8sFixture.ExistByName())
+					Eventually(depl).Should(deplFixture.HaveReplicas(3))
+					Eventually(depl).Should(deplFixture.HaveReadyReplicas(3))
+				}
+
 				statefulsetsShouldExist := []string{"argocd-redis-ha-server", "argocd-application-controller"}
 				for _, ss := range statefulsetsShouldExist {
 
+					By("checking " + ss)
 					replicas := 1
 					if ss == "argocd-redis-ha-server" {
 						replicas = 3

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

@@ -77,21 +77,34 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 				By("waiting for ArgoCD CR to be reconciled and the instance to be ready")
 				Eventually(argoCD, "5m", "5s").Should(argocdFixture.BeAvailable())
 
-				deploymentsShouldExist := []string{"argocd-redis-ha-haproxy", "argocd-server", "argocd-repo-server"}
+				// 1 replica
+				deploymentsShouldExist := []string{"argocd-repo-server", "argocd-server"}
 				for _, depl := range deploymentsShouldExist {
+					By("checking " + depl)
 					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))
 				}
 
+				// 3 replicas
+				deploymentsShouldExist = []string{"argocd-redis-ha-haproxy"}
+				for _, depl := range deploymentsShouldExist {
+					By("checking " + depl)
+					depl := &appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: depl, Namespace: ns.Name}}
+					Eventually(depl).Should(k8sFixture.ExistByName())
+					Eventually(depl).Should(deplFixture.HaveReplicas(3))
+					Eventually(depl).Should(deplFixture.HaveReadyReplicas(3))
+				}
+
 				statefulsetsShouldExist := []string{"argocd-redis-ha-server", "argocd-application-controller"}
 				for _, ss := range statefulsetsShouldExist {
 
 					replicas := 1
 					if ss == "argocd-redis-ha-server" {
 						replicas = 3
 					}
+					By("checking " + ss)
 
 					statefulSet := &appsv1.StatefulSet{ObjectMeta: metav1.ObjectMeta{Name: ss, Namespace: ns.Name}}
 					Eventually(statefulSet).Should(k8sFixture.ExistByName())

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)