Skip to content

K
k3s
Commit ac7ee5da authored by Maciej Borsz's avatar Maciej Borsz
Browse files
Options

Fix framework.WaitForDaemonSets:

* when daemonsets are not ready, wait for really them * swap parameters in Logf so that they are more readable.
parent de1656ab
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
test/e2e/framework/util.go
View file @ ac7ee5da
...@@ -752,14 +752,15 @@ func WaitForDaemonSets(c clientset.Interface, ns string, allowedNotReadyNodes in ...@@ -752,14 +752,15 @@ func WaitForDaemonSets(c clientset.Interface, ns string, allowedNotReadyNodes in
} }
var notReadyDaemonSets []string var notReadyDaemonSets []string
for _, ds := range dsList.Items { 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 { if ds.Status.DesiredNumberScheduled-ds.Status.NumberReady > allowedNotReadyNodes {
notReadyDaemonSets = append(notReadyDaemonSets, ds.ObjectMeta.Name) notReadyDaemonSets = append(notReadyDaemonSets, ds.ObjectMeta.Name)
} }
} }
if len(notReadyDaemonSets) > 0 { 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 return true, nil
......
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