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

make labels.NewRequirement returns aggregated field.ErrorList, make nodeaffinity parsing function use it

Browse Source 
Signed-off-by: Ling Samuel <lingsamuelgrace@gmail.com>
This commit is contained in:
Ling Samuel
2020-12-18 17:12:25 +08:00
parent 0a839c6c3b
commit a1f8dc41ef
12 changed files with 336 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/scheduler/apis/config/validation/validation_pluginargs.go
View File

@@ -284,14 +284,14 @@ func ValidateNodeAffinityArgs(args *config.NodeAffinityArgs) error {
path := field.NewPath("addedAffinity")
var errs []error
if ns := affinity.RequiredDuringSchedulingIgnoredDuringExecution; ns != nil {
_, err := nodeaffinity.NewNodeSelector(ns, nodeaffinity.WithPath(path.Child("requiredDuringSchedulingIgnoredDuringExecution")))
_, err := nodeaffinity.NewNodeSelector(ns, field.WithPath(path.Child("requiredDuringSchedulingIgnoredDuringExecution")))
if err != nil {
errs = append(errs, err)
}
}
// TODO: Add validation for requiredDuringSchedulingRequiredDuringExecution when it gets added to the API.
if terms := affinity.PreferredDuringSchedulingIgnoredDuringExecution; len(terms) != 0 {
_, err := nodeaffinity.NewPreferredSchedulingTerms(terms, nodeaffinity.WithPath(path.Child("preferredDuringSchedulingIgnoredDuringExecution")))
_, err := nodeaffinity.NewPreferredSchedulingTerms(terms, field.WithPath(path.Child("preferredDuringSchedulingIgnoredDuringExecution")))
if err != nil {
errs = append(errs, err)
}