From 1fe15010cffd12bd3b736d6bbfe08503b5d55d01 Mon Sep 17 00:00:00 2001 From: "Da K. Ma" Date: Fri, 21 Sep 2018 07:58:29 +0800 Subject: [PATCH] Removed taint check as DaemonSet tolerates default taints. Signed-off-by: Da K. Ma --- test/e2e/upgrades/apps/daemonsets.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/e2e/upgrades/apps/daemonsets.go b/test/e2e/upgrades/apps/daemonsets.go index 3550f651bd..3503700389 100644 --- a/test/e2e/upgrades/apps/daemonsets.go +++ b/test/e2e/upgrades/apps/daemonsets.go @@ -126,11 +126,11 @@ func checkRunningOnAllNodes(f *framework.Framework, namespace string, selector m nodeNames := make([]string, 0) for _, node := range nodeList.Items { - if len(node.Spec.Taints) == 0 { - nodeNames = append(nodeNames, node.Name) - } else { - framework.Logf("Node %v not expected to have DaemonSet pod, has taints %v", node.Name, node.Spec.Taints) + if len(node.Spec.Taints) != 0 { + framework.Logf("Ignore taints %v on Node %v for DaemonSet Pod.", node.Spec.Taints, node.Name) } + // DaemonSet Pods are expected to run on all the nodes in e2e. + nodeNames = append(nodeNames, node.Name) } return checkDaemonPodOnNodes(f, namespace, selector, nodeNames)