From 2c79f52de906e176b595f79fb08592ce89eb95b7 Mon Sep 17 00:00:00 2001 From: Tomas Smetana Date: Tue, 25 May 2021 16:24:30 +0200 Subject: [PATCH] Local PV e2e: fix leaked local volumes --- test/e2e/storage/persistent_volumes-local.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/test/e2e/storage/persistent_volumes-local.go b/test/e2e/storage/persistent_volumes-local.go index afb94a53742..3bc8e8b9581 100644 --- a/test/e2e/storage/persistent_volumes-local.go +++ b/test/e2e/storage/persistent_volumes-local.go @@ -373,11 +373,11 @@ var _ = utils.SIGDescribe("PersistentVolumes-local ", func() { }) ginkgo.It("should fail scheduling due to different NodeAffinity", func() { - testPodWithNodeConflict(config, volumeType, conflictNodeName, makeLocalPodWithNodeAffinity, immediateMode) + testPodWithNodeConflict(config, testVol, conflictNodeName, makeLocalPodWithNodeAffinity) }) ginkgo.It("should fail scheduling due to different NodeSelector", func() { - testPodWithNodeConflict(config, volumeType, conflictNodeName, makeLocalPodWithNodeSelector, immediateMode) + testPodWithNodeConflict(config, testVol, conflictNodeName, makeLocalPodWithNodeSelector) }) }) @@ -716,10 +716,8 @@ func deletePodAndPVCs(config *localTestConfig, pod *v1.Pod) error { type makeLocalPodWith func(config *localTestConfig, volume *localTestVolume, nodeName string) *v1.Pod -func testPodWithNodeConflict(config *localTestConfig, testVolType localVolumeType, nodeName string, makeLocalPodFunc makeLocalPodWith, bindingMode storagev1.VolumeBindingMode) { - ginkgo.By(fmt.Sprintf("local-volume-type: %s", testVolType)) - testVols := setupLocalVolumesPVCsPVs(config, testVolType, config.randomNode, 1, bindingMode) - testVol := testVols[0] +func testPodWithNodeConflict(config *localTestConfig, testVol *localTestVolume, nodeName string, makeLocalPodFunc makeLocalPodWith) { + ginkgo.By(fmt.Sprintf("local-volume-type: %s", testVol.localVolumeType)) pod := makeLocalPodFunc(config, testVol, nodeName) pod, err := config.client.CoreV1().Pods(config.ns).Create(context.TODO(), pod, metav1.CreateOptions{})