Skip to content

K
k3s
Commit b2b079b9 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #51005 from wasylkowski/preparation-timeout

Automatic merge from submit-queue (batch tested with PRs 47896, 50678, 50620, 50631, 51005) Made the difference between scale-up timeout and cluster set-up timeout explicit. **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
parents d852b8aa 6a416143
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
test/e2e/autoscaling/cluster_autoscaler_scalability.go
View file @ b2b079b9
...@@ -37,10 +37,11 @@ import ( ...@@ -37,10 +37,11 @@ import (
) )
const ( const (
largeResizeTimeout = 10 * time.Minute memoryReservationTimeout = 5 * time.Minute
largeScaleUpTimeout = 10 * time.Minute largeResizeTimeout = 10 * time.Minute
largeScaleDownTimeout = 20 * time.Minute largeScaleUpTimeout = 10 * time.Minute
minute = 1 * time.Minute largeScaleDownTimeout = 20 * time.Minute
minute = 1 * time.Minute
maxNodes = 1000 maxNodes = 1000
) )
...@@ -135,7 +136,7 @@ var _ = framework.KubeDescribe("Cluster size autoscaler scalability [Slow]", fun ...@@ -135,7 +136,7 @@ var _ = framework.KubeDescribe("Cluster size autoscaler scalability [Slow]", fun
additionalReservation := additionalNodes * perNodeReservation additionalReservation := additionalNodes * perNodeReservation
// saturate cluster // saturate cluster
reservationCleanup := ReserveMemory(f, "some-pod", nodeCount*2, nodeCount*perNodeReservation, true, scaleUpTimeout) reservationCleanup := ReserveMemory(f, "some-pod", nodeCount*2, nodeCount*perNodeReservation, true, memoryReservationTimeout)
defer reservationCleanup() defer reservationCleanup()
framework.ExpectNoError(waitForAllCaPodsReadyInNamespace(f, c)) framework.ExpectNoError(waitForAllCaPodsReadyInNamespace(f, c))
...@@ -161,7 +162,7 @@ var _ = framework.KubeDescribe("Cluster size autoscaler scalability [Slow]", fun ...@@ -161,7 +162,7 @@ var _ = framework.KubeDescribe("Cluster size autoscaler scalability [Slow]", fun
glog.Infof("cores per node: %v", coresPerNode) glog.Infof("cores per node: %v", coresPerNode)
// saturate cluster // saturate cluster
reservationCleanup := ReserveMemory(f, "some-pod", nodeCount, nodeCount*perNodeReservation, true, scaleUpTimeout) reservationCleanup := ReserveMemory(f, "some-pod", nodeCount, nodeCount*perNodeReservation, true, memoryReservationTimeout)
defer reservationCleanup() defer reservationCleanup()
framework.ExpectNoError(waitForAllCaPodsReadyInNamespace(f, c)) framework.ExpectNoError(waitForAllCaPodsReadyInNamespace(f, c))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment