From 063725230d3e44a90a89abf861a2f3502c5b4bb4 Mon Sep 17 00:00:00 2001 From: Peter Hornyack Date: Tue, 12 Feb 2019 14:33:59 -0800 Subject: [PATCH] Delete RDP firewall rule during kube-down. This rule is only created if the cluster has one or more Windows nodes, but delete-firewall-rules() ignores firewall rule arguments that do not exist so it's safe to always attempt to delete this rule. --- cluster/gce/util.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index ab93b90e2bc..7603ef93f1a 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -2247,6 +2247,7 @@ function delete-all-firewall-rules() { fi } +# Ignores firewall rule arguments that do not exist in NETWORK_PROJECT. function delete-firewall-rules() { for fw in $@; do if [[ -n $(gcloud compute firewall-rules --project "${NETWORK_PROJECT}" describe "${fw}" --format='value(name)' 2>/dev/null || true) ]]; then @@ -3139,6 +3140,7 @@ function kube-down() { "${CLUSTER_NAME}-default-internal-master" \ "${CLUSTER_NAME}-default-internal-node" \ "${NETWORK}-default-ssh" \ + "${NETWORK}-default-rdp" \ "${NETWORK}-default-internal" # Pre-1.5 clusters if [[ "${KUBE_DELETE_NETWORK}" == "true" ]]; then