Merge pull request #772 from derekwaynecarr/stop_negative_values

Validate on replicas being non-negative
pull/6/head
Daniel Smith 2014-08-04 13:13:57 -07:00
commit 94e4aa70be
2 changed files with 10 additions and 0 deletions

View File

@ -318,6 +318,9 @@ func ValidateReplicationController(controller *ReplicationController) []error {
if labels.Set(controller.DesiredState.ReplicaSelector).AsSelector().Empty() {
errors = append(errors, makeInvalidError("ReplicationController.ReplicaSelector", controller.DesiredState.ReplicaSelector))
}
if controller.DesiredState.Replicas < 0 {
errors = append(errors, makeInvalidError("ReplicationController.Replicas", controller.DesiredState.Replicas ))
}
errors = append(errors, ValidateManifest(&controller.DesiredState.PodTemplate.DesiredState.Manifest)...)
return errors
}

View File

@ -417,6 +417,13 @@ func TestValidateReplicationController(t *testing.T) {
ReplicaSelector: validSelector,
},
},
"negative_replicas": {
JSONBase: JSONBase{ID: "abc"},
DesiredState: ReplicationControllerState{
Replicas: -1,
ReplicaSelector: validSelector,
},
},
}
for k, v := range errorCases {
if errs := ValidateReplicationController(&v); len(errs) == 0 {