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

Merge pull request #74293 from lubinsz/pr_ds 

Fix conformance daemon_set test failing in local cluster
pull/564/head
Kubernetes Prow Robot 2019-02-22 17:58:33 -08:00 committed by GitHub
parent fd7acc3275 ab165fc6e5
commit ee95a1a349
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e/apps/daemon_set.go
View File

@ -377,7 +377,6 @@ var _ = SIGDescribe("Daemon set [Serial]", func() {
if framework.TestContext.CloudConfig.NumNodes < 2 {
framework.Logf("Conformance test suite needs a cluster with at least 2 nodes.")
}
framework.Logf("Create a RollingUpdate DaemonSet")
label := map[string]string{daemonsetNameLabel: dsName}
ds := newDaemonSet(dsName, image, label)
@ -415,7 +414,11 @@ var _ = SIGDescribe("Daemon set [Serial]", func() {
framework.Failf("unexpected pod found, image = %s", image)
}
}
Expect(len(existingPods)).NotTo(Equal(0))
if framework.TestContext.CloudConfig.NumNodes < 2 {
Expect(len(existingPods)).To(Equal(0))
} else {
Expect(len(existingPods)).NotTo(Equal(0))
}
Expect(len(newPods)).NotTo(Equal(0))
framework.Logf("Roll back the DaemonSet before rollout is complete")