Skip to content

K
k3s
Unverified Commit 6c91c420 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #59795 from aleksandra-malinowska/autoscaling-test-resize-timeout

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Increase timeout on waiting on cluster resize in autoscaling tests Looks like autoscaling tests in GKE are failing due to insufficient wait time for master resize. Increasing the timeout by 1 minute to help with this.
parents fd553ca8 8a98c02a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
test/e2e/autoscaling/cluster_size_autoscaling.go
View file @ 6c91c420
...@@ -54,6 +54,7 @@ import ( ...@@ -54,6 +54,7 @@ import (
const ( const (
defaultTimeout = 3 * time.Minute defaultTimeout = 3 * time.Minute
resizeTimeout = 5 * time.Minute resizeTimeout = 5 * time.Minute
manualResizeTimeout = 6 * time.Minute
scaleUpTimeout = 5 * time.Minute scaleUpTimeout = 5 * time.Minute
scaleUpTriggerTimeout = 2 * time.Minute scaleUpTriggerTimeout = 2 * time.Minute
scaleDownTimeout = 20 * time.Minute scaleDownTimeout = 20 * time.Minute
...@@ -445,7 +446,7 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() { ...@@ -445,7 +446,7 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() {
By("Waiting for new node to appear and annotating it") By("Waiting for new node to appear and annotating it")
framework.WaitForGroupSize(minMig, int32(minSize+1)) framework.WaitForGroupSize(minMig, int32(minSize+1))
// Verify, that cluster size is increased // Verify that cluster size is increased
framework.ExpectNoError(WaitForClusterSizeFunc(f.ClientSet, framework.ExpectNoError(WaitForClusterSizeFunc(f.ClientSet,
func(size int) bool { return size >= nodeCount+1 }, scaleUpTimeout)) func(size int) bool { return size >= nodeCount+1 }, scaleUpTimeout))
...@@ -537,7 +538,7 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() { ...@@ -537,7 +538,7 @@ var _ = SIGDescribe("Cluster size autoscaling [Slow]", func() {
} }
setMigSizes(newSizes) setMigSizes(newSizes)
framework.ExpectNoError(WaitForClusterSizeFuncWithUnready(f.ClientSet, framework.ExpectNoError(WaitForClusterSizeFuncWithUnready(f.ClientSet,
func(size int) bool { return size >= increasedSize }, scaleUpTimeout, unready)) func(size int) bool { return size >= increasedSize }, manualResizeTimeout, unready))
By("Some node should be removed") By("Some node should be removed")
framework.ExpectNoError(WaitForClusterSizeFuncWithUnready(f.ClientSet, framework.ExpectNoError(WaitForClusterSizeFuncWithUnready(f.ClientSet,
...@@ -1778,7 +1779,7 @@ func manuallyIncreaseClusterSize(f *framework.Framework, originalSizes map[strin ...@@ -1778,7 +1779,7 @@ func manuallyIncreaseClusterSize(f *framework.Framework, originalSizes map[strin
return false return false
} }
framework.ExpectNoError(WaitForClusterSizeFunc(f.ClientSet, checkClusterSize, scaleUpTimeout)) framework.ExpectNoError(WaitForClusterSizeFunc(f.ClientSet, checkClusterSize, manualResizeTimeout))
return increasedSize return increasedSize
} }
......
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