From 1701dba73a106a5ca8edee689303df72dfd0968a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mudrini=C4=87?= Date: Fri, 8 Mar 2019 14:12:20 +0100 Subject: [PATCH] E2E: Don't error in wait.Poll (#244) --- test/e2e/upgrade_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/upgrade_test.go b/test/e2e/upgrade_test.go index dac241484..60ac86d87 100644 --- a/test/e2e/upgrade_test.go +++ b/test/e2e/upgrade_test.go @@ -172,7 +172,7 @@ func waitForNodesReady(nodeClient corev1types.NodeInterface) error { for _, n := range nodes.Items { for _, c := range n.Status.Conditions { if c.Type == corev1.NodeReady && c.Status != corev1.ConditionTrue { - return false, errors.Errorf("node %s is not running", n.ObjectMeta.Name) + return false, nil } } } @@ -200,7 +200,7 @@ func waitForNodesUpgraded(nodeClient corev1types.NodeInterface, targetVersion st return false, err } if reqVer.Compare(kubeletVer) != 0 { - return false, errors.Errorf("kubelet version mismatch: expected %v, got %v", reqVer.String(), kubeletVer.String()) + return false, nil } } return true, nil