github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #68881 from k82cn/k8s_68857 

Removed taint check as DaemonSet tolerates default taints.
pull/8/head
k8s-ci-robot 2018-09-21 09:36:00 -07:00 committed by GitHub
parent 7b62ae3186 1fe15010cf
commit 2dec334ab8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/upgrades/apps/daemonsets.go
View File

@ -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)