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

Merge pull request #34724 from kargakis/another-test-fix 

Automatic merge from submit-queue

e2e: don't require minimum availability once scaling takes place

This test shouldn't care about availability at all in the first place.

@mfojtik @kubernetes/deployment  ptal

Fixes https://github.com/kubernetes/kubernetes/issues/34717
pull/6/head
Kubernetes Submit Queue 2016-10-14 05:03:32 -07:00 committed by GitHub
parent f73afdc5c2 cc2550c4e1
commit 92cb90fc5d
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/deployment.go
View File

@ -1166,8 +1166,6 @@ func testScaledRolloutDeployment(f *framework.Framework) {
By(fmt.Sprintf("Waiting for deployment status to sync (current available: %d, minimum available: %d)", deployment.Status.AvailableReplicas, deploymentutil.MinAvailable(deployment)))
err = framework.WaitForDeploymentStatusValid(c, deployment)
Expect(err).NotTo(HaveOccurred())
err = framework.WaitForDeploymentStatus(c, deployment)
Expect(err).NotTo(HaveOccurred())
// Update the deployment with a non-existent image so that the new replica set will be blocked.
By(fmt.Sprintf("Updating deployment %q with a non-existent image", deploymentName))
@ -1227,8 +1225,6 @@ func testScaledRolloutDeployment(f *framework.Framework) {
By(fmt.Sprintf("Waiting for deployment status to sync (current available: %d, minimum available: %d)", deployment.Status.AvailableReplicas, deploymentutil.MinAvailable(deployment)))
err = framework.WaitForDeploymentStatusValid(c, deployment)
Expect(err).NotTo(HaveOccurred())
err = framework.WaitForDeploymentStatus(c, deployment)
Expect(err).NotTo(HaveOccurred())
}
func testOverlappingDeployment(f *framework.Framework) {