github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

Include DaemonSets and Deployments in Namespace deletion

Browse Source
This commit is contained in:
Marcin Wielgus
2016-10-07 17:04:19 +02:00
parent 0b6040ceef
commit 104c0dcb09
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -365,6 +365,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)