diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh index 96882dbd59c..09def6ab018 100755 --- a/cluster/aws/util.sh +++ b/cluster/aws/util.sh @@ -34,6 +34,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. source "${KUBE_ROOT}/cluster/aws/${KUBE_CONFIG_FILE-"config-default.sh"}" source "${KUBE_ROOT}/cluster/common.sh" +source "${KUBE_ROOT}/cluster/lib/util.sh" ALLOCATE_NODE_CIDRS=true diff --git a/cluster/kube-env.sh b/cluster/kube-env.sh deleted file mode 100755 index 5e0b4f02dd8..00000000000 --- a/cluster/kube-env.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# Copyright 2014 The Kubernetes Authors All rights reserved. -# -# 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. - -# Some useful colors. -if [[ -z "${color_start-}" ]]; then - declare -r color_start="\033[" - declare -r color_red="${color_start}0;31m" - declare -r color_yellow="${color_start}0;33m" - declare -r color_green="${color_start}0;32m" - declare -r color_norm="${color_start}0m" -fi diff --git a/cluster/lib/util.sh b/cluster/lib/util.sh index decfa811600..7f700d6caf1 100644 --- a/cluster/lib/util.sh +++ b/cluster/lib/util.sh @@ -25,3 +25,11 @@ kube::util::wait-for-jobs() { return ${fail} } +# Some useful colors. +if [[ -z "${color_start-}" ]]; then + declare -r color_start="\033[" + declare -r color_red="${color_start}0;31m" + declare -r color_yellow="${color_start}0;33m" + declare -r color_green="${color_start}0;32m" + declare -r color_norm="${color_start}0m" +fi diff --git a/cluster/validate-cluster.sh b/cluster/validate-cluster.sh index 931e41f1300..812799968bc 100755 --- a/cluster/validate-cluster.sh +++ b/cluster/validate-cluster.sh @@ -30,7 +30,7 @@ if [ -f "${KUBE_ROOT}/cluster/env.sh" ]; then source "${KUBE_ROOT}/cluster/env.sh" fi -source "${KUBE_ROOT}/cluster/kube-env.sh" +source "${KUBE_ROOT}/cluster/lib/util.sh" source "${KUBE_ROOT}/cluster/kube-util.sh" ALLOWED_NOTREADY_NODES="${ALLOWED_NOTREADY_NODES:-0}" diff --git a/hack/update-all.sh b/hack/update-all.sh index 5ad52bb63a0..3457f5c2805 100755 --- a/hack/update-all.sh +++ b/hack/update-all.sh @@ -20,7 +20,7 @@ set -o nounset set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. -source "${KUBE_ROOT}/cluster/kube-env.sh" +source "${KUBE_ROOT}/cluster/lib/util.sh" SILENT=true ALL=false diff --git a/hack/verify-all.sh b/hack/verify-all.sh index 6017f655020..c5b32958bfa 100755 --- a/hack/verify-all.sh +++ b/hack/verify-all.sh @@ -19,7 +19,7 @@ set -o nounset set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. -source "${KUBE_ROOT}/cluster/kube-env.sh" +source "${KUBE_ROOT}/cluster/lib/util.sh" SILENT=true diff --git a/test/kubemark/common.sh b/test/kubemark/common.sh index d76044dc576..2fa6200e94f 100644 --- a/test/kubemark/common.sh +++ b/test/kubemark/common.sh @@ -16,7 +16,7 @@ source "${KUBE_ROOT}/cluster/kubemark/config-default.sh" source "${KUBE_ROOT}/cluster/kubemark/util.sh" -source "${KUBE_ROOT}/cluster/kube-env.sh" +source "${KUBE_ROOT}/cluster/lib/util.sh" detect-project &> /dev/null export PROJECT