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

Merge pull request #34750 from ixdy/cleanup-network

Browse Source 
Don't fail teardown if we can't delete the network
This commit is contained in:
Matt Liggett
2016-10-13 13:29:38 -07:00
committed by GitHub
parent a474b2b9a0 6b65d4a390
commit 92ef912f64
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/util.sh
View File

@@ -1362,7 +1362,7 @@ function kube-down() {
"${NETWORK}-default-ssh" \ "${NETWORK}-default-ssh" \
"${NETWORK}-default-internal" # Pre-1.5 clusters "${NETWORK}-default-internal" # Pre-1.5 clusters
if [[ "${KUBE_DELETE_NETWORK}" == "true" ]]; then if [[ "${KUBE_DELETE_NETWORK}" == "true" ]]; then
delete-network delete-network || true # might fail if there are leaked firewall rules
fi fi
# If there are no more remaining master replicas, we should update kubeconfig. # If there are no more remaining master replicas, we should update kubeconfig.

1
cluster/gke/util.sh
View File

@@ -387,7 +387,6 @@ function test-teardown() {
if ! "${GCLOUD}" compute networks delete --project "${PROJECT}" --quiet "${NETWORK}"; then if ! "${GCLOUD}" compute networks delete --project "${PROJECT}" --quiet "${NETWORK}"; then
echo "Failed to delete network '${NETWORK}'. Listing firewall-rules:" echo "Failed to delete network '${NETWORK}'. Listing firewall-rules:"
"${GCLOUD}" compute firewall-rules --project "${PROJECT}" list --filter="network=${NETWORK}" "${GCLOUD}" compute firewall-rules --project "${PROJECT}" list --filter="network=${NETWORK}"
return 1
fi fi
fi fi
fi fi