mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
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 ```
This commit is contained in:
commit
b2b079b95a
@ -37,10 +37,11 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
largeResizeTimeout = 10 * time.Minute
|
||||
largeScaleUpTimeout = 10 * time.Minute
|
||||
largeScaleDownTimeout = 20 * time.Minute
|
||||
minute = 1 * time.Minute
|
||||
memoryReservationTimeout = 5 * time.Minute
|
||||
largeResizeTimeout = 10 * time.Minute
|
||||
largeScaleUpTimeout = 10 * time.Minute
|
||||
largeScaleDownTimeout = 20 * time.Minute
|
||||
minute = 1 * time.Minute
|
||||
|
||||
maxNodes = 1000
|
||||
)
|
||||
@ -135,7 +136,7 @@ var _ = framework.KubeDescribe("Cluster size autoscaler scalability [Slow]", fun
|
||||
additionalReservation := additionalNodes * perNodeReservation
|
||||
|
||||
// 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()
|
||||
framework.ExpectNoError(waitForAllCaPodsReadyInNamespace(f, c))
|
||||
|
||||
@ -161,7 +162,7 @@ var _ = framework.KubeDescribe("Cluster size autoscaler scalability [Slow]", fun
|
||||
glog.Infof("cores per node: %v", coresPerNode)
|
||||
|
||||
// saturate cluster
|
||||
reservationCleanup := ReserveMemory(f, "some-pod", nodeCount, nodeCount*perNodeReservation, true, scaleUpTimeout)
|
||||
reservationCleanup := ReserveMemory(f, "some-pod", nodeCount, nodeCount*perNodeReservation, true, memoryReservationTimeout)
|
||||
defer reservationCleanup()
|
||||
framework.ExpectNoError(waitForAllCaPodsReadyInNamespace(f, c))
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user