github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-09 21:21:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14546 from piosz/resource-consumer-fix

Browse Source 
Another attempt to fix problem with not ready endpoints in autoscalin…
This commit is contained in:
Marcin Wielgus
2015-09-25 12:06:41 +02:00
parent 8dff00a94a b2cc7d0ac0
commit aab1cdfcfd
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/autoscaling.go
View File

@@ -57,7 +57,7 @@ var _ = Describe("Autoscaling", func() {
// Consume 60% CPU
millicoresPerReplica := 600
rc := NewStaticResourceConsumer("rc", nodeCount*coresPerNode, millicoresPerReplica*nodeCount*coresPerNode, 0, int64(millicoresPerReplica), 100, f)
rc := NewStaticResourceConsumer("cpu-utilization", nodeCount*coresPerNode, millicoresPerReplica*nodeCount*coresPerNode, 0, int64(millicoresPerReplica), 100, f)
expectNoError(waitForClusterSize(f.Client, nodeCount+1, 20*time.Minute))
rc.CleanUp()
@@ -79,7 +79,7 @@ var _ = Describe("Autoscaling", func() {
// Consume 60% of total memory capacity
megabytesPerReplica := int(memCapacityMb * 6 / 10 / coresPerNode)
rc := NewStaticResourceConsumer("rc", nodeCount*coresPerNode, 0, megabytesPerReplica*nodeCount*coresPerNode, 100, int64(megabytesPerReplica+100), f)
rc := NewStaticResourceConsumer("mem-utilization", nodeCount*coresPerNode, 0, megabytesPerReplica*nodeCount*coresPerNode, 100, int64(megabytesPerReplica+100), f)
expectNoError(waitForClusterSize(f.Client, nodeCount+1, 20*time.Minute))
rc.CleanUp()

4
test/e2e/autoscaling_utils.go
View File

@@ -250,7 +250,6 @@ func runServiceAndRCForResourceConsumer(c *client.Client, ns, name string, repli
},
})
expectNoError(err)
expectNoError(waitForService(c, ns, name, true, startServiceInterval, startServiceTimeout))
config := RCConfig{
Client: c,
Image: image,
@@ -262,4 +261,7 @@ func runServiceAndRCForResourceConsumer(c *client.Client, ns, name string, repli
MemLimit: memLimitMb * 1024 * 1024, // MemLimit is in bytes
}
expectNoError(RunRC(config))
// Make sure endpoints are propagated.
// TODO(piosz): replace sleep with endpoints watch.
time.Sleep(10 * time.Second)
}