diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index a98e3fc65f..83db1dda63 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -134,13 +134,6 @@ const ( // 'MemoryPressure', 'PIDPressure' and 'DiskPressure'. TaintNodesByCondition utilfeature.Feature = "TaintNodesByCondition" - // owner: @jsafrane - // GA: v1.12 - // - // Note: This feature gate is unconditionally enabled in v1.13 and will be removed in v1.14. - // Enable mount propagation of volumes. - MountPropagation utilfeature.Feature = "MountPropagation" - // owner: @sjenning // alpha: v1.11 // @@ -443,7 +436,6 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS PodShareProcessNamespace: {Default: true, PreRelease: utilfeature.Beta}, PodPriority: {Default: true, PreRelease: utilfeature.GA}, TaintNodesByCondition: {Default: true, PreRelease: utilfeature.Beta}, - MountPropagation: {Default: true, PreRelease: utilfeature.GA, LockToDefault: true}, // remove in 1.14 QOSReserved: {Default: false, PreRelease: utilfeature.Alpha}, ExpandPersistentVolumes: {Default: true, PreRelease: utilfeature.Beta}, ExpandInUsePersistentVolumes: {Default: false, PreRelease: utilfeature.Alpha}, diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 16d9861868..9b63bcd484 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -779,10 +779,6 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration, tokenManager := token.NewManager(kubeDeps.KubeClient) - if !utilfeature.DefaultFeatureGate.Enabled(features.MountPropagation) { - return nil, fmt.Errorf("mount propagation feature gate has been deprecated and will be removed in 1.14") - } - klet.volumePluginMgr, err = NewInitializedVolumePluginMgr(klet, secretManager, configMapManager, tokenManager, kubeDeps.VolumePlugins, kubeDeps.DynamicPluginProber) if err != nil {