scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix availableReplicas validation

Browse Source
This commit is contained in:
Michail Kargakis
2017-02-25 12:49:59 +01:00
parent 98d693e9d2
commit e0288342ef
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/validation/validation.go
View File

@@ -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
} }

8
pkg/apis/extensions/validation/validation.go
View File

@@ -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
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
} }