Merge pull request #118603 from pbetkier/deflake-hpa-e2e-behavior-tests

e2e: deflake a HPA CPU test by stabilizing cpu consumption
This commit is contained in:
Kubernetes Prow Robot 2023-06-14 09:26:29 -07:00 committed by GitHub
commit 77fd143c8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -398,7 +398,7 @@ var _ = SIGDescribe("[Feature:HPA] [Serial] [Slow] Horizontal pod autoscaling (n
ginkgo.It("should keep recommendation within the range over two stabilization windows", func(ctx context.Context) { ginkgo.It("should keep recommendation within the range over two stabilization windows", func(ctx context.Context) {
ginkgo.By("setting up resource consumer and HPA") ginkgo.By("setting up resource consumer and HPA")
initPods := 2 initPods := 1
initCPUUsageTotal := usageForReplicas(initPods) initCPUUsageTotal := usageForReplicas(initPods)
upScaleStabilization := 3 * time.Minute upScaleStabilization := 3 * time.Minute
downScaleStabilization := 3 * time.Minute downScaleStabilization := 3 * time.Minute
@ -411,7 +411,7 @@ var _ = SIGDescribe("[Feature:HPA] [Serial] [Slow] Horizontal pod autoscaling (n
ginkgo.DeferCleanup(rc.CleanUp) ginkgo.DeferCleanup(rc.CleanUp)
hpa := e2eautoscaling.CreateCPUHorizontalPodAutoscalerWithBehavior(ctx, hpa := e2eautoscaling.CreateCPUHorizontalPodAutoscalerWithBehavior(ctx,
rc, int32(targetCPUUtilizationPercent), 2, 5, rc, int32(targetCPUUtilizationPercent), 1, 5,
e2eautoscaling.HPABehaviorWithStabilizationWindows(upScaleStabilization, downScaleStabilization), e2eautoscaling.HPABehaviorWithStabilizationWindows(upScaleStabilization, downScaleStabilization),
) )
ginkgo.DeferCleanup(e2eautoscaling.DeleteHPAWithBehavior, rc, hpa.Name) ginkgo.DeferCleanup(e2eautoscaling.DeleteHPAWithBehavior, rc, hpa.Name)
@ -421,7 +421,7 @@ var _ = SIGDescribe("[Feature:HPA] [Serial] [Slow] Horizontal pod autoscaling (n
waitDeadline := upScaleStabilization waitDeadline := upScaleStabilization
ginkgo.By("verifying number of replicas stay in desired range within stabilisation window") ginkgo.By("verifying number of replicas stay in desired range within stabilisation window")
rc.EnsureDesiredReplicasInRange(ctx, 2, 2, waitDeadline, hpa.Name) rc.EnsureDesiredReplicasInRange(ctx, 1, 1, waitDeadline, hpa.Name)
ginkgo.By("waiting for replicas to scale up after stabilisation window passed") ginkgo.By("waiting for replicas to scale up after stabilisation window passed")
waitStart := time.Now() waitStart := time.Now()