Sok3t/descheduler
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/descheduler.git synced 2026-01-28 06:29:29 +01:00
Code Packages Releases Activity

e2e: deleteRC: replace loop with wait.PollImmediate

Browse Source
This commit is contained in:
Jan Chaloupka
2021-03-28 21:37:02 +02:00
parent bb55741320
commit 534a30a058
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
test/e2e/e2e_test.go
View File

@@ -1020,19 +1020,16 @@ func deleteRC(ctx context.Context, t *testing.T, clientSet clientset.Interface,
if _, err := clientSet.CoreV1().ReplicationControllers(rcdeepcopy.Namespace).Update(ctx, rcdeepcopy, metav1.UpdateOptions{}); err != nil { if _, err := clientSet.CoreV1().ReplicationControllers(rcdeepcopy.Namespace).Update(ctx, rcdeepcopy, metav1.UpdateOptions{}); err != nil {
t.Fatalf("Error updating replica controller %v", err) t.Fatalf("Error updating replica controller %v", err)
} }
allPodsDeleted := false
//wait 30 seconds until all pods are deleted
for i := 0; i < 6; i++ {
scale, _ := clientSet.CoreV1().ReplicationControllers(rc.Namespace).GetScale(ctx, rc.Name, metav1.GetOptions{})
if scale.Spec.Replicas == 0 {
allPodsDeleted = true
break
}
time.Sleep(5 * time.Second)
}
if !allPodsDeleted { // wait 30 seconds until all pods are deleted
t.Errorf("Deleting of rc pods took too long") if err := wait.PollImmediate(5*time.Second, 30*time.Second, func() (bool, error) {
scale, err := clientSet.CoreV1().ReplicationControllers(rc.Namespace).GetScale(ctx, rc.Name, metav1.GetOptions{})
if err != nil {
return false, err
}
return scale.Spec.Replicas == 0, nil
}); err != nil {
t.Fatalf("Error deleting rc pods %v", err)
} }
if err := wait.PollImmediate(5*time.Second, time.Minute, func() (bool, error) { if err := wait.PollImmediate(5*time.Second, time.Minute, func() (bool, error) {