github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2419 from jbeda/fix-teardown

Browse Source 
Fix breakage when bringing down cluster.
This commit is contained in:
Joe Beda
2014-11-17 11:27:24 -08:00
parent 65c7970465 7b5a77c56c
commit 06bf2ae2e4
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/util.sh
View File

@@ -630,6 +630,8 @@ function setup-monitoring {
function teardown-monitoring { function teardown-monitoring {
if [[ "${MONITORING}" == "true" ]]; then if [[ "${MONITORING}" == "true" ]]; then
detect-project
local kubectl="${KUBE_ROOT}/cluster/kubectl.sh" local kubectl="${KUBE_ROOT}/cluster/kubectl.sh"
"${kubectl}" delete pods heapster &> /dev/null || true "${kubectl}" delete pods heapster &> /dev/null || true
"${kubectl}" delete pods influx-grafana &> /dev/null || true "${kubectl}" delete pods influx-grafana &> /dev/null || true