github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-12 13:31:52 +00:00
Code Issues Projects Releases Wiki Activity

Deleting namespace cleans-up Ingress

Browse Source
This commit is contained in:
Prashanth Balasubramanian 2015-09-28 16:41:36 -07:00
parent c54e174808
commit c148332772
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/controller/namespace/namespace_controller.go
View File

@ -209,6 +209,10 @@ func deleteAllContent(kubeClient client.Interface, experimentalMode bool, namesp
if err != nil {
return estimate, err
}
err = deleteIngress(kubeClient.Experimental(), namespace)
if err != nil {
return estimate, err
}
}
return estimate, nil
}
@ -496,3 +500,17 @@ func deleteDeployments(expClient client.ExperimentalInterface, ns string) error
}
return nil
}
func deleteIngress(expClient client.ExperimentalInterface, ns string) error {
items, err := expClient.Ingress(ns).List(labels.Everything(), fields.Everything())
if err != nil {
return err
}
for i := range items.Items {
err := expClient.Ingress(ns).Delete(items.Items[i].Name, nil)
if err != nil && !errors.IsNotFound(err) {
return err
}
}
return nil
}

1
pkg/controller/namespace/namespace_controller_test.go
View File

@ -114,6 +114,7 @@ func testSyncNamespaceThatIsTerminating(t *testing.T, experimentalMode bool) {
strings.Join([]string{"list", "daemonsets", ""}, "-"),
strings.Join([]string{"list", "deployments", ""}, "-"),
strings.Join([]string{"list", "jobs", ""}, "-"),
strings.Join([]string{"list", "ingress", ""}, "-"),
)
}