Skip to content

Commit

Permalink
use kube::util::find-binary to find kubectl
Browse files Browse the repository at this point in the history
To centralize binary selection in k/k. Also drop the e2e.test copying
which is no longer needed according to the comment.
  • Loading branch information
mikedanese committed Sep 11, 2020
1 parent b7a4262 commit eb76d70
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions hack/ci/e2e-k8s.sh
Expand Up @@ -71,12 +71,8 @@ build_with_bazel() {
bazel shutdown || true
pkill ^bazel || true

# ensure the e2e script will find our binaries ...
# https://github.com/kubernetes/kubernetes/issues/68306
# TODO: remove this, it was fixed in 1.13+
mkdir -p '_output/bin/'
cp 'bazel-bin/test/e2e/e2e.test' '_output/bin/'
PATH="$(dirname "$(find "${PWD}/bazel-bin/" -name kubectl -type f)"):${PATH}"
local -r kubectl_path="$(source hack/lib/util.sh; kube::util::find-binary '.test')" '_output/bin/'
PATH="$(dirname "\""${kubectl_path}"\""):${PATH}"
export PATH
}

Expand Down

0 comments on commit eb76d70

Please sign in to comment.