diff --git a/test/e2e/density.go b/test/e2e/density.go index c2fc23761b4..62ccb822de5 100644 --- a/test/e2e/density.go +++ b/test/e2e/density.go @@ -141,7 +141,7 @@ var _ = Describe("Density", func() { } By(fmt.Sprintf("Destroying namespace for this suite %v", ns)) - if err := c.Namespaces().Delete(ns); err != nil { + if err := deleteNS(c, ns); err != nil { Failf("Couldn't delete ns %s", err) } diff --git a/test/e2e/docker_containers.go b/test/e2e/docker_containers.go index 72a470ca81d..cae777a9842 100644 --- a/test/e2e/docker_containers.go +++ b/test/e2e/docker_containers.go @@ -39,7 +39,7 @@ var _ = Describe("Docker Containers", func() { }) AfterEach(func() { - if err := c.Namespaces().Delete(ns); err != nil { + if err := deleteNS(c, ns); err != nil { Failf("Couldn't delete ns %s", err) } }) diff --git a/test/e2e/examples.go b/test/e2e/examples.go index 5c0a9bde14d..0c2efba36ef 100644 --- a/test/e2e/examples.go +++ b/test/e2e/examples.go @@ -63,7 +63,7 @@ var _ = Describe("Examples e2e", func() { AfterEach(func() { By(fmt.Sprintf("Destroying namespace for this suite %v", ns)) - if err := c.Namespaces().Delete(ns); err != nil { + if err := deleteNS(c, ns); err != nil { Failf("Couldn't delete ns %s", err) } }) @@ -458,7 +458,7 @@ var _ = Describe("Examples e2e", func() { var err error namespaces[i], err = createTestingNS(fmt.Sprintf("dnsexample%d", i), c) if namespaces[i] != nil { - defer c.Namespaces().Delete(namespaces[i].Name) + defer deleteNS(c, namespaces[i].Name) } Expect(err).NotTo(HaveOccurred()) } diff --git a/test/e2e/host_path.go b/test/e2e/host_path.go index 3c8ceb826c2..f9d9d26df4d 100644 --- a/test/e2e/host_path.go +++ b/test/e2e/host_path.go @@ -52,7 +52,7 @@ var _ = Describe("hostPath", func() { AfterEach(func() { By(fmt.Sprintf("Destroying namespace for this suite %v", namespace.Name)) - if err := c.Namespaces().Delete(namespace.Name); err != nil { + if err := deleteNS(c, namespace.Name); err != nil { Failf("Couldn't delete ns %s", err) } }) diff --git a/test/e2e/load.go b/test/e2e/load.go index 41dddbc51c8..d1797a775d9 100644 --- a/test/e2e/load.go +++ b/test/e2e/load.go @@ -81,7 +81,7 @@ var _ = Describe("Load capacity", func() { deleteAllRC(configs) By(fmt.Sprintf("Destroying namespace for this suite %v", ns)) - if err := c.Namespaces().Delete(ns); err != nil { + if err := deleteNS(c, ns); err != nil { Failf("Couldn't delete ns %s", err) } diff --git a/test/e2e/persistent_volumes.go b/test/e2e/persistent_volumes.go index 9d9ade71162..968bfac6db1 100644 --- a/test/e2e/persistent_volumes.go +++ b/test/e2e/persistent_volumes.go @@ -46,7 +46,7 @@ var _ = Describe("[Skipped] persistentVolumes", func() { AfterEach(func() { By(fmt.Sprintf("Destroying namespace for this suite %v", ns)) - if err := c.Namespaces().Delete(ns); err != nil { + if err := deleteNS(c, ns); err != nil { Failf("Couldn't delete ns %s", err) } }) diff --git a/test/e2e/resize_nodes.go b/test/e2e/resize_nodes.go index 9bee552877c..83afcd22b54 100644 --- a/test/e2e/resize_nodes.go +++ b/test/e2e/resize_nodes.go @@ -413,7 +413,7 @@ var _ = Describe("Nodes", func() { Failf("Not all nodes are ready: %v", err) } By(fmt.Sprintf("destroying namespace for this suite %s", ns)) - if err := c.Namespaces().Delete(ns); err != nil { + if err := deleteNS(c, ns); err != nil { Failf("Couldn't delete namespace '%s', %v", ns, err) } }) diff --git a/test/e2e/scheduler_predicates.go b/test/e2e/scheduler_predicates.go index 914fe125fe7..9634271f6f3 100644 --- a/test/e2e/scheduler_predicates.go +++ b/test/e2e/scheduler_predicates.go @@ -160,7 +160,7 @@ var _ = Describe("SchedulerPredicates", func() { } By(fmt.Sprintf("Destroying namespace for this suite %v", ns)) - if err := c.Namespaces().Delete(ns); err != nil { + if err := deleteNS(c, ns); err != nil { Failf("Couldn't delete ns %s", err) } }) diff --git a/test/e2e/volumes.go b/test/e2e/volumes.go index 381556a1ef0..ac37823f3ba 100644 --- a/test/e2e/volumes.go +++ b/test/e2e/volumes.go @@ -234,7 +234,7 @@ var _ = Describe("Volumes", func() { AfterEach(func() { if clean { - if err := c.Namespaces().Delete(namespace.Name); err != nil { + if err := deleteNS(c, namespace.Name); err != nil { Failf("Couldn't delete ns %s", err) } }