Merge pull request #112203 from azylinski/fix-teardown-delete-all

Fix Flake: On TearDown script, delete all firewall-rules with a single gcloud run
This commit is contained in:
Kubernetes Prow Robot 2022-09-12 03:17:25 -07:00 committed by GitHub
commit bf350ac4c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2576,11 +2576,13 @@ function create-cloud-nat-router() {
}
function delete-all-firewall-rules() {
if fws=$(gcloud compute firewall-rules list --project "${NETWORK_PROJECT}" --filter="network=${NETWORK}" --format="value(name)"); then
echo "Deleting firewall rules remaining in network ${NETWORK}: ${fws}"
delete-firewall-rules "$fws"
local -a fws
kube::util::read-array fws < <(gcloud compute firewall-rules list --project "${NETWORK_PROJECT}" --filter="network=${NETWORK}" --format="value(name)")
if (( "${#fws[@]}" > 0 )); then
echo "Deleting firewall rules remaining in network ${NETWORK}: ${fws[*]}"
delete-firewall-rules "${fws[@]}"
else
echo "Failed to list firewall rules from the network ${NETWORK}"
echo "No firewall rules in network ${NETWORK}"
fi
}