Merge pull request #10234 from mikedanese/rolling-update-weird

Detect if replicas have been defaulted in rolling-update and use old replica count
This commit is contained in:
Robert Bailey
2015-06-26 12:54:35 -07:00
12 changed files with 135 additions and 83 deletions

View File

@@ -101,8 +101,7 @@ var _ = Describe("Kubectl client", func() {
validateController(c, nautilusImage, 2, "update-demo", updateDemoSelector, getUDData("nautilus.jpg", ns), ns)
By("rolling-update to new replication controller")
runKubectl("rolling-update", "update-demo-nautilus", "--update-period=1s", "-f", kittenPath, fmt.Sprintf("--namespace=%v", ns))
// TODO: revisit the expected replicas once #9645 is resolved
validateController(c, kittenImage, 4, "update-demo", updateDemoSelector, getUDData("kitten.jpg", ns), ns)
validateController(c, kittenImage, 2, "update-demo", updateDemoSelector, getUDData("kitten.jpg", ns), ns)
// Everything will hopefully be cleaned up when the namespace is deleted.
})
})