github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #115821 from lianghao208/scheduling_gate_name_format

Browse Source 
Validating the scheduling gate name qualified
This commit is contained in:
Kubernetes Prow Robot 2023-02-16 09:55:49 -08:00 committed by GitHub
commit bce513a2b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/apis/core/validation/validation.go
View File

@ -3365,9 +3365,7 @@ func validateSchedulingGates(schedulingGates []core.PodSchedulingGate, fldPath *
// There should be no duplicates in the list of scheduling gates.
seen := sets.String{}
for i, schedulingGate := range schedulingGates {
if schedulingGate.Name == "" {
allErrs = append(allErrs, field.Required(fldPath.Index(i), "must not be empty"))
}
allErrs = append(allErrs, ValidateQualifiedName(schedulingGate.Name, fldPath.Index(i))...)
if seen.Has(schedulingGate.Name) {
allErrs = append(allErrs, field.Duplicate(fldPath.Index(i), schedulingGate.Name))
}

13
pkg/apis/core/validation/validation_test.go
View File

@ -18696,7 +18696,10 @@ func TestValidateSchedulingGates(t *testing.T) {
{Name: "foo"},
{Name: ""},
},
wantFieldErrors: []*field.Error{field.Required(fieldPath.Index(1), "must not be empty")},
wantFieldErrors: field.ErrorList{
field.Invalid(fieldPath.Index(1), "", "name part must be non-empty"),
field.Invalid(fieldPath.Index(1), "", "name part must consist of alphanumeric characters, '-', '_' or '.', and must start and end with an alphanumeric character (e.g. 'MyName', or 'my.name', or '123-abc', regex used for validation is '([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9]')"),
},
},
{
name: "legal gates",
@ -18706,6 +18709,14 @@ func TestValidateSchedulingGates(t *testing.T) {
},
wantFieldErrors: field.ErrorList{},
},
{
name: "illegal gates",
schedulingGates: []core.PodSchedulingGate{
{Name: "foo"},
{Name: "\nbar"},
},
wantFieldErrors: []*field.Error{field.Invalid(fieldPath.Index(1), "\nbar", "name part must consist of alphanumeric characters, '-', '_' or '.', and must start and end with an alphanumeric character (e.g. 'MyName', or 'my.name', or '123-abc', regex used for validation is '([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9]')")},
},
{
name: "duplicated gates (single duplication)",
schedulingGates: []core.PodSchedulingGate{