Merge pull request #24799 from thockin/validation_pt8-2
Automatic merge from submit-queue Make IsValidLabelValue return error strings Part of the larger validation PR, broken out for easier review and merge. Builds on previous PRs in the series.
This commit is contained in:
@@ -181,12 +181,12 @@ func SlaveAttributesToLabels(attrs []*mesos.Attribute) map[string]string {
|
||||
}
|
||||
|
||||
if errs := validation.IsQualifiedName(k); len(errs) != 0 {
|
||||
log.V(3).Infof("ignoring invalid node label name %q", k, errs)
|
||||
log.V(3).Infof("ignoring invalid node label %q: %v", k, errs)
|
||||
continue
|
||||
}
|
||||
|
||||
if !validation.IsValidLabelValue(v) {
|
||||
log.V(3).Infof("ignoring invalid node label %s value: %q", k, v)
|
||||
if errs := validation.IsValidLabelValue(v); len(errs) != 0 {
|
||||
log.V(3).Infof("ignoring invalid node %s=%q: %v", k, v, errs)
|
||||
continue
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user