Merge pull request #33983 from janetkuo/check-petset-status

test/e2e/petset.go

@@ -157,6 +157,8 @@ var _ = framework.KubeDescribe("PetSet [Slow] [Feature:PetSet]", func() {
 			By("Waiting for pet at index 1 to enter running.")
 			pst.waitForRunning(2, ps)
 
+			// TODO: verify petset status.replicas
+
 			// Now we have 1 healthy and 1 unhealthy pet. Deleting the healthy pet should *not*
 			// create a new pet till the remaining pet becomes healthy, which won't happen till
 			// we set the healthy bit.
@@ -577,6 +579,8 @@ func (p *petSetTester) saturate(ps *apps.PetSet) {
 		framework.Logf("Marking pet at index " + fmt.Sprintf("%v", i) + " healthy")
 		p.setHealthy(ps)
 	}
+	framework.Logf("Waiting for pet set status.replicas updated to %d", ps.Spec.Replicas)
+	p.waitForStatus(ps, ps.Spec.Replicas)
 }
 
 func (p *petSetTester) deletePetAtIndex(index int, ps *apps.PetSet) {
@@ -708,6 +712,25 @@ func (p *petSetTester) setHealthy(ps *apps.PetSet) {
 	}
 }
 
+func (p *petSetTester) waitForStatus(ps *apps.PetSet, expectedReplicas int) {
+	ns, name := ps.Namespace, ps.Name
+	pollErr := wait.PollImmediate(petsetPoll, petsetTimeout,
+		func() (bool, error) {
+			psGet, err := p.c.Apps().PetSets(ns).Get(name)
+			if err != nil {
+				return false, err
+			}
+			if psGet.Status.Replicas != expectedReplicas {
+				framework.Logf("Waiting for pet set status to become %d, currently %d", expectedReplicas, ps.Status.Replicas)
+				return false, nil
+			}
+			return true, nil
+		})
+	if pollErr != nil {
+		framework.Failf("Failed waiting for pet set status.replicas updated to %d, got %d: %v", expectedReplicas, ps.Status.Replicas, pollErr)
+	}
+}
+
 func deleteAllPetSets(c *client.Client, ns string) {
 	pst := &petSetTester{c: c}
 	psList, err := c.Apps().PetSets(ns).List(api.ListOptions{LabelSelector: labels.Everything()})