From 6b65d4a3902d36a450d721305a35365287000d8c Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Thu, 13 Oct 2016 12:24:22 -0700
Subject: [PATCH] Don't fail teardown if we can't delete the network

---
 cluster/gce/util.sh | 2 +-
 cluster/gke/util.sh | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
index 45ba2aad0ec..c347310bd00 100755
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -1362,7 +1362,7 @@ function kube-down() {
     "${NETWORK}-default-ssh" \
     "${NETWORK}-default-internal"  # Pre-1.5 clusters
   if [[ "${KUBE_DELETE_NETWORK}" == "true" ]]; then
-    delete-network
+    delete-network || true  # might fail if there are leaked firewall rules
   fi
 
   # If there are no more remaining master replicas, we should update kubeconfig.
diff --git a/cluster/gke/util.sh b/cluster/gke/util.sh
index 3b3e4245d88..fb6bec52dfa 100755
--- a/cluster/gke/util.sh
+++ b/cluster/gke/util.sh
@@ -387,7 +387,6 @@ function test-teardown() {
       if ! "${GCLOUD}" compute networks delete --project "${PROJECT}" --quiet "${NETWORK}"; then
         echo "Failed to delete network '${NETWORK}'. Listing firewall-rules:"
         "${GCLOUD}" compute firewall-rules --project "${PROJECT}" list --filter="network=${NETWORK}"
-        return 1
       fi
     fi
   fi