github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #47451 from enisoc/crd-orphan-finalizer 

Automatic merge from submit-queue (batch tested with PRs 47451, 47410, 47598, 47616, 47473)

CRD: Test delete both with and without cascading.

Fixes #47431

Depends on #47432 (included for now; will rebase if needed)
pull/6/head
Kubernetes Submit Queue 2017-06-15 19:52:05 -07:00 committed by GitHub
parent 509bf69a2d 394c6a5980
commit a56af866d9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hack/make-rules/test-cmd-util.sh
View File

@ -1759,8 +1759,8 @@ run_non_native_resource_tests() {
kubectl "${kube_flags[@]}" describe foos | grep listlabel=true
kubectl "${kube_flags[@]}" describe foos | grep itemlabel=true
# Delete the resource
kubectl "${kube_flags[@]}" delete foos test
# Delete the resource with cascade.
kubectl "${kube_flags[@]}" delete foos test --cascade=true
# Make sure it's gone
kube::test::get_object_assert foos "{{range.items}}{{$id_field}}:{{end}}" ''
@ -1797,8 +1797,8 @@ run_non_native_resource_tests() {
kill -9 ${patch_pid}
kube::test::if_has_string "${watch_output}" 'bars/test'
# Delete the resource
kubectl "${kube_flags[@]}" delete bars test
# Delete the resource without cascade.
kubectl "${kube_flags[@]}" delete bars test --cascade=false
# Make sure it's gone
kube::test::get_object_assert bars "{{range.items}}{{$id_field}}:{{end}}" ''