luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

csi: pluginmanager use PluginID instead of Driver

Browse source
This commit is contained in:
Lang Martin 2020-01-28 11:27:32 -05:00 committed by Tim Gross
parent 88316208a0
commit 33c55e609b
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/pluginmanager/csimanager/interface.go
View file

@ -9,7 +9,7 @@ import (
)
var (
DriverNotFoundErr = errors.New("Driver not found")
PluginNotFoundErr = errors.New("Plugin not found")
)
type MountInfo struct {
@ -25,7 +25,7 @@ type Manager interface {
PluginManager() pluginmanager.PluginManager
// MounterForVolume returns a VolumeMounter for the given requested volume.
// If there is no plugin registered for this volume type, a DriverNotFoundErr
// If there is no plugin registered for this volume type, a PluginNotFoundErr
// will be returned.
MounterForVolume(ctx context.Context, volume *structs.CSIVolume) (VolumeMounter, error)

8
client/pluginmanager/csimanager/manager.go
View file

@ -72,12 +72,12 @@ func (c *csiManager) PluginManager() pluginmanager.PluginManager {
func (c *csiManager) MounterForVolume(ctx context.Context, vol *structs.CSIVolume) (VolumeMounter, error) {
nodePlugins, hasAnyNodePlugins := c.instances["csi-node"]
if !hasAnyNodePlugins {
return nil, DriverNotFoundErr
return nil, PluginNotFoundErr
}
mgr, hasDriver := nodePlugins[vol.Driver]
if !hasDriver {
return nil, DriverNotFoundErr
mgr, hasPlugin := nodePlugins[vol.PluginID]
if !hasPlugin {
return nil, PluginNotFoundErr
}
return mgr.VolumeMounter(ctx)