Merge pull request #502 from mrkisaolamb/set-correct-replicas

In SimulateReady methods we should set correct replica number

Author: gibizer

modules/common/test/helpers/deployment.go

@@ -139,8 +139,8 @@ func (tc *TestHelper) SimulateDeploymentReadyWithPods(name types.NamespacedName,
 
 	gomega.Eventually(func(g gomega.Gomega) {
 		depl := tc.GetDeployment(name)
-		depl.Status.Replicas = 1
-		depl.Status.ReadyReplicas = 1
+		depl.Status.Replicas = *depl.Spec.Replicas
+		depl.Status.ReadyReplicas = *depl.Spec.Replicas
 		depl.Status.ObservedGeneration = depl.Generation
 		g.Expect(tc.K8sClient.Status().Update(tc.Ctx, depl)).To(gomega.Succeed())
 

modules/common/test/helpers/statefulset.go

@@ -47,8 +47,8 @@ func (tc *TestHelper) GetStatefulSet(name types.NamespacedName) *appsv1.Stateful
 func (tc *TestHelper) SimulateStatefulSetReplicaReady(name types.NamespacedName) {
 	gomega.Eventually(func(g gomega.Gomega) {
 		ss := tc.GetStatefulSet(name)
-		ss.Status.Replicas = 1
-		ss.Status.ReadyReplicas = 1
+		ss.Status.Replicas = *ss.Spec.Replicas
+		ss.Status.ReadyReplicas = *ss.Spec.Replicas
 		ss.Status.ObservedGeneration = ss.Generation
 		g.Expect(tc.K8sClient.Status().Update(tc.Ctx, ss)).To(gomega.Succeed())
 
@@ -108,8 +108,8 @@ func (tc *TestHelper) SimulateStatefulSetReplicaReadyWithPods(name types.Namespa
 
 	gomega.Eventually(func(g gomega.Gomega) {
 		ss := tc.GetStatefulSet(name)
-		ss.Status.Replicas = 1
-		ss.Status.ReadyReplicas = 1
+		ss.Status.Replicas = *ss.Spec.Replicas
+		ss.Status.ReadyReplicas = *ss.Spec.Replicas
 		ss.Status.ObservedGeneration = ss.Generation
 		g.Expect(tc.K8sClient.Status().Update(tc.Ctx, ss)).To(gomega.Succeed())