Merge pull request #67540 from mborsz/wait3

Automatic merge from submit-queue (batch tested with PRs 67194, 67540). 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 framework.WaitForDaemonSets * when daemonsets are not ready, wait for really them * swap parameters in Logf so that they are more readable. **What this PR does / why we need it**: **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #67540 from mborsz/wait3
00816502 · Kubernetes Submit Queue · GitHub · 567b3025 · ac7ee5da · 00816502
Unverified Commit 00816502 authored Aug 17, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 17, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

util.go test/e2e/framework/util.go +3 -2

No files found.
--- a/test/e2e/framework/util.go
+++ b/test/e2e/framework/util.go
@@ -752,14 +752,15 @@ func WaitForDaemonSets(c clientset.Interface, ns string, allowedNotReadyNodes in
 		}
 		var notReadyDaemonSets []string
 		for _, ds := range dsList.Items {
-			Logf("%d / %d pods ready in namespace '%s' in daemonset '%s' (%d seconds elapsed)", ds.Status.DesiredNumberScheduled, ds.Status.NumberReady, ns, ds.ObjectMeta.Name, int(time.Since(start).Seconds()))
+			Logf("%d / %d pods ready in namespace '%s' in daemonset '%s' (%d seconds elapsed)", ds.Status.NumberReady, ds.Status.DesiredNumberScheduled, ns, ds.ObjectMeta.Name, int(time.Since(start).Seconds()))
 			if ds.Status.DesiredNumberScheduled-ds.Status.NumberReady > allowedNotReadyNodes {
 				notReadyDaemonSets = append(notReadyDaemonSets, ds.ObjectMeta.Name)
 			}
 		}

 		if len(notReadyDaemonSets) > 0 {
-			return false, fmt.Errorf("there are not ready daemonsets: %v", notReadyDaemonSets)
+			Logf("there are not ready daemonsets: %v", notReadyDaemonSets)
+			return false, nil
 		}

 		return true, nil