cluster: move logging library to hack/

it's used once in cluster and used a bunch in hack/ and build/
mikedanese · Jan 14, 2018 · 1e2b644 · 1e2b644
1 parent 32dc504
commit 1e2b644
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 37 deletions.
diff --git a/cluster/BUILD b/cluster/BUILD
@@ -20,7 +20,6 @@ filegroup(
         "//cluster/images/etcd/rollback:all-srcs",
         "//cluster/images/hyperkube:all-srcs",
         "//cluster/images/kubemark:all-srcs",
-        "//cluster/lib:all-srcs",
         "//cluster/saltbase:all-srcs",
     ],
     tags = ["automanaged"],
@@ -55,7 +54,6 @@ sh_test(
     name = "common_test",
     srcs = ["common.sh"],
     deps = [
-        "//cluster/lib",
         "//hack/lib",
     ],
 )
@@ -64,7 +62,6 @@ sh_test(
     name = "clientbin_test",
     srcs = ["clientbin.sh"],
     deps = [
-        "//cluster/lib",
         "//hack/lib",
     ],
 )
@@ -73,7 +70,6 @@ sh_test(
     name = "kube-util_test",
     srcs = ["kube-util.sh"],
     deps = [
-        "//cluster/lib",
         "//hack/lib",
     ],
 )
diff --git a/cluster/common.sh b/cluster/common.sh
@@ -25,7 +25,6 @@ KUBE_ROOT=$(cd $(dirname "${BASH_SOURCE}")/.. && pwd)
 DEFAULT_KUBECONFIG="${HOME:-.}/.kube/config"
 
 source "${KUBE_ROOT}/hack/lib/util.sh"
-source "${KUBE_ROOT}/cluster/lib/logging.sh"
 # KUBE_RELEASE_VERSION_REGEX matches things like "v1.2.3" or "v1.2.3-alpha.4"
 #
 # NOTE This must match the version_regex in build/common.sh
@@ -499,7 +498,7 @@ function stage-images() {
   done
 
   kube::util::wait-for-jobs || {
-    kube::log::error "unable to push images. See ${temp_dir}/*.log for more info."
+    echo "!!! unable to push images. See ${temp_dir}/*.log for more info." 1>&2
     return 1
   }
 

diff --git a/cluster/lib/BUILD b/cluster/lib/BUILD
diff --git a/hack/generate-bindata.sh b/hack/generate-bindata.sh
@@ -22,7 +22,7 @@ if [[ -z "${KUBE_ROOT:-}" ]]; then
 	KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
 fi
 
-source "${KUBE_ROOT}/cluster/lib/logging.sh"
+source "${KUBE_ROOT}/hack/lib/logging.sh"
 
 if [[ ! -d "${KUBE_ROOT}/examples" ]]; then
 	echo "${KUBE_ROOT}/examples not detected.  This script should be run from a location where the source dirs are available."

diff --git a/hack/lib/BUILD b/hack/lib/BUILD
@@ -6,14 +6,12 @@ sh_library(
         "etcd.sh",
         "golang.sh",
         "init.sh",
+        "logging.sh",
         "swagger.sh",
         "test.sh",
         "util.sh",
         "version.sh",
     ],
-    deps = [
-        "//cluster/lib",
-    ],
 )
 
 filegroup(

diff --git a/hack/lib/init.sh b/hack/lib/init.sh
@@ -37,7 +37,7 @@ export no_proxy=127.0.0.1,localhost
 THIS_PLATFORM_BIN="${KUBE_ROOT}/_output/bin"
 
 source "${KUBE_ROOT}/hack/lib/util.sh"
-source "${KUBE_ROOT}/cluster/lib/logging.sh"
+source "${KUBE_ROOT}/hack/lib/logging.sh"
 
 kube::log::install_errexit
 

diff --git a/cluster/lib/logging.sh → hack/lib/logging.sh b/cluster/lib/logging.sh → hack/lib/logging.sh
diff --git a/test/e2e_node/gubernator.sh b/test/e2e_node/gubernator.sh
@@ -22,7 +22,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-source cluster/lib/logging.sh
+source hack/lib/logging.sh
 
 
 if [[ $# -eq 0 || ! $1 =~ ^[Yy]$ ]]; then