Commit e0288342 authored by Michail Kargakis's avatar Michail Kargakis

Fix availableReplicas validation

parent 98d693e9
...@@ -2736,8 +2736,8 @@ func ValidateReplicationControllerStatusUpdate(controller, oldController *api.Re ...@@ -2736,8 +2736,8 @@ func ValidateReplicationControllerStatusUpdate(controller, oldController *api.Re
if controller.Status.AvailableReplicas > controller.Status.Replicas { if controller.Status.AvailableReplicas > controller.Status.Replicas {
allErrs = append(allErrs, field.Invalid(statusPath.Child("availableReplicas"), controller.Status.AvailableReplicas, msg)) allErrs = append(allErrs, field.Invalid(statusPath.Child("availableReplicas"), controller.Status.AvailableReplicas, msg))
} }
if controller.Status.ReadyReplicas > controller.Status.AvailableReplicas { if controller.Status.AvailableReplicas > controller.Status.ReadyReplicas {
allErrs = append(allErrs, field.Invalid(statusPath.Child("readyReplicas"), controller.Status.ReadyReplicas, "cannot be greater than availableReplicas")) allErrs = append(allErrs, field.Invalid(statusPath.Child("availableReplicas"), controller.Status.AvailableReplicas, "cannot be greater than readyReplicas"))
} }
return allErrs return allErrs
} }
......
...@@ -292,8 +292,8 @@ func ValidateDeploymentStatus(status *extensions.DeploymentStatus, fldPath *fiel ...@@ -292,8 +292,8 @@ 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.ReadyReplicas > status.AvailableReplicas { if status.AvailableReplicas > status.ReadyReplicas {
allErrs = append(allErrs, field.Invalid(fldPath.Child("readyReplicas"), status.ReadyReplicas, "cannot be greater than availableReplicas")) allErrs = append(allErrs, field.Invalid(fldPath.Child("availableReplicas"), status.AvailableReplicas, "cannot be greater than readyReplicas"))
} }
return allErrs return allErrs
} }
...@@ -528,8 +528,8 @@ func ValidateReplicaSetStatusUpdate(rs, oldRs *extensions.ReplicaSet) field.Erro ...@@ -528,8 +528,8 @@ func ValidateReplicaSetStatusUpdate(rs, oldRs *extensions.ReplicaSet) field.Erro
if rs.Status.AvailableReplicas > rs.Status.Replicas { if rs.Status.AvailableReplicas > rs.Status.Replicas {
allErrs = append(allErrs, field.Invalid(fldPath.Child("availableReplicas"), rs.Status.AvailableReplicas, msg)) allErrs = append(allErrs, field.Invalid(fldPath.Child("availableReplicas"), rs.Status.AvailableReplicas, msg))
} }
if rs.Status.ReadyReplicas > rs.Status.AvailableReplicas { if rs.Status.AvailableReplicas > rs.Status.ReadyReplicas {
allErrs = append(allErrs, field.Invalid(fldPath.Child("readyReplicas"), rs.Status.ReadyReplicas, "cannot be greater than availableReplicas")) allErrs = append(allErrs, field.Invalid(fldPath.Child("availableReplicas"), rs.Status.AvailableReplicas, "cannot be greater than readyReplicas"))
} }
return allErrs return allErrs
} }
......
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