github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

aaa

Browse Source
This commit is contained in:
xichengliudui 2019-02-18 17:50:55 -05:00
parent 4938cc37d3
commit b83b83f8e3
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/kube-up.sh
View File

@ -24,7 +24,7 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
if [ -f "${KUBE_ROOT}/cluster/env.sh" ]; then if [ -f "${KUBE_ROOT}/cluster/env.sh" ]; then
source "${KUBE_ROOT}/cluster/env.sh" source "${KUBE_ROOT}/cluster/env.sh"
@ -84,6 +84,7 @@ elif [[ "${validate_result}" == "2" ]]; then
fi fi
if [[ "${ENABLE_PROXY:-}" == "true" ]]; then if [[ "${ENABLE_PROXY:-}" == "true" ]]; then
# shellcheck disable=SC1091
. /tmp/kube-proxy-env . /tmp/kube-proxy-env
echo "" echo ""
echo "*** Please run the following to add the kube-apiserver endpoint to your proxy white-list ***" echo "*** Please run the following to add the kube-apiserver endpoint to your proxy white-list ***"

5
cluster/kube-util.sh
View File

@ -18,7 +18,7 @@
# cluster/${KUBERNETES_PROVIDER}/util.sh where KUBERNETES_PROVIDER, if unset, # cluster/${KUBERNETES_PROVIDER}/util.sh where KUBERNETES_PROVIDER, if unset,
# will use its default value (gce). # will use its default value (gce).
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
source "${KUBE_ROOT}/cluster/skeleton/util.sh" 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 # 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. # variables. Providers can add variables to be appended to kube-env.
# (see `build-kube-env`). # (see `build-kube-env`).
PROVIDER_VARS=""
PROVIDER_UTILS="${KUBE_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh" PROVIDER_UTILS="${KUBE_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh"
if [ -f ${PROVIDER_UTILS} ]; then if [ -f "${PROVIDER_UTILS}" ]; then
source "${PROVIDER_UTILS}" source "${PROVIDER_UTILS}"
fi fi

2
cluster/kubectl.sh
View File

@ -30,7 +30,7 @@ set -o pipefail
# echo "-=-=-=-=-=-=-=-=-=-=" # 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/kube-util.sh"
source "${KUBE_ROOT}/cluster/clientbin.sh" source "${KUBE_ROOT}/cluster/clientbin.sh"

3
hack/.shellcheck_failures
View File

@ -21,9 +21,6 @@
./cluster/images/conformance/run_e2e.sh ./cluster/images/conformance/run_e2e.sh
./cluster/juju/prereqs/ubuntu-juju.sh ./cluster/juju/prereqs/ubuntu-juju.sh
./cluster/juju/util.sh ./cluster/juju/util.sh
./cluster/kube-up.sh
./cluster/kube-util.sh
./cluster/kubectl.sh
./cluster/kubemark/gce/config-default.sh ./cluster/kubemark/gce/config-default.sh
./cluster/kubemark/iks/config-default.sh ./cluster/kubemark/iks/config-default.sh
./cluster/kubemark/util.sh ./cluster/kubemark/util.sh