Skip to content

K
k3s
Unverified Commit 9fd23b21 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #73980 from pjh/delete-rdp-firewall-rule

Delete RDP firewall rule during kube-down.
parents 2aedcbc7 06372523
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
cluster/gce/util.sh
View file @ 9fd23b21
...@@ -2247,6 +2247,7 @@ function delete-all-firewall-rules() { ...@@ -2247,6 +2247,7 @@ function delete-all-firewall-rules() {
fi fi
} }
# Ignores firewall rule arguments that do not exist in NETWORK_PROJECT.
function delete-firewall-rules() { function delete-firewall-rules() {
for fw in $@; do for fw in $@; do
if [[ -n $(gcloud compute firewall-rules --project "${NETWORK_PROJECT}" describe "${fw}" --format='value(name)' 2>/dev/null || true) ]]; then 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() { ...@@ -3139,6 +3140,7 @@ function kube-down() {
"${CLUSTER_NAME}-default-internal-master" \ "${CLUSTER_NAME}-default-internal-master" \
"${CLUSTER_NAME}-default-internal-node" \ "${CLUSTER_NAME}-default-internal-node" \
"${NETWORK}-default-ssh" \ "${NETWORK}-default-ssh" \
"${NETWORK}-default-rdp" \
"${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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment