github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #15214 from piosz/e2e-fix 

Fixed flaky cluster size autoscaling e2e.
pull/6/head
Filip Grzadkowski 2015-10-07 11:34:27 +02:00
parent c1345ce2d9 a8bd23542f
commit 887aeaa101
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
test/e2e/autoscaling.go
View File

@ -29,6 +29,11 @@ import (
. "github.com/onsi/gomega"
)
const (
scaleUpTimeout = 20 * time.Minute
scaleDownTimeout = 30 * time.Minute
)
var _ = Describe("Autoscaling", func() {
f := NewFramework("autoscaling")
var nodeCount int
@ -58,20 +63,20 @@ var _ = Describe("Autoscaling", func() {
// Consume 50% CPU
millicoresPerReplica := 500
rc := NewStaticResourceConsumer("cpu-utilization", nodeCount*coresPerNode, millicoresPerReplica*nodeCount*coresPerNode, 0, int64(millicoresPerReplica), 100, f)
expectNoError(waitForClusterSize(f.Client, nodeCount+1, 20*time.Minute))
expectNoError(waitForClusterSize(f.Client, nodeCount+1, scaleUpTimeout))
rc.CleanUp()
expectNoError(waitForClusterSize(f.Client, nodeCount, 20*time.Minute))
expectNoError(waitForClusterSize(f.Client, nodeCount, scaleDownTimeout))
})
It("[Skipped] should scale cluster size based on cpu reservation", func() {
setUpAutoscaler("cpu/node_reservation", 0.5, nodeCount, nodeCount+1)
ReserveCpu(f, "cpu-reservation", 600*nodeCount*coresPerNode)
expectNoError(waitForClusterSize(f.Client, nodeCount+1, 20*time.Minute))
expectNoError(waitForClusterSize(f.Client, nodeCount+1, scaleUpTimeout))
expectNoError(DeleteRC(f.Client, f.Namespace.Name, "cpu-reservation"))
expectNoError(waitForClusterSize(f.Client, nodeCount, 20*time.Minute))
expectNoError(waitForClusterSize(f.Client, nodeCount, scaleDownTimeout))
})
It("[Skipped][Autoscaling Suite] should scale cluster size based on memory utilization", func() {
@ -80,20 +85,20 @@ var _ = Describe("Autoscaling", func() {
// Consume 60% of total memory capacity
megabytesPerReplica := int(memCapacityMb * 6 / 10 / coresPerNode)
rc := NewStaticResourceConsumer("mem-utilization", nodeCount*coresPerNode, 0, megabytesPerReplica*nodeCount*coresPerNode, 100, int64(megabytesPerReplica+100), f)
expectNoError(waitForClusterSize(f.Client, nodeCount+1, 20*time.Minute))
expectNoError(waitForClusterSize(f.Client, nodeCount+1, scaleUpTimeout))
rc.CleanUp()
expectNoError(waitForClusterSize(f.Client, nodeCount, 20*time.Minute))
expectNoError(waitForClusterSize(f.Client, nodeCount, scaleDownTimeout))
})
It("[Skipped] should scale cluster size based on memory reservation", func() {
setUpAutoscaler("memory/node_reservation", 0.5, nodeCount, nodeCount+1)
ReserveMemory(f, "memory-reservation", nodeCount*memCapacityMb*6/10)
expectNoError(waitForClusterSize(f.Client, nodeCount+1, 20*time.Minute))
expectNoError(waitForClusterSize(f.Client, nodeCount+1, scaleUpTimeout))
expectNoError(DeleteRC(f.Client, f.Namespace.Name, "memory-reservation"))
expectNoError(waitForClusterSize(f.Client, nodeCount, 20*time.Minute))
expectNoError(waitForClusterSize(f.Client, nodeCount, scaleDownTimeout))
})
})