github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Clean up ValidateHasLabel()

Browse Source
This commit is contained in:
Tim Hockin 2016-04-28 21:09:23 -07:00
parent 493b3fab65
commit 09f1c97447
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,11 +65,13 @@ func ValidateHasLabel(meta api.ObjectMeta, fldPath *field.Path, key, expectedVal
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
actualValue, found := meta.Labels[key] actualValue, found := meta.Labels[key]
if !found { if !found {
allErrs = append(allErrs, field.Required(fldPath.Child("labels"), key+"="+expectedValue)) allErrs = append(allErrs, field.Required(fldPath.Child("labels").Key(key),
fmt.Sprintf("must be '%s'", expectedValue)))
return allErrs return allErrs
} }
if actualValue != expectedValue { if actualValue != expectedValue {
allErrs = append(allErrs, field.Invalid(fldPath.Child("labels"), meta.Labels, "expected "+key+"="+expectedValue)) allErrs = append(allErrs, field.Invalid(fldPath.Child("labels").Key(key), meta.Labels,
fmt.Sprintf("must be '%s'", expectedValue)))
} }
return allErrs return allErrs
} }