Skip to content

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

Merge pull request #62189 from wojtek-t/fix_disruptive_regional_tests_2

Automatic merge from submit-queue (batch tested with PRs 56045, 61447, 62189). 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>. Fix resize nodes tests for Regional Clusters
parents f239270e 112a28b4
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
test/e2e/lifecycle/resize_nodes.go
View file @ 5fa4f2f6
...@@ -119,10 +119,11 @@ var _ = SIGDescribe("Nodes [Disruptive]", func() { ...@@ -119,10 +119,11 @@ var _ = SIGDescribe("Nodes [Disruptive]", func() {
err = framework.VerifyPods(c, ns, name, true, replicas) err = framework.VerifyPods(c, ns, name, true, replicas)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
By(fmt.Sprintf("decreasing cluster size to %d", replicas-1)) targetNumNodes := int32(framework.TestContext.CloudConfig.NumNodes - 1)
err = framework.ResizeGroup(group, replicas-1) By(fmt.Sprintf("decreasing cluster size to %d", targetNumNodes))
err = framework.ResizeGroup(group, targetNumNodes)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
err = framework.WaitForGroupSize(group, replicas-1) err = framework.WaitForGroupSize(group, targetNumNodes)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
err = framework.WaitForReadyNodes(c, int(replicas-1), 10*time.Minute) err = framework.WaitForReadyNodes(c, int(replicas-1), 10*time.Minute)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
...@@ -149,10 +150,11 @@ var _ = SIGDescribe("Nodes [Disruptive]", func() { ...@@ -149,10 +150,11 @@ var _ = SIGDescribe("Nodes [Disruptive]", func() {
err = framework.VerifyPods(c, ns, name, true, replicas) err = framework.VerifyPods(c, ns, name, true, replicas)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
By(fmt.Sprintf("increasing cluster size to %d", replicas+1)) targetNumNodes := int32(framework.TestContext.CloudConfig.NumNodes + 1)
err = framework.ResizeGroup(group, replicas+1) By(fmt.Sprintf("increasing cluster size to %d", targetNumNodes))
err = framework.ResizeGroup(group, targetNumNodes)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
err = framework.WaitForGroupSize(group, replicas+1) err = framework.WaitForGroupSize(group, targetNumNodes)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
err = framework.WaitForReadyNodes(c, int(replicas+1), 10*time.Minute) err = framework.WaitForReadyNodes(c, int(replicas+1), 10*time.Minute)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
......
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