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

Removes conflicting Quobyte tenant test error from API validation

Browse Source
This commit is contained in:
Silvan Kaiser 2019-07-24 11:32:47 +02:00
parent da3daf2e8a
commit a11e6a80a1
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -904,8 +904,6 @@ func validateQuobyteVolumeSource(quobyte *core.QuobyteVolumeSource, fldPath *fie
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
if len(quobyte.Registry) == 0 { if len(quobyte.Registry) == 0 {
allErrs = append(allErrs, field.Required(fldPath.Child("registry"), "must be a host:port pair or multiple pairs separated by commas")) allErrs = append(allErrs, field.Required(fldPath.Child("registry"), "must be a host:port pair or multiple pairs separated by commas"))
} else if len(quobyte.Tenant) == 0 {
allErrs = append(allErrs, field.Required(fldPath.Child("tenant"), "must be a UUID provided by the configuration and may not be omitted "))
} else if len(quobyte.Tenant) >= 65 { } else if len(quobyte.Tenant) >= 65 {
allErrs = append(allErrs, field.Required(fldPath.Child("tenant"), "must be a UUID and may not exceed a length of 64 characters")) allErrs = append(allErrs, field.Required(fldPath.Child("tenant"), "must be a UUID and may not exceed a length of 64 characters"))
} else { } else {

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

@ -3659,16 +3659,12 @@ func TestValidateVolumes(t *testing.T) {
Name: "quobyte", Name: "quobyte",
VolumeSource: core.VolumeSource{ VolumeSource: core.VolumeSource{
Quobyte: &core.QuobyteVolumeSource{ Quobyte: &core.QuobyteVolumeSource{
Registry: "registry:7861,reg2", Registry: "registry:7861",
Volume: "/test", Volume: "/test",
Tenant: "", Tenant: "",
}, },
}, },
}, },
errs: []verr{{
etype: field.ErrorTypeRequired,
field: "quobyte.tenant",
}},
}, },
{ {
name: "too long tenant quobyte", name: "too long tenant quobyte",
@ -3676,7 +3672,7 @@ func TestValidateVolumes(t *testing.T) {
Name: "quobyte", Name: "quobyte",
VolumeSource: core.VolumeSource{ VolumeSource: core.VolumeSource{
Quobyte: &core.QuobyteVolumeSource{ Quobyte: &core.QuobyteVolumeSource{
Registry: "registry:7861,reg2", Registry: "registry:7861",
Volume: "/test", Volume: "/test",
Tenant: "this is too long to be a valid uuid so this test has to fail on the maximum length validation of the tenant.", Tenant: "this is too long to be a valid uuid so this test has to fail on the maximum length validation of the tenant.",
}, },