Skip to content

Commit c4851c6

Browse files
carlorycarlory
committed
remove volumeoptions from VolumePlugin and BlockVolumePlugin
1 parent 57d197f commit c4851c6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+112
-147
lines changed

‎pkg/controller/volume/attachdetach/attach_detach_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@ func (adc *attachDetachController) GetKubeClient() clientset.Interface {
798798
return adc.kubeClient
799799
}
800800

801-
func (adc *attachDetachController) NewWrapperMounter(volName string, spec volume.Spec, pod *v1.Pod, opts volume.VolumeOptions) (volume.Mounter, error) {
801+
func (adc *attachDetachController) NewWrapperMounter(volName string, spec volume.Spec, pod *v1.Pod) (volume.Mounter, error) {
802802
return nil, fmt.Errorf("NewWrapperMounter not supported by Attach/Detach controller's VolumeHost implementation")
803803
}
804804

‎pkg/controller/volume/attachdetach/testing/plugin.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func (plugin *TestPlugin) RequiresRemount(spec *volume.Spec) bool {
9292
return false
9393
}
9494

95-
func (plugin *TestPlugin) NewMounter(spec *volume.Spec, podRef *v1.Pod, opts volume.VolumeOptions) (volume.Mounter, error) {
95+
func (plugin *TestPlugin) NewMounter(spec *volume.Spec, podRef *v1.Pod) (volume.Mounter, error) {
9696
plugin.pluginLock.Lock()
9797
defer plugin.pluginLock.Unlock()
9898
if spec == nil {

‎pkg/controller/volume/expand/expand_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ func (expc *expandController) GetKubeClient() clientset.Interface {
398398
return expc.kubeClient
399399
}
400400

401-
func (expc *expandController) NewWrapperMounter(volName string, spec volume.Spec, pod *v1.Pod, opts volume.VolumeOptions) (volume.Mounter, error) {
401+
func (expc *expandController) NewWrapperMounter(volName string, spec volume.Spec, pod *v1.Pod) (volume.Mounter, error) {
402402
return nil, fmt.Errorf("NewWrapperMounter not supported by expand controller's VolumeHost implementation")
403403
}
404404

‎pkg/controller/volume/persistentvolume/framework_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,7 @@ func (plugin *mockVolumePlugin) SupportsSELinuxContextMount(spec *volume.Spec) (
10101010
return false, nil
10111011
}
10121012

1013-
func (plugin *mockVolumePlugin) NewMounter(spec *volume.Spec, podRef *v1.Pod, opts volume.VolumeOptions) (volume.Mounter, error) {
1013+
func (plugin *mockVolumePlugin) NewMounter(spec *volume.Spec, podRef *v1.Pod) (volume.Mounter, error) {
10141014
return nil, fmt.Errorf("Mounter is not supported by this plugin")
10151015
}
10161016

‎pkg/controller/volume/persistentvolume/volume_host.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func (ctrl *PersistentVolumeController) GetKubeClient() clientset.Interface {
6565
return ctrl.kubeClient
6666
}
6767

68-
func (ctrl *PersistentVolumeController) NewWrapperMounter(volName string, spec vol.Spec, pod *v1.Pod, opts vol.VolumeOptions) (vol.Mounter, error) {
68+
func (ctrl *PersistentVolumeController) NewWrapperMounter(volName string, spec vol.Spec, pod *v1.Pod) (vol.Mounter, error) {
6969
return nil, fmt.Errorf("PersistentVolumeController.NewWrapperMounter is not implemented")
7070
}
7171

‎pkg/kubelet/kubelet_volumes.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,12 @@ func (kl *Kubelet) podVolumesExist(podUID types.UID) bool {
100100
// newVolumeMounterFromPlugins attempts to find a plugin by volume spec, pod
101101
// and volume options and then creates a Mounter.
102102
// Returns a valid mounter or an error.
103-
func (kl *Kubelet) newVolumeMounterFromPlugins(spec *volume.Spec, pod *v1.Pod, opts volume.VolumeOptions) (volume.Mounter, error) {
103+
func (kl *Kubelet) newVolumeMounterFromPlugins(spec *volume.Spec, pod *v1.Pod) (volume.Mounter, error) {
104104
plugin, err := kl.volumePluginMgr.FindPluginBySpec(spec)
105105
if err != nil {
106106
return nil, fmt.Errorf("can't use volume plugins for %s: %v", spec.Name(), err)
107107
}
108-
physicalMounter, err := plugin.NewMounter(spec, pod, opts)
108+
physicalMounter, err := plugin.NewMounter(spec, pod)
109109
if err != nil {
110110
return nil, fmt.Errorf("failed to instantiate mounter for volume: %s using plugin: %s with a root cause: %v", spec.Name(), plugin.GetPluginName(), err)
111111
}

‎pkg/kubelet/volume_host.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,15 +190,14 @@ func (kvh *kubeletVolumeHost) WaitForCacheSync() error {
190190
func (kvh *kubeletVolumeHost) NewWrapperMounter(
191191
volName string,
192192
spec volume.Spec,
193-
pod *v1.Pod,
194-
opts volume.VolumeOptions) (volume.Mounter, error) {
193+
pod *v1.Pod) (volume.Mounter, error) {
195194
// The name of wrapper volume is set to "wrapped_{wrapped_volume_name}"
196195
wrapperVolumeName := "wrapped_" + volName
197196
if spec.Volume != nil {
198197
spec.Volume.Name = wrapperVolumeName
199198
}
200199

201-
return kvh.kubelet.newVolumeMounterFromPlugins(&spec, pod, opts)
200+
return kvh.kubelet.newVolumeMounterFromPlugins(&spec, pod)
202201
}
203202

204203
func (kvh *kubeletVolumeHost) NewWrapperUnmounter(volName string, spec volume.Spec, podUID types.UID) (volume.Unmounter, error) {

‎pkg/kubelet/volumemanager/cache/actual_state_of_world_test.go‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -220,12 +220,12 @@ func Test_AddPodToVolume_Positive_ExistingVolumeNewNode(t *testing.T) {
220220
}
221221
podName := util.GetUniquePodName(pod)
222222

223-
mounter, err := plugin.NewMounter(volumeSpec, pod, volume.VolumeOptions{})
223+
mounter, err := plugin.NewMounter(volumeSpec, pod)
224224
if err != nil {
225225
t.Fatalf("NewMounter failed. Expected: <no error> Actual: <%v>", err)
226226
}
227227

228-
mapper, err := plugin.NewBlockVolumeMapper(volumeSpec, pod, volume.VolumeOptions{})
228+
mapper, err := plugin.NewBlockVolumeMapper(volumeSpec, pod)
229229
if err != nil {
230230
t.Fatalf("NewBlockVolumeMapper failed. Expected: <no error> Actual: <%v>", err)
231231
}
@@ -296,12 +296,12 @@ func Test_AddPodToVolume_Positive_ExistingVolumeExistingNode(t *testing.T) {
296296
}
297297
podName := util.GetUniquePodName(pod)
298298

299-
mounter, err := plugin.NewMounter(volumeSpec, pod, volume.VolumeOptions{})
299+
mounter, err := plugin.NewMounter(volumeSpec, pod)
300300
if err != nil {
301301
t.Fatalf("NewMounter failed. Expected: <no error> Actual: <%v>", err)
302302
}
303303

304-
mapper, err := plugin.NewBlockVolumeMapper(volumeSpec, pod, volume.VolumeOptions{})
304+
mapper, err := plugin.NewBlockVolumeMapper(volumeSpec, pod)
305305
if err != nil {
306306
t.Fatalf("NewBlockVolumeMapper failed. Expected: <no error> Actual: <%v>", err)
307307
}
@@ -404,12 +404,12 @@ func Test_AddTwoPodsToVolume_Positive(t *testing.T) {
404404
}
405405
podName1 := util.GetUniquePodName(pod1)
406406

407-
mounter1, err := plugin.NewMounter(volumeSpec1, pod1, volume.VolumeOptions{})
407+
mounter1, err := plugin.NewMounter(volumeSpec1, pod1)
408408
if err != nil {
409409
t.Fatalf("NewMounter failed. Expected: <no error> Actual: <%v>", err)
410410
}
411411

412-
mapper1, err := plugin.NewBlockVolumeMapper(volumeSpec1, pod1, volume.VolumeOptions{})
412+
mapper1, err := plugin.NewBlockVolumeMapper(volumeSpec1, pod1)
413413
if err != nil {
414414
t.Fatalf("NewBlockVolumeMapper failed. Expected: <no error> Actual: <%v>", err)
415415
}
@@ -430,12 +430,12 @@ func Test_AddTwoPodsToVolume_Positive(t *testing.T) {
430430

431431
podName2 := util.GetUniquePodName(pod2)
432432

433-
mounter2, err := plugin.NewMounter(volumeSpec2, pod2, volume.VolumeOptions{})
433+
mounter2, err := plugin.NewMounter(volumeSpec2, pod2)
434434
if err != nil {
435435
t.Fatalf("NewMounter failed. Expected: <no error> Actual: <%v>", err)
436436
}
437437

438-
mapper2, err := plugin.NewBlockVolumeMapper(volumeSpec2, pod2, volume.VolumeOptions{})
438+
mapper2, err := plugin.NewBlockVolumeMapper(volumeSpec2, pod2)
439439
if err != nil {
440440
t.Fatalf("NewBlockVolumeMapper failed. Expected: <no error> Actual: <%v>", err)
441441
}
@@ -591,12 +591,12 @@ func TestActualStateOfWorld_FoundDuringReconstruction(t *testing.T) {
591591
}
592592
podName1 := util.GetUniquePodName(pod1)
593593

594-
mounter1, err := plugin.NewMounter(volumeSpec1, pod1, volume.VolumeOptions{})
594+
mounter1, err := plugin.NewMounter(volumeSpec1, pod1)
595595
if err != nil {
596596
t.Fatalf("NewMounter failed. Expected: <no error> Actual: <%v>", err)
597597
}
598598

599-
mapper1, err := plugin.NewBlockVolumeMapper(volumeSpec1, pod1, volume.VolumeOptions{})
599+
mapper1, err := plugin.NewBlockVolumeMapper(volumeSpec1, pod1)
600600
if err != nil {
601601
t.Fatalf("NewBlockVolumeMapper failed. Expected: <no error> Actual: <%v>", err)
602602
}
@@ -675,12 +675,12 @@ func Test_MarkVolumeAsDetached_Negative_PodInVolume(t *testing.T) {
675675
}
676676

677677
podName := util.GetUniquePodName(pod)
678-
mounter, err := plugin.NewMounter(volumeSpec, pod, volume.VolumeOptions{})
678+
mounter, err := plugin.NewMounter(volumeSpec, pod)
679679
if err != nil {
680680
t.Fatalf("NewMounter failed. Expected: <no error> Actual: <%v>", err)
681681
}
682682

683-
mapper, err := plugin.NewBlockVolumeMapper(volumeSpec, pod, volume.VolumeOptions{})
683+
mapper, err := plugin.NewBlockVolumeMapper(volumeSpec, pod)
684684
if err != nil {
685685
t.Fatalf("NewBlockVolumeMapper failed. Expected: <no error> Actual: <%v>", err)
686686
}
@@ -781,12 +781,12 @@ func Test_AddPodToVolume_Negative_VolumeDoesntExist(t *testing.T) {
781781

782782
podName := util.GetUniquePodName(pod)
783783

784-
mounter, err := plugin.NewMounter(volumeSpec, pod, volume.VolumeOptions{})
784+
mounter, err := plugin.NewMounter(volumeSpec, pod)
785785
if err != nil {
786786
t.Fatalf("NewMounter failed. Expected: <no error> Actual: <%v>", err)
787787
}
788788

789-
mapper, err := blockplugin.NewBlockVolumeMapper(volumeSpec, pod, volume.VolumeOptions{})
789+
mapper, err := blockplugin.NewBlockVolumeMapper(volumeSpec, pod)
790790
if err != nil {
791791
t.Fatalf("NewBlockVolumeMapper failed. Expected: <no error> Actual: <%v>", err)
792792
}
@@ -912,12 +912,12 @@ func Test_AddPodToVolume_Positive_SELinux(t *testing.T) {
912912
}
913913
podName := util.GetUniquePodName(pod)
914914

915-
mounter, err := plugin.NewMounter(volumeSpec, pod, volume.VolumeOptions{})
915+
mounter, err := plugin.NewMounter(volumeSpec, pod)
916916
if err != nil {
917917
t.Fatalf("NewMounter failed. Expected: <no error> Actual: <%v>", err)
918918
}
919919

920-
mapper, err := plugin.NewBlockVolumeMapper(volumeSpec, pod, volume.VolumeOptions{})
920+
mapper, err := plugin.NewBlockVolumeMapper(volumeSpec, pod)
921921
if err != nil {
922922
t.Fatalf("NewBlockVolumeMapper failed. Expected: <no error> Actual: <%v>", err)
923923
}
@@ -1037,7 +1037,7 @@ func TestUncertainVolumeMounts(t *testing.T) {
10371037
}
10381038
podName1 := util.GetUniquePodName(pod1)
10391039

1040-
mounter1, err := plugin.NewMounter(volumeSpec1, pod1, volume.VolumeOptions{})
1040+
mounter1, err := plugin.NewMounter(volumeSpec1, pod1)
10411041
if err != nil {
10421042
t.Fatalf("NewMounter failed. Expected: <no error> Actual: <%v>", err)
10431043
}

‎pkg/kubelet/volumemanager/metrics/metrics_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ limitations under the License.
1717
package metrics
1818

1919
import (
20-
"k8s.io/klog/v2/ktesting"
2120
"testing"
2221

22+
"k8s.io/klog/v2/ktesting"
23+
2324
v1 "k8s.io/api/core/v1"
2425
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2526
k8stypes "k8s.io/apimachinery/pkg/types"
@@ -63,12 +64,12 @@ func TestMetricCollection(t *testing.T) {
6364
t.Fatalf("AddPodToVolume failed. Expected: <no error> Actual: <%v>", err)
6465
}
6566

66-
mounter, err := fakePlugin.NewMounter(volumeSpec, pod, volume.VolumeOptions{})
67+
mounter, err := fakePlugin.NewMounter(volumeSpec, pod)
6768
if err != nil {
6869
t.Fatalf("NewMounter failed. Expected: <no error> Actual: <%v>", err)
6970
}
7071

71-
mapper, err := fakePlugin.NewBlockVolumeMapper(volumeSpec, pod, volume.VolumeOptions{})
72+
mapper, err := fakePlugin.NewBlockVolumeMapper(volumeSpec, pod)
7273
if err != nil {
7374
t.Fatalf("NewBlockVolumeMapper failed. Expected: <no error> Actual: <%v>", err)
7475
}

‎pkg/kubelet/volumemanager/reconciler/reconstruct_common.go‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -340,8 +340,7 @@ func (rc *reconciler) reconstructVolume(volume podVolume) (rvolume *reconstructe
340340
var newMapperErr error
341341
volumeMapper, newMapperErr = mapperPlugin.NewBlockVolumeMapper(
342342
volumeSpec,
343-
pod,
344-
volumepkg.VolumeOptions{})
343+
pod)
345344
if newMapperErr != nil {
346345
return nil, fmt.Errorf(
347346
"reconstructVolume.NewBlockVolumeMapper failed for volume %q (spec.Name: %q) pod %q (UID: %q) with: %v",
@@ -353,10 +352,7 @@ func (rc *reconciler) reconstructVolume(volume podVolume) (rvolume *reconstructe
353352
}
354353
} else {
355354
var err error
356-
volumeMounter, err = plugin.NewMounter(
357-
volumeSpec,
358-
pod,
359-
volumepkg.VolumeOptions{})
355+
volumeMounter, err = plugin.NewMounter(volumeSpec, pod)
360356
if err != nil {
361357
return nil, fmt.Errorf(
362358
"reconstructVolume.NewMounter failed for volume %q (spec.Name: %q) pod %q (UID: %q) with: %v",

0 commit comments

Comments
 (0)