github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Deleting a namespace is insufficient to cleanup in e2e

Browse Source 
Graceful deletion requires more time to terminate namespaces, and not
waiting for namespaces to delete causes scheduling errors
This commit is contained in:
Clayton Coleman 2015-08-18 17:13:13 -04:00
parent 5000252e46
commit dcad51b90e
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/density.go
View File

@ -141,7 +141,7 @@ var _ = Describe("Density", func() {
} }
By(fmt.Sprintf("Destroying namespace for this suite %v", ns)) 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) Failf("Couldn't delete ns %s", err)
} }

2
test/e2e/docker_containers.go
View File

@ -39,7 +39,7 @@ var _ = Describe("Docker Containers", func() {
}) })
AfterEach(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) Failf("Couldn't delete ns %s", err)
} }
}) })

4
test/e2e/examples.go
View File

@ -63,7 +63,7 @@ var _ = Describe("Examples e2e", func() {
AfterEach(func() { AfterEach(func() {
By(fmt.Sprintf("Destroying namespace for this suite %v", ns)) 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) Failf("Couldn't delete ns %s", err)
} }
}) })
@ -458,7 +458,7 @@ var _ = Describe("Examples e2e", func() {
var err error var err error
namespaces[i], err = createTestingNS(fmt.Sprintf("dnsexample%d", i), c) namespaces[i], err = createTestingNS(fmt.Sprintf("dnsexample%d", i), c)
if namespaces[i] != nil { if namespaces[i] != nil {
defer c.Namespaces().Delete(namespaces[i].Name) defer deleteNS(c, namespaces[i].Name)
} }
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
} }

2
test/e2e/host_path.go
View File

@ -52,7 +52,7 @@ var _ = Describe("hostPath", func() {
AfterEach(func() { AfterEach(func() {
By(fmt.Sprintf("Destroying namespace for this suite %v", namespace.Name)) 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) Failf("Couldn't delete ns %s", err)
} }
}) })

2
test/e2e/load.go
View File

@ -81,7 +81,7 @@ var _ = Describe("Load capacity", func() {
deleteAllRC(configs) deleteAllRC(configs)
By(fmt.Sprintf("Destroying namespace for this suite %v", ns)) 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) Failf("Couldn't delete ns %s", err)
} }

2
test/e2e/persistent_volumes.go
View File

@ -46,7 +46,7 @@ var _ = Describe("[Skipped] persistentVolumes", func() {
AfterEach(func() { AfterEach(func() {
By(fmt.Sprintf("Destroying namespace for this suite %v", ns)) 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) Failf("Couldn't delete ns %s", err)
} }
}) })

2
test/e2e/resize_nodes.go
View File

@ -413,7 +413,7 @@ var _ = Describe("Nodes", func() {
Failf("Not all nodes are ready: %v", err) Failf("Not all nodes are ready: %v", err)
} }
By(fmt.Sprintf("destroying namespace for this suite %s", ns)) 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) Failf("Couldn't delete namespace '%s', %v", ns, err)
} }
}) })

2
test/e2e/scheduler_predicates.go
View File

@ -160,7 +160,7 @@ var _ = Describe("SchedulerPredicates", func() {
} }
By(fmt.Sprintf("Destroying namespace for this suite %v", ns)) 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) Failf("Couldn't delete ns %s", err)
} }
}) })

2
test/e2e/volumes.go
View File

@ -234,7 +234,7 @@ var _ = Describe("Volumes", func() {
AfterEach(func() { AfterEach(func() {
if clean { 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) Failf("Couldn't delete ns %s", err)
} }
} }