From 442a22d114f4d45a821a9238a75a8a1552fefbc2 Mon Sep 17 00:00:00 2001
From: He Simei <hesimei@zju.edu.cn>
Date: Wed, 2 Sep 2015 10:24:46 +0800
Subject: [PATCH] tear down resources before tear down the cluster

---
 cluster/common.sh      | 10 ++++++++++
 cluster/ubuntu/util.sh |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/cluster/common.sh b/cluster/common.sh
index 7a08180a8e2..3b86bfb1b8a 100755
--- a/cluster/common.sh
+++ b/cluster/common.sh
@@ -117,6 +117,15 @@ function clear-kubeconfig() {
   echo "Cleared config for ${CONTEXT} from ${KUBECONFIG}"
 }
 
+
+function tear_down_alive_resources() {
+  local kubectl="${KUBE_ROOT}/cluster/kubectl.sh"
+  "${kubectl}" delete rc --all
+  "${kubectl}" delete pods --all
+  "${kubectl}" delete svc --all
+  "${kubectl}" delete pvc --all
+}
+
 # Gets username, password for the current-context in kubeconfig, if they exist.
 # Assumed vars:
 #   KUBECONFIG  # if unset, defaults to global
@@ -278,3 +287,4 @@ function tars_from_version() {
     exit 1
   fi
 }
+
diff --git a/cluster/ubuntu/util.sh b/cluster/ubuntu/util.sh
index b5c98fb5ff2..535ad3998a9 100755
--- a/cluster/ubuntu/util.sh
+++ b/cluster/ubuntu/util.sh
@@ -409,6 +409,9 @@ function provision-masterandminion() {
 function kube-down {
   KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
   source "${KUBE_ROOT}/cluster/ubuntu/${KUBE_CONFIG_FILE-"config-default.sh"}"
+  
+  source "${KUBE_ROOT}/cluster/common.sh"
+  tear_down_alive_resources
 
   ii=0
   for i in ${nodes}; do