Skip to content

K
k3s
Unverified Commit 33cca525 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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. ```
parents 37a19036 b87a57a1
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
pkg/features/kube_features.go
View file @ 33cca525
...@@ -137,7 +137,7 @@ const ( ...@@ -137,7 +137,7 @@ const (
TaintNodesByCondition utilfeature.Feature = "TaintNodesByCondition" TaintNodesByCondition utilfeature.Feature = "TaintNodesByCondition"
// owner: @jsafrane // owner: @jsafrane
// beta: v1.10 // GA: v1.12
// //
// Enable mount propagation of volumes. // Enable mount propagation of volumes.
MountPropagation utilfeature.Feature = "MountPropagation" MountPropagation utilfeature.Feature = "MountPropagation"
...@@ -402,7 +402,7 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS ...@@ -402,7 +402,7 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS
PodPriority: {Default: true, PreRelease: utilfeature.Beta}, PodPriority: {Default: true, PreRelease: utilfeature.Beta},
EnableEquivalenceClassCache: {Default: false, PreRelease: utilfeature.Alpha}, EnableEquivalenceClassCache: {Default: false, PreRelease: utilfeature.Alpha},
TaintNodesByCondition: {Default: true, PreRelease: utilfeature.Beta}, TaintNodesByCondition: {Default: true, PreRelease: utilfeature.Beta},
MountPropagation: {Default: true, PreRelease: utilfeature.Beta}, MountPropagation: {Default: true, PreRelease: utilfeature.GA},
QOSReserved: {Default: false, PreRelease: utilfeature.Alpha}, QOSReserved: {Default: false, PreRelease: utilfeature.Alpha},
ExpandPersistentVolumes: {Default: true, PreRelease: utilfeature.Beta}, ExpandPersistentVolumes: {Default: true, PreRelease: utilfeature.Beta},
ExpandInUsePersistentVolumes: {Default: false, PreRelease: utilfeature.Alpha}, ExpandInUsePersistentVolumes: {Default: false, PreRelease: utilfeature.Alpha},
......
pkg/kubelet/kubelet.go
View file @ 33cca525
...@@ -760,6 +760,10 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration, ...@@ -760,6 +760,10 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
tokenManager := token.NewManager(kubeDeps.KubeClient) 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 = klet.volumePluginMgr, err =
NewInitializedVolumePluginMgr(klet, secretManager, configMapManager, tokenManager, kubeDeps.VolumePlugins, kubeDeps.DynamicPluginProber) NewInitializedVolumePluginMgr(klet, secretManager, configMapManager, tokenManager, kubeDeps.VolumePlugins, kubeDeps.DynamicPluginProber)
if err != nil { if err != nil {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment