From 104c0dcb092bf296b7728f58ef7d207de0d31850 Mon Sep 17 00:00:00 2001 From: Marcin Wielgus Date: Fri, 7 Oct 2016 17:04:19 +0200 Subject: [PATCH] Include DaemonSets and Deployments in Namespace deletion --- .../namespace/namespace_controller.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/federation/pkg/federation-controller/namespace/namespace_controller.go b/federation/pkg/federation-controller/namespace/namespace_controller.go index 9e7fb98638b..3ff353872b4 100644 --- a/federation/pkg/federation-controller/namespace/namespace_controller.go +++ b/federation/pkg/federation-controller/namespace/namespace_controller.go @@ -365,6 +365,14 @@ func (nc *NamespaceController) delete(namespace *api_v1.Namespace) error { if err != nil { 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{}) if err != nil { return fmt.Errorf("failed to delete events list from namespace: %v", err)