Combine statefulset burst and monotonic scaling tests

pkg/controller/statefulset/stateful_set_test.go

@@ -640,7 +640,7 @@ func scaleUpStatefulSetController(set *apps.StatefulSet, ssc *StatefulSetControl
 		pod = getPodAtOrdinal(pods, ord)
 		ssc.updatePod(&prev, pod)
 		fakeWorker(ssc)
-		if err := assertInvariants(set, spc); err != nil {
+		if err := assertMonotonicInvariants(set, spc); err != nil {
 			return err
 		}
 		if obj, _, err := spc.setsIndexer.Get(set); err != nil {
@@ -650,7 +650,7 @@ func scaleUpStatefulSetController(set *apps.StatefulSet, ssc *StatefulSetControl
 		}
 
 	}
-	return assertInvariants(set, spc)
+	return assertMonotonicInvariants(set, spc)
 }
 
 func scaleDownStatefulSetController(set *apps.StatefulSet, ssc *StatefulSetController, spc *fakeStatefulPodControl) error {
@@ -692,5 +692,5 @@ func scaleDownStatefulSetController(set *apps.StatefulSet, ssc *StatefulSetContr
 			set = obj.(*apps.StatefulSet)
 		}
 	}
-	return assertInvariants(set, spc)
+	return assertMonotonicInvariants(set, spc)
 }

pkg/controller/statefulset/stateful_set_utils.go

@@ -229,7 +229,7 @@ func isHealthy(pod *v1.Pod) bool {
 
 // allowsBurst is true if the alpha burst annotation is set.
 func allowsBurst(set *apps.StatefulSet) bool {
-	return set.Annotations[apps.StatefulSetBurstAnnotation] == "true"
+	return set.Spec.PodManagementPolicy == apps.ParallelPodManagement
 }
 
 // newControllerRef returns an ControllerRef pointing to a given StatefulSet.