github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Delete RDP firewall rule during kube-down.
This commit is contained in:
Kubernetes Prow Robot 2019-02-12 18:45:35 -08:00 committed by GitHub
commit 9fd23b2178
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/util.sh
View File

@ -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() {
"${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