From 174856509e021bc4a3b8c95809fb9479306dcbd1 Mon Sep 17 00:00:00 2001 From: "Madhusudan.C.S" Date: Tue, 13 Dec 2016 11:21:14 -0800 Subject: [PATCH] Dropping the network name from the internal master and node firewall rules. Network name was used to disambiguate firewall rules in a given network. However, since two clusters cannot share a name in a GCE project, this sufficiently disambiguates the firewall rule names. A potential confusion arises when someone tries to create a firewall rule with the same name in a different network, but that's also an indication that they shouldn't be doing that. --- cluster/gce/util.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index a72797cee5..dd21dbefaf 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -653,8 +653,8 @@ function create-network() { gcloud compute networks create --project "${PROJECT}" "${NETWORK}" --range "10.240.0.0/16" fi - if ! gcloud compute firewall-rules --project "${PROJECT}" describe "${NETWORK}-${CLUSTER_NAME}-default-internal-master" &>/dev/null; then - gcloud compute firewall-rules create "${NETWORK}-${CLUSTER_NAME}-default-internal-master" \ + if ! gcloud compute firewall-rules --project "${PROJECT}" describe "${CLUSTER_NAME}-default-internal-master" &>/dev/null; then + gcloud compute firewall-rules create "${CLUSTER_NAME}-default-internal-master" \ --project "${PROJECT}" \ --network "${NETWORK}" \ --source-ranges "10.0.0.0/8" \ @@ -662,8 +662,8 @@ function create-network() { --target-tags "${MASTER_TAG}"& fi - if ! gcloud compute firewall-rules --project "${PROJECT}" describe "${NETWORK}-${CLUSTER_NAME}-default-internal-node" &>/dev/null; then - gcloud compute firewall-rules create "${NETWORK}-${CLUSTER_NAME}-default-internal-node" \ + if ! gcloud compute firewall-rules --project "${PROJECT}" describe "${CLUSTER_NAME}-default-internal-node" &>/dev/null; then + gcloud compute firewall-rules create "${CLUSTER_NAME}-default-internal-node" \ --project "${PROJECT}" \ --network "${NETWORK}" \ --source-ranges "10.0.0.0/8" \ @@ -1454,8 +1454,8 @@ function kube-down() { # Delete all remaining firewall rules and network. delete-firewall-rules \ - "${NETWORK}-default-internal-master" \ - "${NETWORK}-default-internal-node" \ + "${CLUSTER_NAME}-default-internal-master" \ + "${CLUSTER_NAME}-default-internal-node" \ "${NETWORK}-default-ssh" \ "${NETWORK}-default-internal" # Pre-1.5 clusters if [[ "${KUBE_DELETE_NETWORK}" == "true" ]]; then