From 9bbd321fec45f9319f928d7d690b5a1879b98b51 Mon Sep 17 00:00:00 2001
From: "Lubomir I. Ivanov" <lubomirivanov@vmware.com>
Date: Thu, 9 Apr 2020 00:26:46 +0300
Subject: [PATCH] remove /cluster/kubeadm.sh and /test/cmd/kubeadm.sh

/cluster/kubeadm.sh is used to find the kubeadm binary.
This file is legacy and is removed.

Remove /test/cmd/kubeadm.sh. This file contains a function that is used
to build kubeadm and invoke "make test". Move the function contents
to hack/make-rules/test-cmd.cmd.

Stop sourcing /test/cmd/kubeadm.sh in /test/cmd/legacy-script.sh.

Also remove the --kubeadm-path invocation as this can be handled
with an env. variable directly.
---
 cluster/kubeadm.sh          | 42 -------------------------------------
 hack/make-rules/test-cmd.sh | 10 ++++++++-
 test/cmd/kubeadm.sh         | 36 -------------------------------
 test/cmd/legacy-script.sh   |  1 -
 4 files changed, 9 insertions(+), 80 deletions(-)
 delete mode 100755 cluster/kubeadm.sh
 delete mode 100755 test/cmd/kubeadm.sh

diff --git a/cluster/kubeadm.sh b/cluster/kubeadm.sh
deleted file mode 100755
index 3035e6c17e2..00000000000
--- a/cluster/kubeadm.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright 2016 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -o errexit
-set -o nounset
-set -o pipefail
-
-KUBE_ROOT=${KUBE_ROOT:-$(dirname "${BASH_SOURCE[0]}")/..}
-source "${KUBE_ROOT}/cluster/clientbin.sh"
-
-# If KUBEADM_PATH isn't set, gather up the list of likely places and use ls
-# to find the latest one.
-if [[ -z "${KUBEADM_PATH:-}" ]]; then
-  kubeadm=$( get_bin "kubeadm" "cmd/kubeadm" )
-
-  if [[ ! -x "$kubeadm" ]]; then
-    print_error "kubeadm"
-    exit 1
-  fi
-elif [[ ! -x "${KUBEADM_PATH}" ]]; then
-  {
-    echo "KUBEADM_PATH environment variable set to '${KUBEADM_PATH}', but "
-    echo "this doesn't seem to be a valid executable."
-  } >&2
-  exit 1
-fi
-kubeadm="${KUBEADM_PATH:-${kubeadm}}"
-
-"${kubeadm}" "${@+$@}"
diff --git a/hack/make-rules/test-cmd.sh b/hack/make-rules/test-cmd.sh
index b8adc81af19..0762e633b54 100755
--- a/hack/make-rules/test-cmd.sh
+++ b/hack/make-rules/test-cmd.sh
@@ -122,7 +122,15 @@ __EOF__
 WHAT=${WHAT:-}
 if [[ ${WHAT} == "" || ${WHAT} =~ .*kubeadm.* ]] ; then
   kube::log::status "Running kubeadm tests"  
-  run_kubeadm_tests
+
+  # build kubeadm
+  make all -C "${KUBE_ROOT}" WHAT=cmd/kubeadm
+  # unless the user sets KUBEADM_PATH, assume that "make all..." just built it
+  export KUBEADM_PATH="${KUBEADM_PATH:=$(kube::realpath "${KUBE_ROOT}")/_output/local/go/bin/kubeadm}"
+  # invoke the tests
+  make -C "${KUBE_ROOT}" test \
+    WHAT=k8s.io/kubernetes/cmd/kubeadm/test/cmd
+
   # if we ONLY want to run kubeadm, then exit here.
   if [[ ${WHAT} == "kubeadm" ]]; then
     kube::log::status "TESTS PASSED"
diff --git a/test/cmd/kubeadm.sh b/test/cmd/kubeadm.sh
deleted file mode 100755
index 8edc613c246..00000000000
--- a/test/cmd/kubeadm.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright 2016 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -o errexit
-set -o nounset
-set -o pipefail
-
-run_kubeadm_tests() {
-  set -o nounset
-  set -o errexit
-
-  KUBEADM_PATH="${KUBEADM_PATH:=$(kube::realpath "${KUBE_ROOT}")/cluster/kubeadm.sh}"
-
-  # If testing a different version of kubeadm than the current build, you can
-  # comment this out to save yourself from needlessly building here.
-  make -C "${KUBE_ROOT}" WHAT=cmd/kubeadm
-
-  make -C "${KUBE_ROOT}" test \
-  WHAT=k8s.io/kubernetes/cmd/kubeadm/test/cmd \
-  KUBE_TEST_ARGS="--kubeadm-path '${KUBEADM_PATH}'"
-  set +o nounset
-  set +o errexit
-}
diff --git a/test/cmd/legacy-script.sh b/test/cmd/legacy-script.sh
index 650575bcb4e..ec16f804a41 100755
--- a/test/cmd/legacy-script.sh
+++ b/test/cmd/legacy-script.sh
@@ -41,7 +41,6 @@ source "${KUBE_ROOT}/test/cmd/discovery.sh"
 source "${KUBE_ROOT}/test/cmd/exec.sh"
 source "${KUBE_ROOT}/test/cmd/generic-resources.sh"
 source "${KUBE_ROOT}/test/cmd/get.sh"
-source "${KUBE_ROOT}/test/cmd/kubeadm.sh"
 source "${KUBE_ROOT}/test/cmd/kubeconfig.sh"
 source "${KUBE_ROOT}/test/cmd/node-management.sh"
 source "${KUBE_ROOT}/test/cmd/plugins.sh"