Merge pull request #45265 from nikhiljindal/fixService

Automatic merge from submit-queue Add wait for federated service deletion Fixes the flaky kubectl tests https://github.com/kubernetes/kubernetes/pull/44987#issuecomment-298790335, https://github.com/kubernetes/kubernetes/issues/45264 service deletion is not instantaneous in federation. The fix is same as https://github.com/kubernetes/kubernetes/pull/42674. We need the fix now for services since we recently fixed federation service controller so that it runs successfully now. cc @shashidharatd

Merge pull request #45265 from nikhiljindal/fixService
868da1e0 · Kubernetes Submit Queue · GitHub · 451b7ca7 · a88f2877 · 868da1e0
Commit 868da1e0 authored May 03, 2017 by Kubernetes Submit Queue Committed by GitHub May 03, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 1 deletion

test-cmd-util.sh hack/make-rules/test-cmd-util.sh +12 -1

No files found.
--- a/hack/make-rules/test-cmd-util.sh
+++ b/hack/make-rules/test-cmd-util.sh
@@ -2014,6 +2014,9 @@ run_service_tests() {
  kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:redis-master:'
  # Command
  kubectl delete service redis-master "${kube_flags[@]}"
+  if [[ "${WAIT_FOR_DELETION:-}" == "true" ]]; then
+    kube::test::wait_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:'
+  fi
  # Post-condition: Only the default kubernetes services exist
  kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:'

@@ -2059,6 +2062,9 @@ __EOF__
  # Command
  kubectl delete service redis-master "${kube_flags[@]}"
  kubectl delete service "service-v1-test" "${kube_flags[@]}"
+  if [[ "${WAIT_FOR_DELETION:-}" == "true" ]]; then
+    kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:'
+  fi
  # Post-condition: Only the default kubernetes services exist
  kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:'

@@ -2082,6 +2088,9 @@ __EOF__
  kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:redis-master:redis-slave:'
  # Command
  kubectl delete services redis-master redis-slave "${kube_flags[@]}" # delete multiple services at once
+  if [[ "${WAIT_FOR_DELETION:-}" == "true" ]]; then
+    kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:'
+  fi
  # Post-condition: Only the default kubernetes services exist
  kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:'

@@ -2098,9 +2107,11 @@ __EOF__
  kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'beep-boop:kubernetes:'
  # Command
  kubectl delete service beep-boop "${kube_flags[@]}"
+  if [[ "${WAIT_FOR_DELETION:-}" == "true" ]]; then
+    kube::test::wait_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:'
+  fi
  # Post-condition: Only the default kubernetes services exist
  kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:'
-
 }

 run_rc_tests() {