Support collection deletion in apiserver.

2015-12-07 10:21:42 +01:00
parent 13681360c3
commit f28bb68d8c
14 changed files with 12299 additions and 8479 deletions
--- a/pkg/controller/namespace/namespace_controller.go
+++ b/pkg/controller/namespace/namespace_controller.go
@@ -436,17 +436,7 @@ func deletePods(kubeClient client.Interface, ns string, before unversioned.Time)
 }

 func deleteEvents(kubeClient client.Interface, ns string) error {
-	items, err := kubeClient.Events(ns).List(unversioned.ListOptions{})
-	if err != nil {
-		return err
-	}
-	for i := range items.Items {
-		err := kubeClient.Events(ns).Delete(items.Items[i].Name)
-		if err != nil && !errors.IsNotFound(err) {
-			return err
-		}
-	}
-	return nil
+	return kubeClient.Events(ns).DeleteCollection(nil, unversioned.ListOptions{})
 }

 func deleteSecrets(kubeClient client.Interface, ns string) error {