Skip to content

K
k3s
Commit ead65fc2 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #34334 from mwielgus/ns-delete

Automatic merge from submit-queue Include DaemonSets and Deployments in Namespace deletion More generic deletion should be added next week. cc: @quinton-hoole
parents db0529fc 104c0dcb
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
federation/pkg/federation-controller/namespace/namespace_controller.go
View file @ ead65fc2
...@@ -358,6 +358,14 @@ func (nc *NamespaceController) delete(namespace *api_v1.Namespace) error { ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment