Skip to content

BUG 1856344: [sig-cluster-lifecycle][Feature:Machines][Serial] Managed cluster should grow and decrease when scaling different machineSets simultaneously #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Jul 25, 2020
Merged

BUG 1856344: [sig-cluster-lifecycle][Feature:Machines][Serial] Managed cluster should grow and decrease when scaling different machineSets simultaneously #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions pkg/framework/framework.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,10 @@ const (
)

var (
WaitShort = 1 * time.Minute
WaitMedium = 3 * time.Minute
WaitLong = 15 * time.Minute
WaitShort = 1 * time.Minute
WaitMedium = 3 * time.Minute
WaitLong = 15 * time.Minute
WaitOverLong = 30 * time.Minute
)

// DeleteObjectsByLabels list all objects of a given kind by labels and deletes them.
Expand Down
9 changes: 5 additions & 4 deletions pkg/framework/machinesets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,15 +308,16 @@ func WaitForMachineSet(c client.Client, name string) {
replicas := pointer.Int32PtrDerefOr(machineSet.Spec.Replicas, 0)

if len(machines) != int(replicas) {
return fmt.Errorf("found %d Machines, but MachineSet has %d replicas",
len(machines), int(replicas))
return fmt.Errorf("%q: found %d Machines, but MachineSet has %d replicas",
name, len(machines), int(replicas))
}

running := FilterRunningMachines(machines)

// This could probably be smarter, but seems fine for now.
if len(running) != len(machines) {
return fmt.Errorf("not all Machines are running")
return fmt.Errorf("%q: not all Machines are running: %d of %d",
name, len(running), len(machines))
}

for _, m := range running {
Expand All @@ -331,7 +332,7 @@ func WaitForMachineSet(c client.Client, name string) {
}

return nil
}, WaitLong, RetryMedium).ShouldNot(HaveOccurred())
}, WaitOverLong, RetryMedium).ShouldNot(HaveOccurred())
}

// WaitForMachineSetDelete polls until the given MachineSet is not found, and
Expand Down