Skip to content

K
k3s
Commit 9dfbf46b authored by Tim Hockin's avatar Tim Hockin
Browse files
Options

Merge pull request #3778 from vishh/heapster

Fix monitoring.sh
parents 426c16e8 2131ed56
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
hack/e2e-suite/monitoring.sh
View file @ 9dfbf46b
...@@ -51,8 +51,8 @@ function setup { ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment