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

Merge pull request #34836 from mikedanese/prune-1

Browse Source 
Automatic merge from submit-queue

kubectl: apply prune should fallback to basic delete when a resource has no reaper

Fixes #34790

cc @kubernetes/kubectl @MrHohn
This commit is contained in:
Kubernetes Submit Queue
2016-10-15 18:38:20 -07:00
committed by GitHub
parent 8b6cebcb35 c17a8a773d
commit 3f4c438946
4 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubectl/cmd/apply.go
View File

@@ -351,10 +351,7 @@ func (p *pruner) prune(namespace string, mapping *meta.RESTMapping, shortOutput
func (p *pruner) delete(namespace, name string, mapping *meta.RESTMapping, c resource.RESTClient) error {
if !p.cascade {
if err := resource.NewHelper(c, mapping).Delete(namespace, name); err != nil {
return err
}
return nil
return resource.NewHelper(c, mapping).Delete(namespace, name)
}
cs, err := p.clientsetFunc()
if err != nil {
@@ -362,7 +359,10 @@ func (p *pruner) delete(namespace, name string, mapping *meta.RESTMapping, c res
}
r, err := kubectl.ReaperFor(mapping.GroupVersionKind.GroupKind(), cs)
if err != nil {
return err
if _, ok := err.(*kubectl.NoSuchReaperError); !ok {
return err
}
return resource.NewHelper(c, mapping).Delete(namespace, name)
}
if err := r.Stop(namespace, name, 2*time.Minute, api.NewDeleteOptions(int64(p.gracePeriod))); err != nil {
return err