diff --git a/pkg/kubelet/volumemanager/cache/desired_state_of_world_test.go b/pkg/kubelet/volumemanager/cache/desired_state_of_world_test.go index 3d3d6639976..593228ef42c 100644 --- a/pkg/kubelet/volumemanager/cache/desired_state_of_world_test.go +++ b/pkg/kubelet/volumemanager/cache/desired_state_of_world_test.go @@ -67,10 +67,10 @@ func Test_AddPodToVolume_Positive_NewPodNewVolume(t *testing.T) { t.Fatalf("AddPodToVolume failed. Expected: Actual: <%v>", err) } - verifyVolumeExistsDsw(t, generatedVolumeName, dsw) + verifyVolumeExistsDsw(t, generatedVolumeName, "" /* SELinuxContext */, dsw) verifyVolumeExistsInVolumesToMount( t, generatedVolumeName, false /* expectReportedInUse */, dsw) - verifyPodExistsInVolumeDsw(t, podName, generatedVolumeName, dsw) + verifyPodExistsInVolumeDsw(t, podName, generatedVolumeName, "" /* SELinuxContext */, dsw) verifyVolumeExistsWithSpecNameInVolumeDsw(t, podName, volumeSpec.Name(), dsw) } @@ -112,10 +112,10 @@ func Test_AddPodToVolume_Positive_ExistingPodExistingVolume(t *testing.T) { t.Fatalf("AddPodToVolume failed. Expected: Actual: <%v>", err) } - verifyVolumeExistsDsw(t, generatedVolumeName, dsw) + verifyVolumeExistsDsw(t, generatedVolumeName, "" /* SELinuxContext */, dsw) verifyVolumeExistsInVolumesToMount( t, generatedVolumeName, false /* expectReportedInUse */, dsw) - verifyPodExistsInVolumeDsw(t, podName, generatedVolumeName, dsw) + verifyPodExistsInVolumeDsw(t, podName, generatedVolumeName, "" /* SELinuxContext */, dsw) verifyVolumeExistsWithSpecNameInVolumeDsw(t, podName, volumeSpec.Name(), dsw) } @@ -314,18 +314,18 @@ func Test_DeletePodFromVolume_Positive_PodExistsVolumeExists(t *testing.T) { if err != nil { t.Fatalf("AddPodToVolume failed. Expected: Actual: <%v>", err) } - verifyVolumeExistsDsw(t, generatedVolumeName, dsw) + verifyVolumeExistsDsw(t, generatedVolumeName, "" /* SELinuxContext */, dsw) verifyVolumeExistsInVolumesToMount( t, generatedVolumeName, false /* expectReportedInUse */, dsw) - verifyPodExistsInVolumeDsw(t, podName, generatedVolumeName, dsw) + verifyPodExistsInVolumeDsw(t, podName, generatedVolumeName, "" /* SELinuxContext */, dsw) // Act dsw.DeletePodFromVolume(podName, generatedVolumeName) // Assert - verifyVolumeDoesntExist(t, generatedVolumeName, dsw) + verifyVolumeDoesntExist(t, generatedVolumeName, "" /* SELinuxContext */, dsw) verifyVolumeDoesntExistInVolumesToMount(t, generatedVolumeName, dsw) - verifyPodDoesntExistInVolumeDsw(t, podName, generatedVolumeName, dsw) + verifyPodDoesntExistInVolumeDsw(t, podName, generatedVolumeName, "" /* SELinuxContext */, dsw) verifyVolumeDoesntExistWithSpecNameInVolumeDsw(t, podName, volumeSpec.Name(), dsw) } @@ -430,36 +430,36 @@ func Test_MarkVolumesReportedInUse_Positive_NewPodNewVolume(t *testing.T) { dsw.MarkVolumesReportedInUse(volumesReportedInUse) // Assert - verifyVolumeExistsDsw(t, generatedVolume1Name, dsw) + verifyVolumeExistsDsw(t, generatedVolume1Name, "" /* SELinuxContext */, dsw) verifyVolumeExistsInVolumesToMount( t, generatedVolume1Name, false /* expectReportedInUse */, dsw) - verifyPodExistsInVolumeDsw(t, pod1Name, generatedVolume1Name, dsw) - verifyVolumeExistsDsw(t, generatedVolume2Name, dsw) + verifyPodExistsInVolumeDsw(t, pod1Name, generatedVolume1Name, "" /* SELinuxContext */, dsw) + verifyVolumeExistsDsw(t, generatedVolume2Name, "" /* SELinuxContext */, dsw) verifyVolumeExistsInVolumesToMount( t, generatedVolume2Name, true /* expectReportedInUse */, dsw) - verifyPodExistsInVolumeDsw(t, pod2Name, generatedVolume2Name, dsw) - verifyVolumeExistsDsw(t, generatedVolume3Name, dsw) + verifyPodExistsInVolumeDsw(t, pod2Name, generatedVolume2Name, "" /* SELinuxContext */, dsw) + verifyVolumeExistsDsw(t, generatedVolume3Name, "" /* SELinuxContext */, dsw) verifyVolumeExistsInVolumesToMount( t, generatedVolume3Name, false /* expectReportedInUse */, dsw) - verifyPodExistsInVolumeDsw(t, pod3Name, generatedVolume3Name, dsw) + verifyPodExistsInVolumeDsw(t, pod3Name, generatedVolume3Name, "" /* SELinuxContext */, dsw) // Act volumesReportedInUse = []v1.UniqueVolumeName{generatedVolume3Name} dsw.MarkVolumesReportedInUse(volumesReportedInUse) // Assert - verifyVolumeExistsDsw(t, generatedVolume1Name, dsw) + verifyVolumeExistsDsw(t, generatedVolume1Name, "" /* SELinuxContext */, dsw) verifyVolumeExistsInVolumesToMount( t, generatedVolume1Name, false /* expectReportedInUse */, dsw) - verifyPodExistsInVolumeDsw(t, pod1Name, generatedVolume1Name, dsw) - verifyVolumeExistsDsw(t, generatedVolume2Name, dsw) + verifyPodExistsInVolumeDsw(t, pod1Name, generatedVolume1Name, "" /* SELinuxContext */, dsw) + verifyVolumeExistsDsw(t, generatedVolume2Name, "" /* SELinuxContext */, dsw) verifyVolumeExistsInVolumesToMount( t, generatedVolume2Name, false /* expectReportedInUse */, dsw) - verifyPodExistsInVolumeDsw(t, pod2Name, generatedVolume2Name, dsw) - verifyVolumeExistsDsw(t, generatedVolume3Name, dsw) + verifyPodExistsInVolumeDsw(t, pod2Name, generatedVolume2Name, "" /* SELinuxContext */, dsw) + verifyVolumeExistsDsw(t, generatedVolume3Name, "" /* SELinuxContext */, dsw) verifyVolumeExistsInVolumesToMount( t, generatedVolume3Name, true /* expectReportedInUse */, dsw) - verifyPodExistsInVolumeDsw(t, pod3Name, generatedVolume3Name, dsw) + verifyPodExistsInVolumeDsw(t, pod3Name, generatedVolume3Name, "" /* SELinuxContext */, dsw) } func Test_AddPodToVolume_WithEmptyDirSizeLimit(t *testing.T) { @@ -598,8 +598,8 @@ func Test_AddPodToVolume_WithEmptyDirSizeLimit(t *testing.T) { } func verifyVolumeExistsDsw( - t *testing.T, expectedVolumeName v1.UniqueVolumeName, dsw DesiredStateOfWorld) { - volumeExists := dsw.VolumeExists(expectedVolumeName) + t *testing.T, expectedVolumeName v1.UniqueVolumeName, expectedSELinuxContext string, dsw DesiredStateOfWorld) { + volumeExists := dsw.VolumeExists(expectedVolumeName, expectedSELinuxContext) if !volumeExists { t.Fatalf( "VolumeExists(%q) failed. Expected: Actual: <%v>", @@ -609,8 +609,8 @@ func verifyVolumeExistsDsw( } func verifyVolumeDoesntExist( - t *testing.T, expectedVolumeName v1.UniqueVolumeName, dsw DesiredStateOfWorld) { - volumeExists := dsw.VolumeExists(expectedVolumeName) + t *testing.T, expectedVolumeName v1.UniqueVolumeName, expectedSELinuxContext string, dsw DesiredStateOfWorld) { + volumeExists := dsw.VolumeExists(expectedVolumeName, expectedSELinuxContext) if volumeExists { t.Fatalf( "VolumeExists(%q) returned incorrect value. Expected: Actual: <%v>", @@ -661,9 +661,10 @@ func verifyPodExistsInVolumeDsw( t *testing.T, expectedPodName volumetypes.UniquePodName, expectedVolumeName v1.UniqueVolumeName, + expectedSeLinuxContext string, dsw DesiredStateOfWorld) { if podExistsInVolume := dsw.PodExistsInVolume( - expectedPodName, expectedVolumeName); !podExistsInVolume { + expectedPodName, expectedVolumeName, expectedSeLinuxContext); !podExistsInVolume { t.Fatalf( "DSW PodExistsInVolume returned incorrect value. Expected: Actual: <%v>", podExistsInVolume) @@ -674,9 +675,10 @@ func verifyPodDoesntExistInVolumeDsw( t *testing.T, expectedPodName volumetypes.UniquePodName, expectedVolumeName v1.UniqueVolumeName, + expectedSeLinuxContext string, dsw DesiredStateOfWorld) { if podExistsInVolume := dsw.PodExistsInVolume( - expectedPodName, expectedVolumeName); podExistsInVolume { + expectedPodName, expectedVolumeName, expectedSeLinuxContext); podExistsInVolume { t.Fatalf( "DSW PodExistsInVolume returned incorrect value. Expected: Actual: <%v>", podExistsInVolume) diff --git a/pkg/kubelet/volumemanager/metrics/metrics_test.go b/pkg/kubelet/volumemanager/metrics/metrics_test.go index 20228115f4f..cd30a8023c1 100644 --- a/pkg/kubelet/volumemanager/metrics/metrics_test.go +++ b/pkg/kubelet/volumemanager/metrics/metrics_test.go @@ -56,7 +56,7 @@ func TestMetricCollection(t *testing.T) { podName := util.GetUniquePodName(pod) // Add one volume to DesiredStateOfWorld - generatedVolumeName, err := dsw.AddPodToVolume(podName, pod, volumeSpec, volumeSpec.Name(), "", "" /* seLinuxLabel */) + generatedVolumeName, err := dsw.AddPodToVolume(podName, pod, volumeSpec, volumeSpec.Name(), "", nil /* seLinuxOptions */) if err != nil { t.Fatalf("AddPodToVolume failed. Expected: Actual: <%v>", err) } diff --git a/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator_test.go b/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator_test.go index ea586756087..24769116004 100644 --- a/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator_test.go +++ b/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator_test.go @@ -243,7 +243,7 @@ func TestFindAndAddNewPods_FindAndRemoveDeletedPods(t *testing.T) { t.Fatalf("Failed to remove pods from desired state of world since they no longer exist") } - volumeExists := dswp.desiredStateOfWorld.VolumeExists(expectedVolumeName) + volumeExists := dswp.desiredStateOfWorld.VolumeExists(expectedVolumeName, "" /* SELinuxContext */) if volumeExists { t.Fatalf( "VolumeExists(%q) failed. Expected: Actual: <%v>", @@ -252,7 +252,7 @@ func TestFindAndAddNewPods_FindAndRemoveDeletedPods(t *testing.T) { } if podExistsInVolume := dswp.desiredStateOfWorld.PodExistsInVolume( - podName, expectedVolumeName); podExistsInVolume { + podName, expectedVolumeName, "" /* SELinuxContext */); podExistsInVolume { t.Fatalf( "DSW PodExistsInVolume returned incorrect value. Expected: Actual: <%v>", podExistsInVolume) @@ -283,7 +283,7 @@ func TestFindAndRemoveDeletedPodsWithActualState(t *testing.T) { dswp.findAndRemoveDeletedPods() // Although Pod status is terminated, pod still exists in pod manager and actual state does not has this pod and volume information // desired state populator will fail to delete this pod and volume first - volumeExists := dswp.desiredStateOfWorld.VolumeExists(expectedVolumeName) + volumeExists := dswp.desiredStateOfWorld.VolumeExists(expectedVolumeName, "" /* SELinuxContext */) if !volumeExists { t.Fatalf( "VolumeExists(%q) failed. Expected: Actual: <%v>", @@ -292,7 +292,7 @@ func TestFindAndRemoveDeletedPodsWithActualState(t *testing.T) { } if podExistsInVolume := dswp.desiredStateOfWorld.PodExistsInVolume( - podName, expectedVolumeName); !podExistsInVolume { + podName, expectedVolumeName, "" /* SELinuxContext */); !podExistsInVolume { t.Fatalf( "DSW PodExistsInVolume returned incorrect value. Expected: Actual: <%v>", podExistsInVolume) @@ -302,7 +302,7 @@ func TestFindAndRemoveDeletedPodsWithActualState(t *testing.T) { // desired state populator now can successfully delete the pod and volume reconcileASW(fakeASW, dswp.desiredStateOfWorld, t) dswp.findAndRemoveDeletedPods() - if !dswp.desiredStateOfWorld.VolumeExists(expectedVolumeName) { + if !dswp.desiredStateOfWorld.VolumeExists(expectedVolumeName, "" /* SELinuxContext */) { t.Fatalf( "VolumeExists(%q) failed. Expected: Actual: <%v>", expectedVolumeName, @@ -315,7 +315,7 @@ func TestFindAndRemoveDeletedPodsWithActualState(t *testing.T) { // desired state populator now can successfully delete the pod and volume reconcileASW(fakeASW, dswp.desiredStateOfWorld, t) dswp.findAndRemoveDeletedPods() - volumeExists = dswp.desiredStateOfWorld.VolumeExists(expectedVolumeName) + volumeExists = dswp.desiredStateOfWorld.VolumeExists(expectedVolumeName, "" /* SELinuxContext */) if volumeExists { t.Fatalf( "VolumeExists(%q) failed. Expected: Actual: <%v>", @@ -324,7 +324,7 @@ func TestFindAndRemoveDeletedPodsWithActualState(t *testing.T) { } if podExistsInVolume := dswp.desiredStateOfWorld.PodExistsInVolume( - podName, expectedVolumeName); podExistsInVolume { + podName, expectedVolumeName, "" /* SELinuxContext */); podExistsInVolume { t.Fatalf( "DSW PodExistsInVolume returned incorrect value. Expected: Actual: <%v>", podExistsInVolume) @@ -369,7 +369,7 @@ func TestFindAndRemoveDeletedPodsWithUncertain(t *testing.T) { t.Fatalf("Failed to remove pods from desired state of world since they no longer exist") } - volumeExists := dswp.desiredStateOfWorld.VolumeExists(expectedVolumeName) + volumeExists := dswp.desiredStateOfWorld.VolumeExists(expectedVolumeName, "" /* SELinuxContext */) if volumeExists { t.Fatalf( "VolumeExists(%q) failed. Expected: Actual: <%v>", @@ -378,7 +378,7 @@ func TestFindAndRemoveDeletedPodsWithUncertain(t *testing.T) { } if podExistsInVolume := dswp.desiredStateOfWorld.PodExistsInVolume( - podName, expectedVolumeName); podExistsInVolume { + podName, expectedVolumeName, "" /* SELinuxContext */); podExistsInVolume { t.Fatalf( "DSW PodExistsInVolume returned incorrect value. Expected: Actual: <%v>", podExistsInVolume) @@ -443,7 +443,7 @@ func prepareDSWPWithPodPV(t *testing.T) (*desiredStateOfWorldPopulator, *fakePod expectedVolumeName := v1.UniqueVolumeName(generatedVolumeName) - volumeExists := fakesDSW.VolumeExists(expectedVolumeName) + volumeExists := fakesDSW.VolumeExists(expectedVolumeName, "" /* SELinuxContext */) if !volumeExists { t.Fatalf( "VolumeExists(%q) failed. Expected: Actual: <%v>", @@ -452,7 +452,7 @@ func prepareDSWPWithPodPV(t *testing.T) (*desiredStateOfWorldPopulator, *fakePod } if podExistsInVolume := fakesDSW.PodExistsInVolume( - podName, expectedVolumeName); !podExistsInVolume { + podName, expectedVolumeName, "" /* SELinuxContext */); !podExistsInVolume { t.Fatalf( "DSW PodExistsInVolume returned incorrect value. Expected: Actual: <%v>", podExistsInVolume) @@ -514,7 +514,7 @@ func TestFindAndRemoveNonattachableVolumes(t *testing.T) { expectedVolumeName := v1.UniqueVolumeName(generatedVolumeName) - volumeExists := fakesDSW.VolumeExists(expectedVolumeName) + volumeExists := fakesDSW.VolumeExists(expectedVolumeName, "" /* SELinuxContext */) if !volumeExists { t.Fatalf( "VolumeExists(%q) failed. Expected: Actual: <%v>", @@ -614,7 +614,7 @@ func TestFindAndAddNewPods_FindAndRemoveDeletedPods_Valid_Block_VolumeDevices(t expectedVolumeName := v1.UniqueVolumeName(generatedVolumeName) - volumeExists := fakesDSW.VolumeExists(expectedVolumeName) + volumeExists := fakesDSW.VolumeExists(expectedVolumeName, "" /* SELinuxContext */) if !volumeExists { t.Fatalf( "VolumeExists(%q) failed. Expected: Actual: <%v>", @@ -623,7 +623,7 @@ func TestFindAndAddNewPods_FindAndRemoveDeletedPods_Valid_Block_VolumeDevices(t } if podExistsInVolume := fakesDSW.PodExistsInVolume( - podName, expectedVolumeName); !podExistsInVolume { + podName, expectedVolumeName, "" /* SELinuxContext */); !podExistsInVolume { t.Fatalf( "DSW PodExistsInVolume returned incorrect value. Expected: Actual: <%v>", podExistsInVolume) @@ -647,7 +647,7 @@ func TestFindAndAddNewPods_FindAndRemoveDeletedPods_Valid_Block_VolumeDevices(t t.Fatalf("Failed to remove pods from desired state of world since they no longer exist") } - volumeExists = fakesDSW.VolumeExists(expectedVolumeName) + volumeExists = fakesDSW.VolumeExists(expectedVolumeName, "" /* SELinuxContext */) if volumeExists { t.Fatalf( "VolumeExists(%q) failed. Expected: Actual: <%v>", @@ -656,7 +656,7 @@ func TestFindAndAddNewPods_FindAndRemoveDeletedPods_Valid_Block_VolumeDevices(t } if podExistsInVolume := fakesDSW.PodExistsInVolume( - podName, expectedVolumeName); podExistsInVolume { + podName, expectedVolumeName, "" /* SELinuxContext */); podExistsInVolume { t.Fatalf( "DSW PodExistsInVolume returned incorrect value. Expected: Actual: <%v>", podExistsInVolume) @@ -709,7 +709,7 @@ func TestCreateVolumeSpec_Valid_File_VolumeMounts(t *testing.T) { pod := createPodWithVolume("dswp-test-pod", "dswp-test-volume-name", "file-bound", containers) fakePodManager.AddPod(pod) - mountsMap, devicesMap := util.GetPodVolumeNames(pod) + mountsMap, devicesMap, _ := util.GetPodVolumeNames(pod) _, volumeSpec, _, err := dswp.createVolumeSpec(pod.Spec.Volumes[0], pod, mountsMap, devicesMap) @@ -755,7 +755,7 @@ func TestCreateVolumeSpec_Valid_Nil_VolumeMounts(t *testing.T) { pod := createPodWithVolume("dswp-test-pod", "dswp-test-volume-name", "file-bound", containers) fakePodManager.AddPod(pod) - mountsMap, devicesMap := util.GetPodVolumeNames(pod) + mountsMap, devicesMap, _ := util.GetPodVolumeNames(pod) _, volumeSpec, _, err := dswp.createVolumeSpec(pod.Spec.Volumes[0], pod, mountsMap, devicesMap) @@ -801,7 +801,7 @@ func TestCreateVolumeSpec_Valid_Block_VolumeDevices(t *testing.T) { pod := createPodWithVolume("dswp-test-pod", "dswp-test-volume-name", "block-bound", containers) fakePodManager.AddPod(pod) - mountsMap, devicesMap := util.GetPodVolumeNames(pod) + mountsMap, devicesMap, _ := util.GetPodVolumeNames(pod) _, volumeSpec, _, err := dswp.createVolumeSpec(pod.Spec.Volumes[0], pod, mountsMap, devicesMap) @@ -847,7 +847,7 @@ func TestCreateVolumeSpec_Invalid_File_VolumeDevices(t *testing.T) { pod := createPodWithVolume("dswp-test-pod", "dswp-test-volume-name", "file-bound", containers) fakePodManager.AddPod(pod) - mountsMap, devicesMap := util.GetPodVolumeNames(pod) + mountsMap, devicesMap, _ := util.GetPodVolumeNames(pod) _, volumeSpec, _, err := dswp.createVolumeSpec(pod.Spec.Volumes[0], pod, mountsMap, devicesMap) @@ -893,7 +893,7 @@ func TestCreateVolumeSpec_Invalid_Block_VolumeMounts(t *testing.T) { pod := createPodWithVolume("dswp-test-pod", "dswp-test-volume-name", "block-bound", containers) fakePodManager.AddPod(pod) - mountsMap, devicesMap := util.GetPodVolumeNames(pod) + mountsMap, devicesMap, _ := util.GetPodVolumeNames(pod) _, volumeSpec, _, err := dswp.createVolumeSpec(pod.Spec.Volumes[0], pod, mountsMap, devicesMap) @@ -1142,7 +1142,7 @@ func reprocess(dswp *desiredStateOfWorldPopulator, uniquePodName types.UniquePod func getResizeRequiredVolumes(dsw cache.DesiredStateOfWorld, asw cache.ActualStateOfWorld, newSize resource.Quantity) []v1.UniqueVolumeName { resizeRequiredVolumes := []v1.UniqueVolumeName{} for _, volumeToMount := range dsw.GetVolumesToMount() { - _, _, err := asw.PodExistsInVolume(volumeToMount.PodName, volumeToMount.VolumeName, newSize) + _, _, err := asw.PodExistsInVolume(volumeToMount.PodName, volumeToMount.VolumeName, newSize, "" /* SELinuxContext */) if cache.IsFSResizeRequiredError(err) { resizeRequiredVolumes = append(resizeRequiredVolumes, volumeToMount.VolumeName) } diff --git a/pkg/kubelet/volumemanager/reconciler/reconciler_test.go b/pkg/kubelet/volumemanager/reconciler/reconciler_test.go index 9a54b878b53..bd49d90b994 100644 --- a/pkg/kubelet/volumemanager/reconciler/reconciler_test.go +++ b/pkg/kubelet/volumemanager/reconciler/reconciler_test.go @@ -260,7 +260,13 @@ func Test_Run_Positive_VolumeAttachAndMountMigrationEnabled(t *testing.T) { podName := util.GetUniquePodName(pod) generatedVolumeName, err := dsw.AddPodToVolume( - podName, pod, migratedSpec, migratedSpec.Name(), "" /* volumeGidValue */) + podName, + pod, + migratedSpec, + migratedSpec.Name(), + "", /* volumeGidValue */ + nil, /* SELinuxContexts */ + ) // Assert if err != nil { @@ -1340,13 +1346,13 @@ func Test_Run_Positive_VolumeFSResizeControllerAttachEnabled(t *testing.T) { // Simulate what DSOWP does pvWithSize.Spec.Capacity[v1.ResourceStorage] = tc.newPVSize volumeSpec = &volume.Spec{PersistentVolume: pvWithSize} - dsw.AddPodToVolume(podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGidValue */, nil /* seLinuxLabel */) + dsw.AddPodToVolume(podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGidValue */, nil /* seLinuxContexts */) t.Logf("Changing size of the volume to %s", tc.newPVSize.String()) newSize := tc.newPVSize.DeepCopy() dsw.UpdatePersistentVolumeSize(volumeName, &newSize) - _, _, podExistErr := asw.PodExistsInVolume(podName, volumeName, newSize) + _, _, podExistErr := asw.PodExistsInVolume(podName, volumeName, newSize, "" /* SELinuxLabel */) if tc.expansionFailed { if cache.IsFSResizeRequiredError(podExistErr) { t.Fatalf("volume %s should not throw fsResizeRequired error: %v", volumeName, podExistErr) @@ -1358,7 +1364,7 @@ func Test_Run_Positive_VolumeFSResizeControllerAttachEnabled(t *testing.T) { go reconciler.Run(wait.NeverStop) waitErr := retryWithExponentialBackOff(testOperationBackOffDuration, func() (done bool, err error) { - mounted, _, err := asw.PodExistsInVolume(podName, volumeName, newSize) + mounted, _, err := asw.PodExistsInVolume(podName, volumeName, newSize, "" /* SELinuxContext */) return mounted && err == nil, nil }) if waitErr != nil { @@ -1913,7 +1919,7 @@ func waitForUncertainPodMount(t *testing.T, volumeName v1.UniqueVolumeName, podN err := retryWithExponentialBackOff( testOperationBackOffDuration, func() (bool, error) { - mounted, _, err := asw.PodExistsInVolume(podName, volumeName, resource.Quantity{}) + mounted, _, err := asw.PodExistsInVolume(podName, volumeName, resource.Quantity{}, "" /* SELinuxContext */) if mounted || err != nil { return false, nil } diff --git a/pkg/volume/util/util_test.go b/pkg/volume/util/util_test.go index 9b7e7559144..0613eafc739 100644 --- a/pkg/volume/util/util_test.go +++ b/pkg/volume/util/util_test.go @@ -785,7 +785,7 @@ func TestGetPodVolumeNames(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { - mounts, devices := GetPodVolumeNames(test.pod) + mounts, devices, _ := GetPodVolumeNames(test.pod) if !mounts.Equal(test.expectedMounts) { t.Errorf("Expected mounts: %q, got %q", mounts.List(), test.expectedMounts.List()) }