Skip to content

K
k3s
Commit 0450c292 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #43465 from kargakis/update-validation

Automatic merge from submit-queue Disable readyReplicas validation for Deployments Because there is no field in 1.5, when we update to 1.6 and the controller tries to update the Deployment, it will be denied by validation because the pre-existing availableReplicas field is greater than readyReplicas (normally readyReplicas should always be greater or equal). Fixes https://github.com/kubernetes/kubernetes/issues/43392 @kubernetes/sig-apps-bugs
parents 33eb8794 7f4670d6
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 1 deletion
pkg/apis/extensions/validation/validation.go
View file @ 0450c292
...@@ -353,7 +353,9 @@ func ValidateDeploymentStatus(status *extensions.DeploymentStatus, fldPath *fiel ...@@ -353,7 +353,9 @@ func ValidateDeploymentStatus(status *extensions.DeploymentStatus, fldPath *fiel
if status.AvailableReplicas > status.Replicas { if status.AvailableReplicas > status.Replicas {
allErrs = append(allErrs, field.Invalid(fldPath.Child("availableReplicas"), status.AvailableReplicas, msg)) allErrs = append(allErrs, field.Invalid(fldPath.Child("availableReplicas"), status.AvailableReplicas, msg))
} }
if status.AvailableReplicas > status.ReadyReplicas { // 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 {
allErrs = append(allErrs, field.Invalid(fldPath.Child("availableReplicas"), status.AvailableReplicas, "cannot be greater than readyReplicas")) allErrs = append(allErrs, field.Invalid(fldPath.Child("availableReplicas"), status.AvailableReplicas, "cannot be greater than readyReplicas"))
} }
return allErrs return allErrs
......
pkg/apis/extensions/validation/validation_test.go
View file @ 0450c292
...@@ -1290,6 +1290,15 @@ func TestValidateDeploymentStatus(t *testing.T) { ...@@ -1290,6 +1290,15 @@ func TestValidateDeploymentStatus(t *testing.T) {
observedGeneration: 1, observedGeneration: 1,
expectedErr: true, 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,
},
} }
for _, test := range tests { for _, test := range tests {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment