github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Really fix the gce turn up script.

pull/6/head
Brendan Burns 2014-11-11 20:55:12 -08:00
parent 21ff53c70b
commit 4faefda415
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cluster/gce/util.sh
View File

@ -594,15 +594,15 @@ function setup-monitoring {
echo "Failed to Setup Firewall for Monitoring" && false echo "Failed to Setup Firewall for Monitoring" && false
fi fi
fi fi
local kubectl=${KUBE_ROOT}/cluster/kubectl.sh
${KUBE_ROOT}/cluster/kubectl.sh create -f "${KUBE_ROOT}/examples/monitoring/influx-grafana-pod.json" > /dev/null && ${kubectl} create -f "${KUBE_ROOT}/examples/monitoring/influx-grafana-pod.json" > /dev/null &&
${KUBE_ROOT}/cluster/kubectl.sh create -f "${KUBE_ROOT}/examples/monitoring/influx-grafana-service.json" > /dev/null && ${kubectl} create -f "${KUBE_ROOT}/examples/monitoring/influx-grafana-service.json" > /dev/null &&
${KUBE_ROOT}/cluster/kubectl.sh create -f "${KUBE_ROOT}/examples/monitoring/heapster-pod.json" > /dev/null ${kubectl} create -f "${KUBE_ROOT}/examples/monitoring/heapster-pod.json" > /dev/null
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Failed to Setup Monitoring" echo "Failed to Setup Monitoring"
teardown-monitoring teardown-monitoring
else else
dashboardIP="http://admin:admin@`kubectl.sh get -o json pod influx-grafana | grep hostIP | awk '{print $2}' | sed 's/[,|\"]//g'`" dashboardIP="http://admin:admin@`${kubectl} get -o json pod influx-grafana | grep hostIP | awk '{print $2}' | sed 's/[,|\"]//g'`"
echo "Grafana dashboard will be available at $dashboardIP. Wait for the monitoring dashboard to be online." echo "Grafana dashboard will be available at $dashboardIP. Wait for the monitoring dashboard to be online."
fi fi
fi fi
@ -610,9 +610,10 @@ function setup-monitoring {
function teardown-monitoring { function teardown-monitoring {
if [ $MONITORING ]; then if [ $MONITORING ]; then
${KUBE_ROOT}/cluster/kubectl.sh delete pods heapster &> /dev/null || true local kubectl=${KUBE_ROOT}/cluster/kubectl.sh
${KUBE_ROOT}/cluster/kubectl.sh delete pods influx-grafana &> /dev/null || true ${kubectl} delete pods heapster &> /dev/null || true
${KUBE_ROOT}/cluster/kubectl.sh delete services influx-master &> /dev/null || true ${kubectl} delete pods influx-grafana &> /dev/null || true
${kubectl} delete services influx-master &> /dev/null || true
gcutil deletefirewall \ gcutil deletefirewall \
--project "${PROJECT}" \ --project "${PROJECT}" \
--norespect_terminal_width \ --norespect_terminal_width \