From ab8444d8d7ffe6288754ad38f5380631701394a6 Mon Sep 17 00:00:00 2001 From: Olev Kartau Date: Mon, 28 Oct 2019 21:13:49 +0200 Subject: [PATCH] Remove argument "cs clientset.Interface" from testFlexVolume cs is not used any more after previous change removed cs arg from TectVolumeClient. Functions down the call path get cs value from framework parameter. --- test/e2e/storage/flexvolume.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/storage/flexvolume.go b/test/e2e/storage/flexvolume.go index 377e749bc6b..f047b00577c 100644 --- a/test/e2e/storage/flexvolume.go +++ b/test/e2e/storage/flexvolume.go @@ -49,7 +49,7 @@ const ( // testFlexVolume tests that a client pod using a given flexvolume driver // successfully mounts it and runs -func testFlexVolume(driver string, cs clientset.Interface, config volume.TestConfig, f *framework.Framework) { +func testFlexVolume(driver string, config volume.TestConfig, f *framework.Framework) { tests := []volume.Test{ { Volume: v1.VolumeSource{ @@ -190,7 +190,7 @@ var _ = utils.SIGDescribe("Flexvolumes", func() { ginkgo.By(fmt.Sprintf("installing flexvolume %s on node %s as %s", path.Join(driverDir, driver), node.Name, driverInstallAs)) installFlex(cs, node, "k8s", driverInstallAs, path.Join(driverDir, driver)) - testFlexVolume(driverInstallAs, cs, config, f) + testFlexVolume(driverInstallAs, config, f) ginkgo.By("waiting for flex client pod to terminate") if err := f.WaitForPodTerminated(config.Prefix+"-client", ""); !apierrs.IsNotFound(err) { @@ -210,7 +210,7 @@ var _ = utils.SIGDescribe("Flexvolumes", func() { ginkgo.By(fmt.Sprintf("installing flexvolume %s on master as %s", path.Join(driverDir, driver), driverInstallAs)) installFlex(cs, nil, "k8s", driverInstallAs, path.Join(driverDir, driver)) - testFlexVolume(driverInstallAs, cs, config, f) + testFlexVolume(driverInstallAs, config, f) ginkgo.By("waiting for flex client pod to terminate") if err := f.WaitForPodTerminated(config.Prefix+"-client", ""); !apierrs.IsNotFound(err) {