Commit 62fe5fe7 authored by caiweidong's avatar caiweidong

add common func for NewAttacher and NewDetacher

parent ebe32557
......@@ -550,17 +550,7 @@ var _ volume.AttachableVolumePlugin = &csiPlugin{}
var _ volume.DeviceMountableVolumePlugin = &csiPlugin{}
func (p *csiPlugin) NewAttacher() (volume.Attacher, error) {
k8s := p.host.GetKubeClient()
if k8s == nil {
klog.Error(log("unable to get kubernetes client from host"))
return nil, errors.New("unable to get Kubernetes client")
}
return &csiAttacher{
plugin: p,
k8s: k8s,
waitSleepTime: 1 * time.Second,
}, nil
return p.newAttacherDetacher()
}
func (p *csiPlugin) NewDeviceMounter() (volume.DeviceMounter, error) {
......@@ -568,17 +558,7 @@ func (p *csiPlugin) NewDeviceMounter() (volume.DeviceMounter, error) {
}
func (p *csiPlugin) NewDetacher() (volume.Detacher, error) {
k8s := p.host.GetKubeClient()
if k8s == nil {
klog.Error(log("unable to get kubernetes client from host"))
return nil, errors.New("unable to get Kubernetes client")
}
return &csiAttacher{
plugin: p,
k8s: k8s,
waitSleepTime: 1 * time.Second,
}, nil
return p.newAttacherDetacher()
}
func (p *csiPlugin) CanAttach(spec *volume.Spec) (bool, error) {
......@@ -837,6 +817,20 @@ func (p *csiPlugin) getPublishContext(client clientset.Interface, handle, driver
return attachment.Status.AttachmentMetadata, nil
}
func (p *csiPlugin) newAttacherDetacher() (*csiAttacher, error) {
k8s := p.host.GetKubeClient()
if k8s == nil {
klog.Error(log("unable to get kubernetes client from host"))
return nil, errors.New("unable to get Kubernetes client")
}
return &csiAttacher{
plugin: p,
k8s: k8s,
waitSleepTime: 1 * time.Second,
}, nil
}
func unregisterDriver(driverName string) error {
csiDrivers.Delete(driverName)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment