github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove argument "cs clientset.Interface" from testFlexVolume

Browse Source 
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.
This commit is contained in:
Olev Kartau
2019-10-28 21:13:49 +02:00
parent 4f75ed2a94
commit ab8444d8d7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/storage/flexvolume.go
View File

@@ -49,7 +49,7 @@ const (
// testFlexVolume tests that a client pod using a given flexvolume driver // testFlexVolume tests that a client pod using a given flexvolume driver
// successfully mounts it and runs // 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{ tests := []volume.Test{
{ {
Volume: v1.VolumeSource{ 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)) 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)) 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") ginkgo.By("waiting for flex client pod to terminate")
if err := f.WaitForPodTerminated(config.Prefix+"-client", ""); !apierrs.IsNotFound(err) { 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)) 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)) 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") ginkgo.By("waiting for flex client pod to terminate")
if err := f.WaitForPodTerminated(config.Prefix+"-client", ""); !apierrs.IsNotFound(err) { if err := f.WaitForPodTerminated(config.Prefix+"-client", ""); !apierrs.IsNotFound(err) {