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)

Merge pull request #47451 from enisoc/crd-orphan-finalizer
a56af866 · Kubernetes Submit Queue · GitHub · 509bf69a · 394c6a59 · a56af866
Commit a56af866 authored Jun 15, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 15, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

test-cmd-util.sh hack/make-rules/test-cmd-util.sh +4 -4

No files found.
--- a/hack/make-rules/test-cmd-util.sh
+++ b/hack/make-rules/test-cmd-util.sh
@@ -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
+  # Delete the resource with cascade.
-  kubectl "${kube_flags[@]}" delete foos test
+  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
+  # Delete the resource without cascade.
-  kubectl "${kube_flags[@]}" delete bars test
+  kubectl "${kube_flags[@]}" delete bars test --cascade=false
  # Make sure it's gone
  kube::test::get_object_assert bars "{{range.items}}{{$id_field}}:{{end}}" ''