Merge pull request kubernetes#34750 from ixdy/cleanup-network

Don't fail teardown if we can't delete the network
davidopp · Oct 13, 2016 · 92ef912 · 92ef912
2 parents a474b2b + 6b65d4a
commit 92ef912
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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