github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Changed plugin name from exported to private

pull/6/head
markturansky 2015-06-29 13:04:09 -04:00
parent 70644b6889
commit 7e1eb15434
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/volume/iscsi/iscsi.go
View File

@ -30,29 +30,29 @@ import (
// This is the primary entrypoint for volume plugins.
func ProbeVolumePlugins() []volume.VolumePlugin {
return []volume.VolumePlugin{&ISCSIPlugin{nil, exec.New()}}
return []volume.VolumePlugin{&iscsiPlugin{nil, exec.New()}}
}
type ISCSIPlugin struct {
type iscsiPlugin struct {
host volume.VolumeHost
exe exec.Interface
}
var _ volume.VolumePlugin = &ISCSIPlugin{}
var _ volume.VolumePlugin = &iscsiPlugin{}
const (
ISCSIPluginName = "kubernetes.io/iscsi"
iscsiPluginName = "kubernetes.io/iscsi"
)
func (plugin *ISCSIPlugin) Init(host volume.VolumeHost) {
func (plugin *iscsiPlugin) Init(host volume.VolumeHost) {
plugin.host = host
}
func (plugin *ISCSIPlugin) Name() string {
return ISCSIPluginName
func (plugin *iscsiPlugin) Name() string {
return iscsiPluginName
}
func (plugin *ISCSIPlugin) CanSupport(spec *volume.Spec) bool {
func (plugin *iscsiPlugin) CanSupport(spec *volume.Spec) bool {
if spec.VolumeSource.ISCSI == nil && spec.PersistentVolumeSource.ISCSI == nil {
return false
}
@ -67,19 +67,19 @@ func (plugin *ISCSIPlugin) CanSupport(spec *volume.Spec) bool {
return false
}
func (plugin *ISCSIPlugin) GetAccessModes() []api.PersistentVolumeAccessMode {
func (plugin *iscsiPlugin) GetAccessModes() []api.PersistentVolumeAccessMode {
return []api.PersistentVolumeAccessMode{
api.ReadWriteOnce,
api.ReadOnlyMany,
}
}
func (plugin *ISCSIPlugin) NewBuilder(spec *volume.Spec, pod *api.Pod, _ volume.VolumeOptions, mounter mount.Interface) (volume.Builder, error) {
func (plugin *iscsiPlugin) NewBuilder(spec *volume.Spec, pod *api.Pod, _ volume.VolumeOptions, mounter mount.Interface) (volume.Builder, error) {
// Inject real implementations here, test through the internal function.
return plugin.newBuilderInternal(spec, pod.UID, &ISCSIUtil{}, mounter)
}
func (plugin *ISCSIPlugin) newBuilderInternal(spec *volume.Spec, podUID types.UID, manager diskManager, mounter mount.Interface) (volume.Builder, error) {
func (plugin *iscsiPlugin) newBuilderInternal(spec *volume.Spec, podUID types.UID, manager diskManager, mounter mount.Interface) (volume.Builder, error) {
var iscsi *api.ISCSIVolumeSource
if spec.VolumeSource.ISCSI != nil {
iscsi = spec.VolumeSource.ISCSI
@ -103,12 +103,12 @@ func (plugin *ISCSIPlugin) newBuilderInternal(spec *volume.Spec, podUID types.UI
}, nil
}
func (plugin *ISCSIPlugin) NewCleaner(volName string, podUID types.UID, mounter mount.Interface) (volume.Cleaner, error) {
func (plugin *iscsiPlugin) NewCleaner(volName string, podUID types.UID, mounter mount.Interface) (volume.Cleaner, error) {
// Inject real implementations here, test through the internal function.
return plugin.newCleanerInternal(volName, podUID, &ISCSIUtil{}, mounter)
}
func (plugin *ISCSIPlugin) newCleanerInternal(volName string, podUID types.UID, manager diskManager, mounter mount.Interface) (volume.Cleaner, error) {
func (plugin *iscsiPlugin) newCleanerInternal(volName string, podUID types.UID, manager diskManager, mounter mount.Interface) (volume.Cleaner, error) {
return &iscsiDisk{
podUID: podUID,
volName: volName,
@ -118,7 +118,7 @@ func (plugin *ISCSIPlugin) newCleanerInternal(volName string, podUID types.UID,
}, nil
}
func (plugin *ISCSIPlugin) execCommand(command string, args []string) ([]byte, error) {
func (plugin *iscsiPlugin) execCommand(command string, args []string) ([]byte, error) {
cmd := plugin.exe.Command(command, args...)
return cmd.CombinedOutput()
}
@ -131,14 +131,14 @@ type iscsiDisk struct {
readOnly bool
lun string
fsType string
plugin *ISCSIPlugin
plugin *iscsiPlugin
mounter mount.Interface
// Utility interface that provides API calls to the provider to attach/detach disks.
manager diskManager
}
func (iscsi *iscsiDisk) GetPath() string {
name := ISCSIPluginName
name := iscsiPluginName
// safe to use PodVolumeDir now: volume teardown occurs before pod is cleaned up
return iscsi.plugin.host.GetPodVolumeDir(iscsi.podUID, util.EscapeQualifiedNameForDisk(name), iscsi.volName)
}

4
pkg/volume/iscsi/iscsi_test.go
View File

@ -106,7 +106,7 @@ func doTestPlugin(t *testing.T, spec *volume.Spec) {
}
fakeManager := &fakeDiskManager{}
fakeMounter := &mount.FakeMounter{}
builder, err := plug.(*ISCSIPlugin).newBuilderInternal(spec, types.UID("poduid"), fakeManager, fakeMounter)
builder, err := plug.(*iscsiPlugin).newBuilderInternal(spec, types.UID("poduid"), fakeManager, fakeMounter)
if err != nil {
t.Errorf("Failed to make a new Builder: %v", err)
}
@ -141,7 +141,7 @@ func doTestPlugin(t *testing.T, spec *volume.Spec) {
}
fakeManager = &fakeDiskManager{}
cleaner, err := plug.(*ISCSIPlugin).newCleanerInternal("vol1", types.UID("poduid"), fakeManager, fakeMounter)
cleaner, err := plug.(*iscsiPlugin).newCleanerInternal("vol1", types.UID("poduid"), fakeManager, fakeMounter)
if err != nil {
t.Errorf("Failed to make a new Cleaner: %v", err)
}

2
pkg/volume/iscsi/iscsi_util.go
View File

@ -69,7 +69,7 @@ func getDevicePrefixRefCount(mounter mount.Interface, deviceNamePrefix string) (
// make a directory like /var/lib/kubelet/plugins/kubernetes.io/pod/iscsi/portal-iqn-some_iqn-lun-0
func makePDNameInternal(host volume.VolumeHost, portal string, iqn string, lun string) string {
return path.Join(host.GetPluginDir(ISCSIPluginName), "iscsi", portal+"-iqn-"+iqn+"-lun-"+lun)
return path.Join(host.GetPluginDir(iscsiPluginName), "iscsi", portal+"-iqn-"+iqn+"-lun-"+lun)
}
type ISCSIUtil struct{}