From 5c3d3c888bde748cdea97af6815eb72923aa7439 Mon Sep 17 00:00:00 2001
From: Rick Rackow <rick.rackow@gmail.com>
Date: Tue, 13 Sep 2022 10:22:04 +0200
Subject: [PATCH] fix(test/cmd/legacy-script.sh)!: cleanup obsolete code
 according to TODO. All dependencies according to
 https://github.com/kubernetes/kubernetes/pull/15651#issue-111457974 are
 merged

---
 test/cmd/legacy-script.sh | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/test/cmd/legacy-script.sh b/test/cmd/legacy-script.sh
index 6fff7b11ae9f2..e5c5fbb5cc643 100755
--- a/test/cmd/legacy-script.sh
+++ b/test/cmd/legacy-script.sh
@@ -254,25 +254,6 @@ function check-curl-proxy-code()
   return 1
 }
 
-# TODO: Remove this function when we do the retry inside the kubectl commands. See #15333.
-function kubectl-with-retry()
-{
-  ERROR_FILE="${KUBE_TEMP}/kubectl-error"
-  preserve_err_file=${PRESERVE_ERR_FILE:-false}
-  for count in {0..3}; do
-    kubectl "$@" 2> "${ERROR_FILE}" || true
-    if grep -q "the object has been modified" "${ERROR_FILE}"; then
-      kube::log::status "retry $1, error: $(cat "${ERROR_FILE}")"
-      rm "${ERROR_FILE}"
-      sleep $((2**count))
-    else
-      if [ "$preserve_err_file" != true ] ; then
-        rm "${ERROR_FILE}"
-      fi
-      break
-    fi
-  done
-}
 
 # Waits for the pods with the given label to match the list of names. Don't call
 # this function unless you know the exact pod names, or expect no pods.