@@ -89,6 +89,7 @@ func createSubPathTestInput(pattern testpatterns.TestPattern, resource subPathTe
8989 filePathInVolume : filepath .Join (subPathDir , fileName ),
9090 volType : resource .volType ,
9191 pod : resource .pod ,
92+ formatPod : resource .formatPod ,
9293 volSource : resource .genericVolumeTestResource .volSource ,
9394 roVol : resource .roVolSource ,
9495 }
@@ -131,6 +132,7 @@ type subPathTestResource struct {
131132
132133 roVolSource * v1.VolumeSource
133134 pod * v1.Pod
135+ formatPod * v1.Pod
134136}
135137
136138var _ TestResource = & subPathTestResource {}
@@ -171,9 +173,13 @@ func (s *subPathTestResource) setupResource(driver drivers.TestDriver, pattern t
171173
172174 subPath := f .Namespace .Name
173175 config := dInfo .Config
174- s .pod = TestPodSubpath (f , subPath , s .volType , s .volSource , true )
176+ s .pod = SubpathTestPod (f , subPath , s .volType , s .volSource , true )
175177 s .pod .Spec .NodeName = config .ClientNodeName
176178 s .pod .Spec .NodeSelector = config .NodeSelector
179+
180+ s .formatPod = volumeFormatPod (f , s .volSource )
181+ s .formatPod .Spec .NodeName = config .ClientNodeName
182+ s .formatPod .Spec .NodeSelector = config .NodeSelector
177183}
178184
179185func (s * subPathTestResource ) cleanupResource (driver drivers.TestDriver , pattern testpatterns.TestPattern ) {
@@ -196,6 +202,7 @@ type subPathTestInput struct {
196202 filePathInVolume string
197203 volType string
198204 pod * v1.Pod
205+ formatPod * v1.Pod
199206 volSource * v1.VolumeSource
200207 roVol * v1.VolumeSource
201208}
@@ -359,7 +366,7 @@ func testSubPath(input *subPathTestInput) {
359366 }
360367
361368 // Format the volume while it's writable
362- formatVolume (input .f , input .volSource )
369+ formatVolume (input .f , input .formatPod )
363370
364371 // Set volume source to read only
365372 input .pod .Spec .Volumes [0 ].VolumeSource = * input .roVol
@@ -387,8 +394,8 @@ func TestBasicSubpathFile(f *framework.Framework, contents string, pod *v1.Pod,
387394 Expect (err ).NotTo (HaveOccurred (), "while deleting pod" )
388395}
389396
390- // TestPodSubpath runs pod subpath test
391- func TestPodSubpath (f * framework.Framework , subpath , volumeType string , source * v1.VolumeSource , privilegedSecurityContext bool ) * v1.Pod {
397+ // SubpathTestPod returns a pod spec for subpath tests
398+ func SubpathTestPod (f * framework.Framework , subpath , volumeType string , source * v1.VolumeSource , privilegedSecurityContext bool ) * v1.Pod {
392399 var (
393400 suffix = strings .ToLower (fmt .Sprintf ("%s-%s" , volumeType , rand .String (4 )))
394401 gracePeriod = int64 (1 )
@@ -479,6 +486,38 @@ func TestPodSubpath(f *framework.Framework, subpath, volumeType string, source *
479486 }
480487}
481488
489+ // volumeFormatPod returns a Pod that does nothing but will cause the plugin to format a filesystem
490+ // on first use
491+ func volumeFormatPod (f * framework.Framework , volumeSource * v1.VolumeSource ) * v1.Pod {
492+ return & v1.Pod {
493+ ObjectMeta : metav1.ObjectMeta {
494+ Name : fmt .Sprintf ("volume-prep-%s" , f .Namespace .Name ),
495+ },
496+ Spec : v1.PodSpec {
497+ Containers : []v1.Container {
498+ {
499+ Name : fmt .Sprintf ("init-volume-%s" , f .Namespace .Name ),
500+ Image : imageutils .GetE2EImage (imageutils .BusyBox ),
501+ Command : []string {"/bin/sh" , "-ec" , "echo nothing" },
502+ VolumeMounts : []v1.VolumeMount {
503+ {
504+ Name : volumeName ,
505+ MountPath : "/vol" ,
506+ },
507+ },
508+ },
509+ },
510+ RestartPolicy : v1 .RestartPolicyNever ,
511+ Volumes : []v1.Volume {
512+ {
513+ Name : volumeName ,
514+ VolumeSource : * volumeSource ,
515+ },
516+ },
517+ },
518+ }
519+ }
520+
482521func clearSubpathPodCommands (pod * v1.Pod ) {
483522 pod .Spec .InitContainers [0 ].Command = nil
484523 pod .Spec .Containers [0 ].Args = nil
@@ -684,38 +723,9 @@ func testSubpathReconstruction(f *framework.Framework, pod *v1.Pod, forceDelete
684723 utils .TestVolumeUnmountsFromDeletedPodWithForceOption (f .ClientSet , f , pod , forceDelete , true )
685724}
686725
687- func formatVolume (f * framework.Framework , volumeSource * v1.VolumeSource ) {
688- var err error
689- // Launch pod to format the volume
690- pod := & v1.Pod {
691- ObjectMeta : metav1.ObjectMeta {
692- Name : fmt .Sprintf ("volume-prep-%s" , f .Namespace .Name ),
693- },
694- Spec : v1.PodSpec {
695- Containers : []v1.Container {
696- {
697- Name : fmt .Sprintf ("init-volume-%s" , f .Namespace .Name ),
698- Image : imageutils .GetE2EImage (imageutils .BusyBox ),
699- Command : []string {"/bin/sh" , "-ec" , "echo nothing" },
700- VolumeMounts : []v1.VolumeMount {
701- {
702- Name : volumeName ,
703- MountPath : "/vol" ,
704- },
705- },
706- },
707- },
708- RestartPolicy : v1 .RestartPolicyNever ,
709- Volumes : []v1.Volume {
710- {
711- Name : volumeName ,
712- VolumeSource : * volumeSource ,
713- },
714- },
715- },
716- }
726+ func formatVolume (f * framework.Framework , pod * v1.Pod ) {
717727 By (fmt .Sprintf ("Creating pod to format volume %s" , pod .Name ))
718- pod , err = f .ClientSet .CoreV1 ().Pods (f .Namespace .Name ).Create (pod )
728+ pod , err : =f .ClientSet .CoreV1 ().Pods (f .Namespace .Name ).Create (pod )
719729 Expect (err ).ToNot (HaveOccurred (), "while creating volume init pod" )
720730
721731 err = framework .WaitForPodSuccessInNamespace (f .ClientSet , pod .Name , pod .Namespace )
0 commit comments