From 9ac9c695347b366f3f8c2e8820b436fc27d938fe Mon Sep 17 00:00:00 2001
From: Richard Larocque <rlarocque@google.com>
Date: Fri, 19 Dec 2014 15:57:26 -0800
Subject: [PATCH] Replace kubecfg with kubectl in setup scripts

Replaces two instances of kubecfg with kubectl in cluster startup and
validation scripts.
---
 cluster/vagrant/util.sh     | 2 +-
 cluster/validate-cluster.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cluster/vagrant/util.sh b/cluster/vagrant/util.sh
index 081a59bd05b..0df86f6970e 100644
--- a/cluster/vagrant/util.sh
+++ b/cluster/vagrant/util.sh
@@ -140,7 +140,7 @@ function verify-cluster {
     local count="0"
     until [[ "$count" == "1" ]]; do
       local minions
-      minions=$("${KUBE_ROOT}/cluster/kubecfg.sh" -template '{{range.items}}{{.id}}:{{end}}' list minions)
+      minions=$("${KUBE_ROOT}/cluster/kubectl.sh" get minions -o template -t '{{range.items}}{{.id}}:{{end}}')
       count=$(echo $minions | grep -c "${MINION_IPS[i]}") || {
         printf "."
         sleep 2
diff --git a/cluster/validate-cluster.sh b/cluster/validate-cluster.sh
index e91c3347eae..e52096ef5dc 100755
--- a/cluster/validate-cluster.sh
+++ b/cluster/validate-cluster.sh
@@ -35,7 +35,7 @@ detect-minions > /dev/null
 MINIONS_FILE=/tmp/minions
 attempt=0
 while true; do
-  "${KUBE_ROOT}/cluster/kubecfg.sh" -template $'{{range.items}}{{.id}}\n{{end}}' list minions > "${MINIONS_FILE}"
+  "${KUBE_ROOT}/cluster/kubectl.sh" get minions -o template -t $'{{range.items}}{{.id}}\n{{end}}' > "${MINIONS_FILE}"
   found=$(grep -c . "${MINIONS_FILE}")
   if [[ ${found} == "${NUM_MINIONS}" ]]; then
     break