@@ -550,35 +550,15 @@ var _ volume.AttachableVolumePlugin = &csiPlugin{}
550
550
var _ volume.DeviceMountableVolumePlugin = & csiPlugin {}
551
551
552
552
func (p * csiPlugin ) NewAttacher () (volume.Attacher , error ) {
553
- k8s := p .host .GetKubeClient ()
554
- if k8s == nil {
555
- klog .Error (log ("unable to get kubernetes client from host" ))
556
- return nil , errors .New ("unable to get Kubernetes client" )
557
- }
558
-
559
- return & csiAttacher {
560
- plugin : p ,
561
- k8s : k8s ,
562
- waitSleepTime : 1 * time .Second ,
563
- }, nil
553
+ return p .newAttacherDetacher ()
564
554
}
565
555
566
556
func (p * csiPlugin ) NewDeviceMounter () (volume.DeviceMounter , error ) {
567
557
return p .NewAttacher ()
568
558
}
569
559
570
560
func (p * csiPlugin ) NewDetacher () (volume.Detacher , error ) {
571
- k8s := p .host .GetKubeClient ()
572
- if k8s == nil {
573
- klog .Error (log ("unable to get kubernetes client from host" ))
574
- return nil , errors .New ("unable to get Kubernetes client" )
575
- }
576
-
577
- return & csiAttacher {
578
- plugin : p ,
579
- k8s : k8s ,
580
- waitSleepTime : 1 * time .Second ,
581
- }, nil
561
+ return p .newAttacherDetacher ()
582
562
}
583
563
584
564
func (p * csiPlugin ) CanAttach (spec * volume.Spec ) (bool , error ) {
@@ -837,6 +817,20 @@ func (p *csiPlugin) getPublishContext(client clientset.Interface, handle, driver
837
817
return attachment .Status .AttachmentMetadata , nil
838
818
}
839
819
820
+ func (p * csiPlugin ) newAttacherDetacher () (* csiAttacher , error ) {
821
+ k8s := p .host .GetKubeClient ()
822
+ if k8s == nil {
823
+ klog .Error (log ("unable to get kubernetes client from host" ))
824
+ return nil , errors .New ("unable to get Kubernetes client" )
825
+ }
826
+
827
+ return & csiAttacher {
828
+ plugin : p ,
829
+ k8s : k8s ,
830
+ waitSleepTime : 1 * time .Second ,
831
+ }, nil
832
+ }
833
+
840
834
func unregisterDriver (driverName string ) error {
841
835
csiDrivers .Delete (driverName )
842
836
0 commit comments