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

pull/6/head
Mike Danese 2016-10-14 10:18:24 -07:00
parent a474b2b9a0
commit c17a8a773d
4 changed files with 33 additions and 5 deletions

View File

@ -1111,6 +1111,14 @@ __EOF__
kube::test::get_object_assert 'pods b' "{{${id_field}}}" 'b'
kubectl delete pod/a pod/b
## kubectl apply --prune should fallback to delete for non reapable types
kubectl apply --all --prune -f hack/testdata/prune-reap/a.yml 2>&1 "${kube_flags[@]}"
kube::test::get_object_assert 'pvc a-pvc' "{{${id_field}}}" 'a-pvc'
kubectl apply --all --prune -f hack/testdata/prune-reap/b.yml 2>&1 "${kube_flags[@]}"
kube::test::get_object_assert 'pvc b-pvc' "{{${id_field}}}" 'b-pvc'
kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" ''
kubectl delete pvc b-pvc 2>&1 "${kube_flags[@]}"
## kubectl run should create deployments or jobs
# Pre-Condition: no Job exists
kube::test::get_object_assert jobs "{{range.items}}{{$id_field}}:{{end}}" ''

10
hack/testdata/prune-reap/a.yml vendored Normal file
View File

@ -0,0 +1,10 @@
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
name: a-pvc
spec:
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 10G

10
hack/testdata/prune-reap/b.yml vendored Normal file
View File

@ -0,0 +1,10 @@
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
name: b-pvc
spec:
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 10G

View File

@ -343,10 +343,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 {
@ -354,7 +351,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