Merge pull request #43499 from liggitt/kubectl-replace-flake

Automatic merge from submit-queue (batch tested with PRs 43513, 43499) Make kubectl replace unconditional second attempt at https://github.com/kubernetes/kubernetes/pull/43192 rather than a retry, make the replace unconditional, which works reliably

Merge pull request #43499 from liggitt/kubectl-replace-flake
33eb8794 · Kubernetes Submit Queue · GitHub · 833ff4f6 · db52b4eb · 33eb8794
Commit 33eb8794 authored Mar 22, 2017 by Kubernetes Submit Queue Committed by GitHub Mar 22, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

test-cmd-util.sh hack/make-rules/test-cmd-util.sh +6 -3

No files found.
--- a/hack/make-rules/test-cmd-util.sh
+++ b/hack/make-rules/test-cmd-util.sh
@@ -666,14 +666,17 @@ run_pod_tests() {
  }
 }
 __EOF__
-  kubectl-with-retry replace "${kube_flags[@]}" -f <(echo '{
+  kubectl replace -f - "${kube_flags[@]}" << __EOF__
+{
  "kind": "Node",
  "apiVersion": "v1",
  "metadata": {
    "name": "node-v1-test",
-    "annotations": {"a":"b"}
+    "annotations": {"a":"b"},
+    "resourceVersion": "0"
  }
-}')
+}
+__EOF__
  # Post-condition: the node command succeeds
  kube::test::get_object_assert "node node-v1-test" "{{.metadata.annotations.a}}" 'b'