Skip to content
This repository was archived by the owner on Feb 8, 2021. It is now read-only.

Commit 0662141

Browse files
committed
Merge pull request kubernetes#14488 from piosz/api-bug
Temporary workaround of problem with not ready endpoints.
2 parents 4d44ab5 + eb9cb8f commit 0662141

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

test/e2e/autoscaling.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ var _ = Describe("Autoscaling", func() {
5757

5858
// Consume 60% CPU
5959
millicoresPerReplica := 600
60-
rc := NewStaticResourceConsumer("rc", nodeCount*coresPerNode, millicoresPerReplica*nodeCount*coresPerNode, 0, int64(millicoresPerReplica), 100, f)
60+
rc := NewStaticResourceConsumer("cpu-utilization", nodeCount*coresPerNode, millicoresPerReplica*nodeCount*coresPerNode, 0, int64(millicoresPerReplica), 100, f)
6161
expectNoError(waitForClusterSize(f.Client, nodeCount+1, 20*time.Minute))
6262

6363
rc.CleanUp()
@@ -79,7 +79,7 @@ var _ = Describe("Autoscaling", func() {
7979

8080
// Consume 60% of total memory capacity
8181
megabytesPerReplica := int(memCapacityMb * 6 / 10 / coresPerNode)
82-
rc := NewStaticResourceConsumer("rc", nodeCount*coresPerNode, 0, megabytesPerReplica*nodeCount*coresPerNode, 100, int64(megabytesPerReplica+100), f)
82+
rc := NewStaticResourceConsumer("mem-utilization", nodeCount*coresPerNode, 0, megabytesPerReplica*nodeCount*coresPerNode, 100, int64(megabytesPerReplica+100), f)
8383
expectNoError(waitForClusterSize(f.Client, nodeCount+1, 20*time.Minute))
8484

8585
rc.CleanUp()

test/e2e/autoscaling_utils.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,4 +262,6 @@ func runServiceAndRCForResourceConsumer(c *client.Client, ns, name string, repli
262262
MemLimit: memLimitMb * 1024 * 1024, // MemLimit is in bytes
263263
}
264264
expectNoError(RunRC(config))
265+
// Wait until endpoints are processed. Temporary workaround until #14477 is fixed.
266+
time.Sleep(10 * time.Second)
265267
}

0 commit comments

Comments
 (0)