Merge pull request #67255 from bertinatto/promote_mount_propagation

Automatic merge from submit-queue (batch tested with PRs 65251, 67255, 67224, 67297, 68105). If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md. Promote mount propagation to GA **What this PR does / why we need it**: This PR promotes mount propagation to GA. Website PR: https://github.com/kubernetes/website/pull/9823 **Release note**: ```release-note Mount propagation has promoted to GA. The `MountPropagation` feature gate is deprecated and will be removed in 1.13. ```

Merge pull request #67255 from bertinatto/promote_mount_propagation
33cca525 · Kubernetes Submit Queue · GitHub · 37a19036 · b87a57a1 · 33cca525
Unverified Commit 33cca525 authored Aug 31, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 31, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

kube_features.go pkg/features/kube_features.go +2 -2

kubelet.go pkg/kubelet/kubelet.go +4 -0

No files found.
--- a/pkg/features/kube_features.go
+++ b/pkg/features/kube_features.go
@@ -137,7 +137,7 @@ const (
 	TaintNodesByCondition utilfeature.Feature = "TaintNodesByCondition"

 	// owner: @jsafrane
-	// beta: v1.10
+	// GA: v1.12
 	//
 	// Enable mount propagation of volumes.
 	MountPropagation utilfeature.Feature = "MountPropagation"
@@ -402,7 +402,7 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS
 	PodPriority:                                 {Default: true, PreRelease: utilfeature.Beta},
 	EnableEquivalenceClassCache:                 {Default: false, PreRelease: utilfeature.Alpha},
 	TaintNodesByCondition:                       {Default: true, PreRelease: utilfeature.Beta},
-	MountPropagation:                            {Default: true, PreRelease: utilfeature.Beta},
+	MountPropagation:                            {Default: true, PreRelease: utilfeature.GA},
 	QOSReserved:                                 {Default: false, PreRelease: utilfeature.Alpha},
 	ExpandPersistentVolumes:                     {Default: true, PreRelease: utilfeature.Beta},
 	ExpandInUsePersistentVolumes:                {Default: false, PreRelease: utilfeature.Alpha},

--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -760,6 +760,10 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration,

 	tokenManager := token.NewManager(kubeDeps.KubeClient)

+	if !utilfeature.DefaultFeatureGate.Enabled(features.MountPropagation) {
+		glog.Warning("Mount propagation feature gate has been deprecated and will be removed in the next release")
+	}
+
 	klet.volumePluginMgr, err =
 		NewInitializedVolumePluginMgr(klet, secretManager, configMapManager, tokenManager, kubeDeps.VolumePlugins, kubeDeps.DynamicPluginProber)
 	if err != nil {