From d92cf4df5edd65f5234e83228c3c1f921ceae968 Mon Sep 17 00:00:00 2001 From: "Madhusudan.C.S" Date: Mon, 12 Dec 2016 10:58:29 -0800 Subject: [PATCH] Use the cluster name in the names of the firewall rules that allow cluster-internal traffic to disambiguate the rules belonging to different clusters. --- cluster/gce/util.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index 5a0c6ad5339..a72797cee52 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}-default-internal-master" &>/dev/null; then - gcloud compute firewall-rules create "${NETWORK}-default-internal-master" \ + 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" \ --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}-default-internal-node" &>/dev/null; then - gcloud compute firewall-rules create "${NETWORK}-default-internal-node" \ + 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" \ --project "${PROJECT}" \ --network "${NETWORK}" \ --source-ranges "10.0.0.0/8" \