From c4a02542015c9812ef0c6df9fd0c8d96dbfa902a Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Tue, 18 Dec 2018 10:11:29 -0500 Subject: [PATCH] remove subpath feature validation failure --- pkg/apis/core/validation/validation.go | 6 +----- pkg/apis/core/validation/validation_test.go | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/apis/core/validation/validation.go b/pkg/apis/core/validation/validation.go index 4643720eddd..c81aa339bff 100644 --- a/pkg/apis/core/validation/validation.go +++ b/pkg/apis/core/validation/validation.go @@ -2299,11 +2299,7 @@ func ValidateVolumeMounts(mounts []core.VolumeMount, voldevices map[string]strin } if len(mnt.SubPath) > 0 { - if !utilfeature.DefaultFeatureGate.Enabled(features.VolumeSubpath) { - allErrs = append(allErrs, field.Forbidden(fldPath.Child("subPath"), "subPath is disabled by feature-gate")) - } else { - allErrs = append(allErrs, validateLocalDescendingPath(mnt.SubPath, fldPath.Child("subPath"))...) - } + allErrs = append(allErrs, validateLocalDescendingPath(mnt.SubPath, fldPath.Child("subPath"))...) } if mnt.MountPropagation != nil { diff --git a/pkg/apis/core/validation/validation_test.go b/pkg/apis/core/validation/validation_test.go index 1c53800f704..9cfe7369e70 100644 --- a/pkg/apis/core/validation/validation_test.go +++ b/pkg/apis/core/validation/validation_test.go @@ -4931,7 +4931,7 @@ func TestValidateDisabledSubpath(t *testing.T) { SubPath: "baz", }, }, - true, + false, // validation should not fail, dropping the field is handled in PrepareForCreate/PrepareForUpdate }, }