From 9566467cddb9fa2bfc31b642d4e3f8b744e66995 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Fri, 23 Jan 2015 12:35:55 -0800 Subject: [PATCH] Fix monitoring e2e to find kubectl --- hack/e2e-suite/monitoring.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/e2e-suite/monitoring.sh b/hack/e2e-suite/monitoring.sh index 1871b20d590..30d30988b8b 100755 --- a/hack/e2e-suite/monitoring.sh +++ b/hack/e2e-suite/monitoring.sh @@ -51,8 +51,8 @@ function setup { function cleanup { "${KUBECFG}" resize monitoring-influxGrafanaController 0 &> /dev/null || true "${KUBECFG}" resize monitoring-heapsterController 0 &> /dev/null || true - while kubectl.sh get pods -l "name=influxGrafana" -o template -t {{range.items}}{{.id}}:{{end}} | grep -c . &> /dev/null \ - || kubectl.sh get pods -l "name=heapster" -o template -t {{range.items}}{{.id}}:{{end}} | grep -c . &> /dev/null; do + while "${KUBECTL}" -l "name=influxGrafana" -o template -t {{range.items}}{{.id}}:{{end}} | grep -c . &> /dev/null \ + || "${KUBECTL}" -l "name=heapster" -o template -t {{range.items}}{{.id}}:{{end}} | grep -c . &> /dev/null; do sleep 2 done "${KUBECTL}" delete -f "${MONITORING}/" &> /dev/null || true