github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-13 05:02:50 +00:00
Code Issues Projects Releases Wiki Activity

feat: cleanup feature gates for CSIPersistentVolume

Browse Source
This commit is contained in:
draveness
2019-06-23 16:46:49 +08:00
parent 8c3b7d7679
commit 8e9472ba79
10 changed files with 36 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/kubelet/app/plugins.go
View File

@@ -52,11 +52,9 @@ import (
"k8s.io/kubernetes/pkg/volume/secret"
"k8s.io/kubernetes/pkg/volume/storageos"
"k8s.io/kubernetes/pkg/volume/vsphere_volume"
// Cloud providers
_ "k8s.io/kubernetes/pkg/cloudprovider/providers"
// features check
utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/kubernetes/pkg/features"
)
// ProbeVolumePlugins collects all volume plugins into an easy to use list.
@@ -94,9 +92,7 @@ func ProbeVolumePlugins() []volume.VolumePlugin {
allPlugins = append(allPlugins, scaleio.ProbeVolumePlugins()...)
allPlugins = append(allPlugins, local.ProbeVolumePlugins()...)
allPlugins = append(allPlugins, storageos.ProbeVolumePlugins()...)
if utilfeature.DefaultFeatureGate.Enabled(features.CSIPersistentVolume) {
allPlugins = append(allPlugins, csi.ProbeVolumePlugins()...)
}
allPlugins = append(allPlugins, csi.ProbeVolumePlugins()...)
return allPlugins
}