github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14666 from mikedanese/job-ns-del

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-09-29 18:10:05 -07:00
commit bec96e622a
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

@ -201,6 +201,10 @@ func deleteAllContent(kubeClient client.Interface, experimentalMode bool, namesp
if err != nil { if err != nil {
return estimate, err return estimate, err
} }
err = deleteJobs(kubeClient.Experimental(), namespace)
if err != nil {
return estimate, err
}
err = deleteDeployments(kubeClient.Experimental(), namespace) err = deleteDeployments(kubeClient.Experimental(), namespace)
if err != nil { if err != nil {
return estimate, err return estimate, err
@ -465,6 +469,20 @@ func deleteDaemonSets(expClient client.ExperimentalInterface, ns string) error {
return nil return nil
} }
func deleteJobs(expClient client.ExperimentalInterface, ns string) error {
items, err := expClient.Jobs(ns).List(labels.Everything(), fields.Everything())
if err != nil {
return err
}
for i := range items.Items {
err := expClient.Jobs(ns).Delete(items.Items[i].Name, nil)
if err != nil && !errors.IsNotFound(err) {
return err
}
}
return nil
}
func deleteDeployments(expClient client.ExperimentalInterface, ns string) error { func deleteDeployments(expClient client.ExperimentalInterface, ns string) error {
items, err := expClient.Deployments(ns).List(labels.Everything(), fields.Everything()) items, err := expClient.Deployments(ns).List(labels.Everything(), fields.Everything())
if err != nil { if err != nil {

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

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