github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-19 17:16:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20389 from mqliang/deployment-MinReadySeconds

Browse Source 
Move MinReadySeconds out of RollingUpdateDeployment
This commit is contained in:
Saad Ali
2016-02-03 22:44:14 -08:00
parent 16aa40cc33 c4a1ab42e3
commit 0952dcd349
13 changed files with 1105 additions and 1107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/deployment.go
View File

@@ -474,10 +474,10 @@ func testRolloverDeployment(f *Framework) {
deploymentStrategyType := extensions.RollingUpdateDeploymentStrategyType
Logf("Creating deployment %s", deploymentName)
newDeployment := newDeployment(deploymentName, deploymentReplicas, deploymentPodLabels, deploymentImageName, deploymentImage, deploymentStrategyType, nil)
newDeployment.Spec.MinReadySeconds = deploymentMinReadySeconds
newDeployment.Spec.Strategy.RollingUpdate = &extensions.RollingUpdateDeployment{
MaxUnavailable: intstr.FromInt(1),
MaxSurge: intstr.FromInt(1),
MinReadySeconds: deploymentMinReadySeconds,
MaxUnavailable: intstr.FromInt(1),
MaxSurge: intstr.FromInt(1),
}
_, err = c.Extensions().Deployments(ns).Create(newDeployment)
Expect(err).NotTo(HaveOccurred())