From fcb4e5e20407952cf47c5385e6919e97bc084f31 Mon Sep 17 00:00:00 2001 From: Max Forbes Date: Tue, 14 Jul 2015 14:54:43 -0700 Subject: [PATCH] Log Project (GKE) less and cleanup bash indentation --- cluster/gke/util.sh | 7 +++---- cluster/kube-up.sh | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/cluster/gke/util.sh b/cluster/gke/util.sh index 6d4ea3a477d..a852862f2ec 100755 --- a/cluster/gke/util.sh +++ b/cluster/gke/util.sh @@ -51,14 +51,13 @@ function detect-project() { echo "... in detect-project()" >&2 if [[ -z "${PROJECT:-}" ]]; then export PROJECT=$("${GCLOUD}" config list project | tail -n 1 | cut -f 3 -d ' ') + echo "... Using project: ${PROJECT}" >&2 fi - if [[ -z "${PROJECT:-}" ]]; then echo "Could not detect Google Cloud Platform project. Set the default project using " >&2 echo "'gcloud config set project '" >&2 exit 1 fi - echo "Project: ${PROJECT}" >&2 } # Execute prior to running tests to build a release if required for env. @@ -121,7 +120,7 @@ function kube-up() { echo "Creating new network: ${NETWORK}" >&2 "${GCLOUD}" compute networks create "${NETWORK}" --project="${PROJECT}" --range "${NETWORK_RANGE}" else - echo "Using network: ${NETWORK}" >&2 + echo "... Using network: ${NETWORK}" >&2 fi # Allow SSH on all nodes in the network. This doesn't actually check whether @@ -134,7 +133,7 @@ function kube-up() { --project="${PROJECT}" \ --source-ranges="0.0.0.0/0" else - echo "Using firewall-rule: ${FIREWALL_SSH}" >&2 + echo "... Using firewall-rule: ${FIREWALL_SSH}" >&2 fi local create_args=( diff --git a/cluster/kube-up.sh b/cluster/kube-up.sh index 326a38486a9..dd6cb6cf535 100755 --- a/cluster/kube-up.sh +++ b/cluster/kube-up.sh @@ -28,7 +28,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. source "${KUBE_ROOT}/cluster/kube-env.sh" source "${KUBE_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh" -echo "Starting cluster using provider: $KUBERNETES_PROVIDER" >&2 +echo "... Starting cluster using provider: $KUBERNETES_PROVIDER" >&2 echo "... calling verify-prereqs" >&2 verify-prereqs @@ -36,7 +36,7 @@ verify-prereqs echo "... calling kube-up" >&2 kube-up -echo "... calling validate-cluster" >&2 +echo "... calling validate-cluster.sh" >&2 "${KUBE_ROOT}/cluster/validate-cluster.sh" echo -e "Done, listing cluster services:\n" >&2