Skip to content

K
k3s
Commit 17485650 authored by Madhusudan.C.S's avatar Madhusudan.C.S
Browse files
Options

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.
parent d92cf4df
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
cluster/gce/util.sh
View file @ 17485650
...@@ -653,8 +653,8 @@ function create-network() { ...@@ -653,8 +653,8 @@ function create-network() {
gcloud compute networks create --project "${PROJECT}" "${NETWORK}" --range "10.240.0.0/16" gcloud compute networks create --project "${PROJECT}" "${NETWORK}" --range "10.240.0.0/16"
fi fi
if ! gcloud compute firewall-rules --project "${PROJECT}" describe "${NETWORK}-${CLUSTER_NAME}-default-internal-master" &>/dev/null; then if ! gcloud compute firewall-rules --project "${PROJECT}" describe "${CLUSTER_NAME}-default-internal-master" &>/dev/null; then
gcloud compute firewall-rules create "${NETWORK}-${CLUSTER_NAME}-default-internal-master" \ gcloud compute firewall-rules create "${CLUSTER_NAME}-default-internal-master" \
--project "${PROJECT}" \ --project "${PROJECT}" \
--network "${NETWORK}" \ --network "${NETWORK}" \
--source-ranges "10.0.0.0/8" \ --source-ranges "10.0.0.0/8" \
...@@ -662,8 +662,8 @@ function create-network() { ...@@ -662,8 +662,8 @@ function create-network() {
--target-tags "${MASTER_TAG}"& --target-tags "${MASTER_TAG}"&
fi fi
if ! gcloud compute firewall-rules --project "${PROJECT}" describe "${NETWORK}-${CLUSTER_NAME}-default-internal-node" &>/dev/null; then if ! gcloud compute firewall-rules --project "${PROJECT}" describe "${CLUSTER_NAME}-default-internal-node" &>/dev/null; then
gcloud compute firewall-rules create "${NETWORK}-${CLUSTER_NAME}-default-internal-node" \ gcloud compute firewall-rules create "${CLUSTER_NAME}-default-internal-node" \
--project "${PROJECT}" \ --project "${PROJECT}" \
--network "${NETWORK}" \ --network "${NETWORK}" \
--source-ranges "10.0.0.0/8" \ --source-ranges "10.0.0.0/8" \
...@@ -1454,8 +1454,8 @@ function kube-down() { ...@@ -1454,8 +1454,8 @@ function kube-down() {
# Delete all remaining firewall rules and network. # Delete all remaining firewall rules and network.
delete-firewall-rules \ delete-firewall-rules \
"${NETWORK}-default-internal-master" \ "${CLUSTER_NAME}-default-internal-master" \
"${NETWORK}-default-internal-node" \ "${CLUSTER_NAME}-default-internal-node" \
"${NETWORK}-default-ssh" \ "${NETWORK}-default-ssh" \
"${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