github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 02:41:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #109853 from ping035627/k8s-220506

Browse Source 
Cleanup FindPluginBySpec() in VolumePluginMgr
This commit is contained in:
Kubernetes Prow Robot 2022-07-01 07:29:22 -07:00 committed by GitHub
commit 20a7253a0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/volume/plugins.go
View File

@ -662,34 +662,33 @@ func (pm *VolumePluginMgr) FindPluginBySpec(spec *Spec) (VolumePlugin, error) {
return nil, fmt.Errorf("could not find plugin because volume spec is nil") return nil, fmt.Errorf("could not find plugin because volume spec is nil")
} }
matches := []VolumePlugin{} var match VolumePlugin
matchedPluginNames := []string{}
for _, v := range pm.plugins { for _, v := range pm.plugins {
if v.CanSupport(spec) { if v.CanSupport(spec) {
matches = append(matches, v) match = v
matchedPluginNames = append(matchedPluginNames, v.GetPluginName())
} }
} }
pm.refreshProbedPlugins() pm.refreshProbedPlugins()
for _, plugin := range pm.probedPlugins { for _, plugin := range pm.probedPlugins {
if plugin.CanSupport(spec) { if plugin.CanSupport(spec) {
matches = append(matches, plugin) match = plugin
matchedPluginNames = append(matchedPluginNames, plugin.GetPluginName())
} }
} }
if len(matches) == 0 { if len(matchedPluginNames) == 0 {
return nil, fmt.Errorf("no volume plugin matched") return nil, fmt.Errorf("no volume plugin matched")
} }
if len(matches) > 1 { if len(matchedPluginNames) > 1 {
matchedPluginNames := []string{}
for _, plugin := range matches {
matchedPluginNames = append(matchedPluginNames, plugin.GetPluginName())
}
return nil, fmt.Errorf("multiple volume plugins matched: %s", strings.Join(matchedPluginNames, ",")) return nil, fmt.Errorf("multiple volume plugins matched: %s", strings.Join(matchedPluginNames, ","))
} }
// Issue warning if the matched provider is deprecated // Issue warning if the matched provider is deprecated
pm.logDeprecation(matches[0].GetPluginName()) pm.logDeprecation(match.GetPluginName())
return matches[0], nil return match, nil
} }
// FindPluginByName fetches a plugin by name or by legacy name. If no plugin // FindPluginByName fetches a plugin by name or by legacy name. If no plugin