Merge pull request kubernetes#90421 from neolit123/1.19-remove-cluster-clientbin

/cluster: cleanup clientbin.sh

Author: k8s-ci-robot

cluster/BUILD

@@ -44,14 +44,6 @@ sh_test(
     ],
 )
 
-sh_test(
-    name = "clientbin_test",
-    srcs = ["clientbin.sh"],
-    deps = [
-        "//hack/lib",
-    ],
-)
-
 sh_test(
     name = "kube-util_test",
     srcs = ["kube-util.sh"],

cluster/clientbin.sh

@@ -32,15 +32,25 @@ set -o pipefail
 
 KUBE_ROOT=${KUBE_ROOT:-$(dirname "${BASH_SOURCE[0]}")/..}
 source "${KUBE_ROOT}/cluster/kube-util.sh"
-source "${KUBE_ROOT}/cluster/clientbin.sh"
+source "${KUBE_ROOT}/hack/lib/util.sh"
 
 # If KUBECTL_PATH isn't set, gather up the list of likely places and use ls
 # to find the latest one.
 if [[ -z "${KUBECTL_PATH:-}" ]]; then
-  kubectl=$( get_bin "kubectl" "cmd/kubectl" )
+  kubectl=$( kube::util::find-binary "kubectl" )
 
   if [[ ! -x "$kubectl" ]]; then
-    print_error "kubectl"
+    {
+      echo "It looks as if you don't have a compiled kubectl binary"
+      echo
+      echo "If you are running from a clone of the git repo, please run"
+      echo "'./build/run.sh make cross'. Note that this requires having"
+      echo "Docker installed."
+      echo
+      echo "If you are running from a binary release tarball, something is wrong. "
+      echo "Look at http://kubernetes.io/ for information on how to contact the "
+      echo "development team for help."
+    } >&2
     exit 1
   fi
 elif [[ ! -x "${KUBECTL_PATH}" ]]; then