mirror of https://github.com/k3s-io/k3s
aaa
parent
4938cc37d3
commit
b83b83f8e3
|
@ -24,7 +24,7 @@ set -o errexit
|
|||
set -o nounset
|
||||
set -o pipefail
|
||||
|
||||
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
|
||||
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
|
||||
|
||||
if [ -f "${KUBE_ROOT}/cluster/env.sh" ]; then
|
||||
source "${KUBE_ROOT}/cluster/env.sh"
|
||||
|
@ -84,6 +84,7 @@ elif [[ "${validate_result}" == "2" ]]; then
|
|||
fi
|
||||
|
||||
if [[ "${ENABLE_PROXY:-}" == "true" ]]; then
|
||||
# shellcheck disable=SC1091
|
||||
. /tmp/kube-proxy-env
|
||||
echo ""
|
||||
echo "*** Please run the following to add the kube-apiserver endpoint to your proxy white-list ***"
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
# cluster/${KUBERNETES_PROVIDER}/util.sh where KUBERNETES_PROVIDER, if unset,
|
||||
# will use its default value (gce).
|
||||
|
||||
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
|
||||
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
|
||||
|
||||
source "${KUBE_ROOT}/cluster/skeleton/util.sh"
|
||||
|
||||
|
@ -34,9 +34,8 @@ fi
|
|||
# this is a list of the _names_ of the variables, not the value of the
|
||||
# variables. Providers can add variables to be appended to kube-env.
|
||||
# (see `build-kube-env`).
|
||||
PROVIDER_VARS=""
|
||||
|
||||
PROVIDER_UTILS="${KUBE_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh"
|
||||
if [ -f ${PROVIDER_UTILS} ]; then
|
||||
if [ -f "${PROVIDER_UTILS}" ]; then
|
||||
source "${PROVIDER_UTILS}"
|
||||
fi
|
||||
|
|
|
@ -30,7 +30,7 @@ set -o pipefail
|
|||
# echo "-=-=-=-=-=-=-=-=-=-="
|
||||
|
||||
|
||||
KUBE_ROOT=${KUBE_ROOT:-$(dirname "${BASH_SOURCE}")/..}
|
||||
KUBE_ROOT=${KUBE_ROOT:-$(dirname "${BASH_SOURCE[0]}")/..}
|
||||
source "${KUBE_ROOT}/cluster/kube-util.sh"
|
||||
source "${KUBE_ROOT}/cluster/clientbin.sh"
|
||||
|
||||
|
|
|
@ -21,9 +21,6 @@
|
|||
./cluster/images/conformance/run_e2e.sh
|
||||
./cluster/juju/prereqs/ubuntu-juju.sh
|
||||
./cluster/juju/util.sh
|
||||
./cluster/kube-up.sh
|
||||
./cluster/kube-util.sh
|
||||
./cluster/kubectl.sh
|
||||
./cluster/kubemark/gce/config-default.sh
|
||||
./cluster/kubemark/iks/config-default.sh
|
||||
./cluster/kubemark/util.sh
|
||||
|
|
Loading…
Reference in New Issue