From db52b4eb048617bf27ad5a969447e5a2e40527ce Mon Sep 17 00:00:00 2001
From: Jordan Liggitt <jliggitt@redhat.com>
Date: Wed, 22 Mar 2017 01:09:56 -0400
Subject: [PATCH] Make kubectl replace unconditional

---
 hack/make-rules/test-cmd-util.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/hack/make-rules/test-cmd-util.sh b/hack/make-rules/test-cmd-util.sh
index 5cd3da9b85..1f3ed7b95e 100644
--- 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'