From eb6d0238d45021b50d2c4bf73128d6d3933ca9e4 Mon Sep 17 00:00:00 2001
From: Dawn Chen <dawnchen@google.com>
Date: Wed, 23 Jul 2014 16:20:06 -0700
Subject: [PATCH] query minion's /healthz for sanity checking. Removing gcutil
 ssh to VM, and check kubelet's status.

---
 cluster/kube-up.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/cluster/kube-up.sh b/cluster/kube-up.sh
index 4879c916750..8e1711a42fe 100755
--- a/cluster/kube-up.sh
+++ b/cluster/kube-up.sh
@@ -151,13 +151,16 @@ for (( i=0; i<${#MINION_NAMES[@]}; i++)); do
         exit 1
     fi
 
-    # Make sure the kubelet is running
-    gcutil ssh ${MINION_NAMES[$i]} /etc/init.d/kubelet status
-    if [ "$?" != "0" ]; then
+    # Make sure the kubelet is healthy
+    if [ "$(curl --insecure --user ${user}:${passwd} https://${KUBE_MASTER_IP}/proxy/minion/${MINION_NAMES[$i]}/healthz)" != "ok" ]; then
 	echo "Kubelet failed to install on ${MINION_NAMES[$i]} your cluster is unlikely to work correctly"
         echo "Please run ./cluster/kube-down.sh and re-create the cluster. (sorry!)"
         exit 1
+    else
+	echo "Kubelet is successfully installed on ${MINION_NAMES[$i]}"
+
     fi
+
 done
 
 echo