Merge pull request #3778 from vishh/heapster

Fix monitoring.sh
This commit is contained in:
Tim Hockin 2015-01-23 16:10:54 -08:00
commit 9dfbf46b23

View File

@ -51,8 +51,8 @@ function setup {
function cleanup { function cleanup {
"${KUBECFG}" resize monitoring-influxGrafanaController 0 &> /dev/null || true "${KUBECFG}" resize monitoring-influxGrafanaController 0 &> /dev/null || true
"${KUBECFG}" resize monitoring-heapsterController 0 &> /dev/null || true "${KUBECFG}" resize monitoring-heapsterController 0 &> /dev/null || true
while "${KUBECTL}" -l "name=influxGrafana" -o template -t {{range.items}}{{.id}}:{{end}} | grep -c . &> /dev/null \ while "${KUBECTL}" get pods -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 || "${KUBECTL}" get pods -l "name=heapster" -o template -t {{range.items}}{{.id}}:{{end}} | grep -c . &> /dev/null; do
sleep 2 sleep 2
done done
"${KUBECTL}" delete -f "${MONITORING}/" &> /dev/null || true "${KUBECTL}" delete -f "${MONITORING}/" &> /dev/null || true