Merge pull request #9955 from kargakis/validate-minreadyseconds-properly

Merged by openshift-bot
openshift · Jul 24, 2016 · 5c862c0 · 5c862c0
2 parents 607ad7f + b8682b5
commit 5c862c0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/pkg/deploy/api/validation/validation.go b/pkg/deploy/api/validation/validation.go
@@ -44,6 +44,10 @@ func ValidateDeploymentConfigSpec(spec deployapi.DeploymentConfigSpec) field.Err
 		allErrs = append(allErrs, kapivalidation.ValidateNonnegativeField(int64(*spec.RevisionHistoryLimit), specPath.Child("revisionHistoryLimit"))...)
 	}
 	allErrs = append(allErrs, kapivalidation.ValidateNonnegativeField(int64(spec.MinReadySeconds), specPath.Child("minReadySeconds"))...)
+	if int64(spec.MinReadySeconds) >= deployapi.DefaultRollingTimeoutSeconds {
+		allErrs = append(allErrs, field.Invalid(specPath.Child("minReadySeconds"), spec.MinReadySeconds,
+			fmt.Sprintf("must be less than the deployment timeout (%ds)", deployapi.DefaultRollingTimeoutSeconds)))
+	}
 	if spec.Template == nil {
 		allErrs = append(allErrs, field.Required(specPath.Child("template"), ""))
 	} else {

diff --git a/test/extended/deployments/deployments.go b/test/extended/deployments/deployments.go
@@ -551,7 +551,7 @@ var _ = g.Describe("deploymentconfigs", func() {
 	})
 
 	g.Describe("with minimum ready seconds set", func() {
-		g.It("should include various info in status [Conformance]", func() {
+		g.It("should not transition the deployment to Complete before satisfied [Conformance]", func() {
 			_, name, err := createFixture(oc, minReadySecondsFixture)
 			o.Expect(err).NotTo(o.HaveOccurred())
 

diff --git a/test/extended/testdata/deployment-min-ready-seconds.yaml b/test/extended/testdata/deployment-min-ready-seconds.yaml
@@ -4,7 +4,7 @@ metadata:
   name: minreadytest
 spec:
   replicas: 2
-  minReadySeconds: 1000
+  minReadySeconds: 500
   selector:
     name: minreadytest
   template: