github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 18:00:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3770 from thockin/e2e

Browse Source 
Fix monitoring e2e to find kubectl
This commit is contained in:
Dawn Chen 2015-01-23 14:25:28 -08:00
commit 3a907b58f1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/e2e-suite/monitoring.sh
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.sh get pods -l "name=influxGrafana" -o template -t {{range.items}}{{.id}}:{{end}} | grep -c . &> /dev/null \ while "${KUBECTL}" -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 || "${KUBECTL}" -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