Merge pull request #55321 from xiangpengzhao/remove-1.5thing

Automatic merge from submit-queue (batch tested with PRs 53780, 55663, 55321, 52421, 55659). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Remove the comparison of ReadyReplicas to zero. **What this PR does / why we need it**: **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: ref: #43465 **Special notes for your reviewer**: AFAIK, we have already stopped supporting upgrades from 1.5. cc @fejta @krzyzacy **Release note**: ```release-note NONE ```

Merge pull request #55321 from xiangpengzhao/remove-1.5thing
b96c1dc5 · Kubernetes Submit Queue · GitHub · 34689638 · 3eada458 · b96c1dc5
Unverified Commit b96c1dc5 authored Nov 15, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 15, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 12 deletions

validation.go pkg/apis/extensions/validation/validation.go +1 -3

validation_test.go pkg/apis/extensions/validation/validation_test.go +0 -9

No files found.
--- a/pkg/apis/extensions/validation/validation.go
+++ b/pkg/apis/extensions/validation/validation.go
@@ -325,9 +325,7 @@ func ValidateDeploymentStatus(status *extensions.DeploymentStatus, fldPath *fiel
 	if status.AvailableReplicas > status.Replicas {
 		allErrs = append(allErrs, field.Invalid(fldPath.Child("availableReplicas"), status.AvailableReplicas, msg))
 	}
-	// TODO: ReadyReplicas is introduced in 1.6 and this check breaks the Deployment controller when pre-1.6 clusters get upgraded.
-	// 		 Remove the comparison to zero once we stop supporting upgrades from 1.5.
-	if status.ReadyReplicas > 0 && status.AvailableReplicas > status.ReadyReplicas {
+	if status.AvailableReplicas > status.ReadyReplicas {
 		allErrs = append(allErrs, field.Invalid(fldPath.Child("availableReplicas"), status.AvailableReplicas, "cannot be greater than readyReplicas"))
 	}
 	return allErrs

--- a/pkg/apis/extensions/validation/validation_test.go
+++ b/pkg/apis/extensions/validation/validation_test.go
@@ -1335,15 +1335,6 @@ func TestValidateDeploymentStatus(t *testing.T) {
 			observedGeneration: 1,
 			expectedErr:        true,
 		},
-		// TODO: Remove the following test case once we stop supporting upgrades from 1.5.
-		{
-			name:               "don't validate readyReplicas when it's zero",
-			replicas:           3,
-			readyReplicas:      0,
-			availableReplicas:  3,
-			observedGeneration: 1,
-			expectedErr:        false,
-		},
 		{
 			name:               "invalid collisionCount",
 			replicas:           3,