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

Validate that volume mountpoints are unique

Browse Source
This commit is contained in:
Paul Morie 2016-03-17 23:52:34 -04:00
parent 6cd8e5c0e6
commit 24aade64f5
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1107,6 +1107,7 @@ func validateSecretKeySelector(s *api.SecretKeySelector, fldPath *field.Path) fi
func validateVolumeMounts(mounts []api.VolumeMount, volumes sets.String, fldPath *field.Path) field.ErrorList { func validateVolumeMounts(mounts []api.VolumeMount, volumes sets.String, fldPath *field.Path) field.ErrorList {
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
mountpoints := sets.NewString()
for i, mnt := range mounts { for i, mnt := range mounts {
idxPath := fldPath.Index(i) idxPath := fldPath.Index(i)
@ -1120,6 +1121,10 @@ func validateVolumeMounts(mounts []api.VolumeMount, volumes sets.String, fldPath
} else if strings.Contains(mnt.MountPath, ":") { } else if strings.Contains(mnt.MountPath, ":") {
allErrs = append(allErrs, field.Invalid(idxPath.Child("mountPath"), mnt.MountPath, "must not contain ':'")) allErrs = append(allErrs, field.Invalid(idxPath.Child("mountPath"), mnt.MountPath, "must not contain ':'"))
} }
if mountpoints.Has(mnt.MountPath) {
allErrs = append(allErrs, field.Invalid(idxPath.Child("mountPath"), mnt.MountPath, "must be unique"))
}
mountpoints.Insert(mnt.MountPath)
} }
return allErrs return allErrs
} }

13
pkg/api/validation/validation_test.go
View File

@ -1124,18 +1124,19 @@ func TestValidateVolumeMounts(t *testing.T) {
successCase := []api.VolumeMount{ successCase := []api.VolumeMount{
{Name: "abc", MountPath: "/foo"}, {Name: "abc", MountPath: "/foo"},
{Name: "123", MountPath: "/foo"}, {Name: "123", MountPath: "/bar"},
{Name: "abc-123", MountPath: "/bar"}, {Name: "abc-123", MountPath: "/baz"},
} }
if errs := validateVolumeMounts(successCase, volumes, field.NewPath("field")); len(errs) != 0 { if errs := validateVolumeMounts(successCase, volumes, field.NewPath("field")); len(errs) != 0 {
t.Errorf("expected success: %v", errs) t.Errorf("expected success: %v", errs)
} }
errorCases := map[string][]api.VolumeMount{ errorCases := map[string][]api.VolumeMount{
"empty name": {{Name: "", MountPath: "/foo"}}, "empty name": {{Name: "", MountPath: "/foo"}},
"name not found": {{Name: "", MountPath: "/foo"}}, "name not found": {{Name: "", MountPath: "/foo"}},
"empty mountpath": {{Name: "abc", MountPath: ""}}, "empty mountpath": {{Name: "abc", MountPath: ""}},
"colon mountpath": {{Name: "abc", MountPath: "foo:bar"}}, "colon mountpath": {{Name: "abc", MountPath: "foo:bar"}},
"mountpath collision": {{Name: "foo", MountPath: "/path/a"}, {Name: "bar", MountPath: "/path/a"}},
} }
for k, v := range errorCases { for k, v := range errorCases {
if errs := validateVolumeMounts(v, volumes, field.NewPath("field")); len(errs) == 0 { if errs := validateVolumeMounts(v, volumes, field.NewPath("field")); len(errs) == 0 {