github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #118236 from andyzhangx/remove-azurefile

Browse Source 
removed the deprecated `azureFile` in-tree storage plugin
This commit is contained in:
Kubernetes Prow Robot
2023-05-29 09:25:54 -07:00
committed by GitHub
parent fe9ef26af5 485d1631cd
commit a6f641b656
11 changed files with 3 additions and 1386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/kube-controller-manager/app/plugins_providers.go
View File

@@ -25,7 +25,6 @@ import (
"k8s.io/klog/v2"
"k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/pkg/volume"
"k8s.io/kubernetes/pkg/volume/azure_file"
"k8s.io/kubernetes/pkg/volume/csimigration"
"k8s.io/kubernetes/pkg/volume/gcepd"
"k8s.io/kubernetes/pkg/volume/portworx"
@@ -81,24 +80,5 @@ func appendExpandableLegacyProviderVolumes(logger klog.Logger, allPlugins []volu
}
func appendLegacyProviderVolumes(logger klog.Logger, allPlugins []volume.VolumePlugin, featureGate featuregate.FeatureGate) ([]volume.VolumePlugin, error) {
var err error
// First append attachable volumes
allPlugins, err = appendAttachableLegacyProviderVolumes(logger, allPlugins, featureGate)
if err != nil {
return allPlugins, err
}
// Then append non-attachable volumes
pluginName := plugins.AzureFileInTreePluginName
pluginInfo := pluginInfo{
pluginMigrationFeature: features.CSIMigrationAzureFile,
pluginUnregisterFeature: features.InTreePluginAzureFileUnregister,
pluginProbeFunction: azure_file.ProbeVolumePlugins,
}
allPlugins, err = appendPluginBasedOnFeatureFlags(logger, allPlugins, pluginName, featureGate, pluginInfo)
if err != nil {
return allPlugins, err
}
return allPlugins, nil
return appendAttachableLegacyProviderVolumes(logger, allPlugins, featureGate)
}