github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1558 from smarterclayton/incorrect_validation_field_names

Browse Source 
Some field names in validation.go not consistent
This commit is contained in:
Tim Hockin 2014-10-02 21:05:00 -07:00
commit f9e5477e2b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,7 +164,7 @@ func AccumulateUniquePorts(containers []api.Container, accumulator map[int]bool,
continue continue
} }
if accumulator[port] { if accumulator[port] {
cErrs = append(cErrs, errs.NewFieldDuplicate("Port", port)) cErrs = append(cErrs, errs.NewFieldDuplicate("port", port))
} else { } else {
accumulator[port] = true accumulator[port] = true
} }
@ -314,7 +314,7 @@ func ValidatePod(pod *api.Pod) errs.ErrorList {
allErrs = append(allErrs, errs.NewFieldRequired("id", pod.ID)) allErrs = append(allErrs, errs.NewFieldRequired("id", pod.ID))
} }
if !util.IsDNSSubdomain(pod.Namespace) { if !util.IsDNSSubdomain(pod.Namespace) {
allErrs = append(allErrs, errs.NewFieldInvalid("pod.Namespace", pod.Namespace)) allErrs = append(allErrs, errs.NewFieldInvalid("namespace", pod.Namespace))
} }
allErrs = append(allErrs, ValidatePodState(&pod.DesiredState).Prefix("desiredState")...) allErrs = append(allErrs, ValidatePodState(&pod.DesiredState).Prefix("desiredState")...)
return allErrs return allErrs
@ -329,10 +329,10 @@ func ValidateService(service *api.Service) errs.ErrorList {
allErrs = append(allErrs, errs.NewFieldInvalid("id", service.ID)) allErrs = append(allErrs, errs.NewFieldInvalid("id", service.ID))
} }
if !util.IsDNSSubdomain(service.Namespace) { if !util.IsDNSSubdomain(service.Namespace) {
allErrs = append(allErrs, errs.NewFieldInvalid("service.Namespace", service.Namespace)) allErrs = append(allErrs, errs.NewFieldInvalid("namespace", service.Namespace))
} }
if !util.IsValidPortNum(service.Port) { if !util.IsValidPortNum(service.Port) {
allErrs = append(allErrs, errs.NewFieldInvalid("Service.Port", service.Port)) allErrs = append(allErrs, errs.NewFieldInvalid("port", service.Port))
} }
if len(service.Protocol) == 0 { if len(service.Protocol) == 0 {
service.Protocol = "TCP" service.Protocol = "TCP"
@ -352,7 +352,7 @@ func ValidateReplicationController(controller *api.ReplicationController) errs.E
allErrs = append(allErrs, errs.NewFieldRequired("id", controller.ID)) allErrs = append(allErrs, errs.NewFieldRequired("id", controller.ID))
} }
if !util.IsDNSSubdomain(controller.Namespace) { if !util.IsDNSSubdomain(controller.Namespace) {
allErrs = append(allErrs, errs.NewFieldInvalid("controller.Namespace", controller.Namespace)) allErrs = append(allErrs, errs.NewFieldInvalid("namespace", controller.Namespace))
} }
allErrs = append(allErrs, ValidateReplicationControllerState(&controller.DesiredState).Prefix("desiredState")...) allErrs = append(allErrs, ValidateReplicationControllerState(&controller.DesiredState).Prefix("desiredState")...)
return allErrs return allErrs

2
pkg/api/validation/validation_test.go
View File

@ -626,7 +626,7 @@ func TestValidateReplicationController(t *testing.T) {
field := errs[i].(errors.ValidationError).Field field := errs[i].(errors.ValidationError).Field
if !strings.HasPrefix(field, "desiredState.podTemplate.") && if !strings.HasPrefix(field, "desiredState.podTemplate.") &&
field != "id" && field != "id" &&
field != "controller.Namespace" && field != "namespace" &&
field != "desiredState.replicaSelector" && field != "desiredState.replicaSelector" &&
field != "desiredState.replicas" { field != "desiredState.replicas" {
t.Errorf("%s: missing prefix for: %v", k, errs[i]) t.Errorf("%s: missing prefix for: %v", k, errs[i])