github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 07:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18290 from wojtek-t/fast_namespace_deletion

Browse Source 
Support collection deletion in apiserver.
This commit is contained in:
Jeff Lowdermilk
2015-12-11 13:34:56 -08:00
parent 9c49cdaa6e f28bb68d8c
commit f6686ba3a4
14 changed files with 12299 additions and 8479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 {

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

@@ -109,7 +109,7 @@ func testSyncNamespaceThatIsTerminating(t *testing.T, versions *unversioned.APIV
strings.Join([]string{"list", "resourcequotas", ""}, "-"),
strings.Join([]string{"list", "secrets", ""}, "-"),
strings.Join([]string{"list", "limitranges", ""}, "-"),
strings.Join([]string{"list", "events", ""}, "-"),
strings.Join([]string{"delete-collection", "events", ""}, "-"),
strings.Join([]string{"list", "serviceaccounts", ""}, "-"),
strings.Join([]string{"list", "persistentvolumeclaims", ""}, "-"),
strings.Join([]string{"create", "namespaces", "finalize"}, "-"),