Skip to content

Commit 9bbd321

Browse files
committed
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.
1 parent 4a598aa commit 9bbd321

File tree

4 files changed

+9
-80
lines changed

4 files changed

+9
-80
lines changed

cluster/kubeadm.sh

Lines changed: 0 additions & 42 deletions
This file was deleted.

hack/make-rules/test-cmd.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,15 @@ __EOF__
122122
WHAT=${WHAT:-}
123123
if [[ ${WHAT} == "" || ${WHAT} =~ .*kubeadm.* ]] ; then
124124
kube::log::status "Running kubeadm tests"
125-
run_kubeadm_tests
125+
126+
# build kubeadm
127+
make all -C "${KUBE_ROOT}" WHAT=cmd/kubeadm
128+
# unless the user sets KUBEADM_PATH, assume that "make all..." just built it
129+
export KUBEADM_PATH="${KUBEADM_PATH:=$(kube::realpath "${KUBE_ROOT}")/_output/local/go/bin/kubeadm}"
130+
# invoke the tests
131+
make -C "${KUBE_ROOT}" test \
132+
WHAT=k8s.io/kubernetes/cmd/kubeadm/test/cmd
133+
126134
# if we ONLY want to run kubeadm, then exit here.
127135
if [[ ${WHAT} == "kubeadm" ]]; then
128136
kube::log::status "TESTS PASSED"

test/cmd/kubeadm.sh

Lines changed: 0 additions & 36 deletions
This file was deleted.

test/cmd/legacy-script.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ source "${KUBE_ROOT}/test/cmd/discovery.sh"
4141
source "${KUBE_ROOT}/test/cmd/exec.sh"
4242
source "${KUBE_ROOT}/test/cmd/generic-resources.sh"
4343
source "${KUBE_ROOT}/test/cmd/get.sh"
44-
source "${KUBE_ROOT}/test/cmd/kubeadm.sh"
4544
source "${KUBE_ROOT}/test/cmd/kubeconfig.sh"
4645
source "${KUBE_ROOT}/test/cmd/node-management.sh"
4746
source "${KUBE_ROOT}/test/cmd/plugins.sh"

0 commit comments

Comments
 (0)