github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #772 from derekwaynecarr/stop_negative_values

Browse Source 
Validate on replicas being non-negative
This commit is contained in:
Daniel Smith 2014-08-04 13:13:57 -07:00
commit 94e4aa70be
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/validation.go
View File

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

7
pkg/api/validation_test.go
View File

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