scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2318 from brendandburns/fix

Browse Source 
Really fix the gce turn up script.
This commit is contained in:
Brendan Burns
2014-11-11 21:19:55 -08:00
parent 797c499b59 4faefda415
commit dd85b16c41
1 changed files with 9 additions and 8 deletions
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
fi
fi
${KUBE_ROOT}/cluster/kubectl.sh 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 &&
${KUBE_ROOT}/cluster/kubectl.sh create -f "${KUBE_ROOT}/examples/monitoring/heapster-pod.json" > /dev/null
local kubectl=${KUBE_ROOT}/cluster/kubectl.sh
${kubectl} create -f "${KUBE_ROOT}/examples/monitoring/influx-grafana-pod.json" > /dev/null &&
${kubectl} create -f "${KUBE_ROOT}/examples/monitoring/influx-grafana-service.json" > /dev/null &&
${kubectl} create -f "${KUBE_ROOT}/examples/monitoring/heapster-pod.json" > /dev/null
if [ $? -ne 0 ]; then
echo "Failed to Setup Monitoring"
teardown-monitoring
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."
fi
fi
@@ -610,9 +610,10 @@ function setup-monitoring {
function teardown-monitoring {
if [ $MONITORING ]; then
${KUBE_ROOT}/cluster/kubectl.sh delete pods heapster &> /dev/null || true
${KUBE_ROOT}/cluster/kubectl.sh delete pods influx-grafana &> /dev/null || true
${KUBE_ROOT}/cluster/kubectl.sh delete services influx-master &> /dev/null || true
local kubectl=${KUBE_ROOT}/cluster/kubectl.sh
${kubectl} delete pods heapster &> /dev/null || true
${kubectl} delete pods influx-grafana &> /dev/null || true
${kubectl} delete services influx-master &> /dev/null || true
gcutil deletefirewall \
--project "${PROJECT}" \
--norespect_terminal_width \