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

Merge pull request #34334 from mwielgus/ns-delete

Browse Source 
Automatic merge from submit-queue

Include DaemonSets and Deployments in Namespace deletion

More generic deletion should be added next week.

cc: @quinton-hoole
This commit is contained in:
Kubernetes Submit Queue 2016-10-11 05:46:46 -07:00 committed by GitHub
commit ead65fc25f
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
federation/pkg/federation-controller/namespace/namespace_controller.go
View File

@ -358,6 +358,14 @@ func (nc *NamespaceController) delete(namespace *api_v1.Namespace) error {
if err != nil { if err != nil {
return fmt.Errorf("failed to delete ingresses list from namespace: %v", err) return fmt.Errorf("failed to delete ingresses list from namespace: %v", err)
} }
err = nc.federatedApiClient.Extensions().DaemonSets(namespace.Name).DeleteCollection(&api_v1.DeleteOptions{}, api_v1.ListOptions{})
if err != nil {
return fmt.Errorf("failed to delete daemonsets list from namespace: %v", err)
}
err = nc.federatedApiClient.Extensions().Deployments(namespace.Name).DeleteCollection(&api_v1.DeleteOptions{}, api_v1.ListOptions{})
if err != nil {
return fmt.Errorf("failed to delete deployments list from namespace: %v", err)
}
err = nc.federatedApiClient.Core().Events(namespace.Name).DeleteCollection(&api_v1.DeleteOptions{}, api_v1.ListOptions{}) err = nc.federatedApiClient.Core().Events(namespace.Name).DeleteCollection(&api_v1.DeleteOptions{}, api_v1.ListOptions{})
if err != nil { if err != nil {
return fmt.Errorf("failed to delete events list from namespace: %v", err) return fmt.Errorf("failed to delete events list from namespace: %v", err)