github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 23:15:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #77433 from cwdsuzhou/common_func_for_ad

Browse Source 
Add common func for NewAttacher and NewDetacher
This commit is contained in:
Kubernetes Prow Robot 2019-05-07 09:51:56 -07:00 committed by GitHub
commit e332051416
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkg/volume/csi/csi_plugin.go
View File

@ -550,17 +550,7 @@ var _ volume.AttachableVolumePlugin = &csiPlugin{}
var _ volume.DeviceMountableVolumePlugin = &csiPlugin{} var _ volume.DeviceMountableVolumePlugin = &csiPlugin{}
func (p *csiPlugin) NewAttacher() (volume.Attacher, error) { func (p *csiPlugin) NewAttacher() (volume.Attacher, error) {
k8s := p.host.GetKubeClient() return p.newAttacherDetacher()
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 (p *csiPlugin) NewDeviceMounter() (volume.DeviceMounter, error) { 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) { func (p *csiPlugin) NewDetacher() (volume.Detacher, error) {
k8s := p.host.GetKubeClient() return p.newAttacherDetacher()
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 (p *csiPlugin) CanAttach(spec *volume.Spec) (bool, error) { 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 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 { func unregisterDriver(driverName string) error {
csiDrivers.Delete(driverName) csiDrivers.Delete(driverName)