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

Auto commit by PR queue bot
penland365 · Sep 30, 2015 · bec96e6 · bec96e6
2 parents 37fefea + 2fa10f8
commit bec96e6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/pkg/controller/namespace/namespace_controller.go b/pkg/controller/namespace/namespace_controller.go
@@ -201,6 +201,10 @@ func deleteAllContent(kubeClient client.Interface, experimentalMode bool, namesp
 		if err != nil {
 			return estimate, err
 		}
+		err = deleteJobs(kubeClient.Experimental(), namespace)
+		if err != nil {
+			return estimate, err
+		}
 		err = deleteDeployments(kubeClient.Experimental(), namespace)
 		if err != nil {
 			return estimate, err
@@ -465,6 +469,20 @@ func deleteDaemonSets(expClient client.ExperimentalInterface, ns string) error {
 	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 {
 	items, err := expClient.Deployments(ns).List(labels.Everything(), fields.Everything())
 	if err != nil {

diff --git a/pkg/controller/namespace/namespace_controller_test.go b/pkg/controller/namespace/namespace_controller_test.go
@@ -113,6 +113,7 @@ func testSyncNamespaceThatIsTerminating(t *testing.T, experimentalMode bool) {
 			strings.Join([]string{"list", "horizontalpodautoscalers", ""}, "-"),
 			strings.Join([]string{"list", "daemonsets", ""}, "-"),
 			strings.Join([]string{"list", "deployments", ""}, "-"),
+			strings.Join([]string{"list", "jobs", ""}, "-"),
 		)
 	}