Skip to content

K
k3s
Commit aab1cdfc authored by Marcin Wielgus's avatar Marcin Wielgus
Browse files
Options

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

Another attempt to fix problem with not ready endpoints in autoscalin…
parents 8dff00a9 b2cc7d0a
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
test/e2e/autoscaling.go
View file @ aab1cdfc
...@@ -57,7 +57,7 @@ var _ = Describe("Autoscaling", func() { ...@@ -57,7 +57,7 @@ var _ = Describe("Autoscaling", func() {
// Consume 60% CPU // Consume 60% CPU
millicoresPerReplica := 600 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)) expectNoError(waitForClusterSize(f.Client, nodeCount+1, 20*time.Minute))
rc.CleanUp() rc.CleanUp()
...@@ -79,7 +79,7 @@ var _ = Describe("Autoscaling", func() { ...@@ -79,7 +79,7 @@ var _ = Describe("Autoscaling", func() {
// Consume 60% of total memory capacity // Consume 60% of total memory capacity
megabytesPerReplica := int(memCapacityMb * 6 / 10 / coresPerNode) 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)) expectNoError(waitForClusterSize(f.Client, nodeCount+1, 20*time.Minute))
rc.CleanUp() rc.CleanUp()
......
test/e2e/autoscaling_utils.go
View file @ aab1cdfc
...@@ -250,7 +250,6 @@ func runServiceAndRCForResourceConsumer(c *client.Client, ns, name string, repli ...@@ -250,7 +250,6 @@ func runServiceAndRCForResourceConsumer(c *client.Client, ns, name string, repli
}, },
}) })
expectNoError(err) expectNoError(err)
expectNoError(waitForService(c, ns, name, true, startServiceInterval, startServiceTimeout))
config := RCConfig{ config := RCConfig{
Client: c, Client: c,
Image: image, Image: image,
...@@ -262,4 +261,7 @@ func runServiceAndRCForResourceConsumer(c *client.Client, ns, name string, repli ...@@ -262,4 +261,7 @@ func runServiceAndRCForResourceConsumer(c *client.Client, ns, name string, repli
MemLimit: memLimitMb * 1024 * 1024, // MemLimit is in bytes MemLimit: memLimitMb * 1024 * 1024, // MemLimit is in bytes
} }
expectNoError(RunRC(config)) expectNoError(RunRC(config))
// Make sure endpoints are propagated.
// TODO(piosz): replace sleep with endpoints watch.
time.Sleep(10 * time.Second)
} }
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