Remove ProcMountType

pkg/api/pod/util.go

@@ -289,17 +289,15 @@ func DropDisabledRunAsGroupField(podSpec *api.PodSpec) {
 // DropDisabledProcMountField removes disabled fields from PodSpec related
 // to ProcMount
 func DropDisabledProcMountField(podSpec *api.PodSpec) {
-	if !utilfeature.DefaultFeatureGate.Enabled(features.ProcMountType) {
-		defProcMount := api.DefaultProcMount
-		for i := range podSpec.Containers {
-			if podSpec.Containers[i].SecurityContext != nil {
-				podSpec.Containers[i].SecurityContext.ProcMount = &defProcMount
-			}
+	defProcMount := api.DefaultProcMount
+	for i := range podSpec.Containers {
+		if podSpec.Containers[i].SecurityContext != nil {
+			podSpec.Containers[i].SecurityContext.ProcMount = &defProcMount
 		}
-		for i := range podSpec.InitContainers {
-			if podSpec.InitContainers[i].SecurityContext != nil {
-				podSpec.InitContainers[i].SecurityContext.ProcMount = &defProcMount
-			}
+	}
+	for i := range podSpec.InitContainers {
+		if podSpec.InitContainers[i].SecurityContext != nil {
+			podSpec.InitContainers[i].SecurityContext.ProcMount = &defProcMount
 		}
 	}
 }

pkg/api/podsecuritypolicy/util.go

@@ -17,15 +17,11 @@ limitations under the License.
 package podsecuritypolicy
 
 import (
-	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	"k8s.io/kubernetes/pkg/apis/policy"
-	"k8s.io/kubernetes/pkg/features"
 )
 
 // DropDisabledAlphaFields removes disabled fields from the pod security policy spec.
 // This should be called from PrepareForCreate/PrepareForUpdate for all resources containing a od security policy spec.
 func DropDisabledAlphaFields(pspSpec *policy.PodSecurityPolicySpec) {
-	if !utilfeature.DefaultFeatureGate.Enabled(features.ProcMountType) {
-		pspSpec.AllowedProcMountTypes = nil
-	}
+	pspSpec.AllowedProcMountTypes = nil
 }

pkg/features/kube_features.go

@@ -213,12 +213,6 @@ const (
 	// Enable resource quota scope selectors
 	ResourceQuotaScopeSelectors utilfeature.Feature = "ResourceQuotaScopeSelectors"
 
-	// owner: @jessfraz
-	// alpha: v1.12
-	//
-	// Enables control over ProcMountType for containers.
-	ProcMountType utilfeature.Feature = "ProcMountType"
-
 	// owner: @janetkuo
 	// alpha: v1.12
 	//
@@ -264,7 +258,6 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS
 	PodReadinessGates:                           {Default: true, PreRelease: utilfeature.Beta},
 	KubeletPluginsWatcher:                       {Default: true, PreRelease: utilfeature.Beta},
 	ResourceQuotaScopeSelectors:                 {Default: true, PreRelease: utilfeature.Beta},
-	ProcMountType:                               {Default: false, PreRelease: utilfeature.Alpha},
 	TTLAfterFinished:                            {Default: false, PreRelease: utilfeature.Alpha},
 
 	// inherited features from generic apiserver, relisted here to get a conflict if it is changed