Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Firewall allow creating unique names #1

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
+60 −15
Open

Firewall allow creating unique names #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e97cc20
feat(private-cluster): add a possibility for having unique fw names
adutchak Jan 22, 2024
c0bacd8
feat(private-cluster): add a possibility for having unique fw names
adutchak Jan 22, 2024
a6c4177
feat(private-cluster): add a possibility for having unique fw names
adutchak Jan 22, 2024
386a645
feat(private-cluster): add a possibility for having unique fw names
adutchak Jan 22, 2024
2fd8c15
feat(betaa-public-cluster): add a possibility for having unique fw names
adutchak Jan 24, 2024
071b203
feat(betaa-public-cluster): add a possibility for having unique fw names
adutchak Jan 24, 2024
3c6b17f
feat(betaa-public-cluster): add a possibility for having unique fw names
adutchak Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 25 additions & 8 deletions modules/beta-public-cluster/firewall.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,26 @@
Required for clusters when VPCs enforce
a default-deny egress rule
*****************************************/

locals {
rule_name_base = (
var.add_firewall_rule_name_unique_suffix ?
"${substr(var.name, 0, min(31, length(var.name)))}-${random_string.google_compute_firewall_suffix[0].result}" :
substr(var.name, 0, min(36, length(var.name)))
)
}

resource "random_string" "google_compute_firewall_suffix" {
count = var.add_firewall_rule_name_unique_suffix ? 1 : 0
upper = false
lower = true
special = false
length = 4
}

resource "google_compute_firewall" "intra_egress" {
count = var.add_cluster_firewall_rules ? 1 : 0
name = "gke-${substr(var.name, 0, min(36, length(var.name)))}-intra-cluster-egress"
name = "gke-${local.rule_name_base}-intra-cluster-egress"
description = "Managed by terraform gke module: Allow pods to communicate with each other and the master"
project = local.network_project_id
network = var.network
Expand Down Expand Up @@ -67,7 +84,7 @@ resource "google_compute_firewall" "intra_egress" {
*****************************************/
resource "google_compute_firewall" "tpu_egress" {
count = var.add_cluster_firewall_rules && var.enable_tpu ? 1 : 0
name = "gke-${substr(var.name, 0, min(36, length(var.name)))}-tpu-egress"
name = "gke-${local.rule_name_base}-tpu-egress"
description = "Managed by terraform gke module: Allow pods to communicate with TPUs"
project = local.network_project_id
network = var.network
Expand Down Expand Up @@ -99,7 +116,7 @@ resource "google_compute_firewall" "tpu_egress" {
*****************************************/
resource "google_compute_firewall" "master_webhooks" {
count = var.add_cluster_firewall_rules || var.add_master_webhook_firewall_rules ? 1 : 0
name = "gke-${substr(var.name, 0, min(36, length(var.name)))}-webhooks"
name = "gke-${local.rule_name_base}-webhooks"
description = "Managed by terraform gke module: Allow master to hit pods for admission controllers/webhooks"
project = local.network_project_id
network = var.network
Expand Down Expand Up @@ -129,7 +146,7 @@ resource "google_compute_firewall" "master_webhooks" {
resource "google_compute_firewall" "shadow_allow_pods" {
count = var.add_shadow_firewall_rules ? 1 : 0

name = "gke-shadow-${substr(var.name, 0, min(36, length(var.name)))}-all"
name = "gke-shadow-${local.rule_name_base}-all"
description = "Managed by terraform gke module: A shadow firewall rule to match the default rule allowing pod communication."
project = local.network_project_id
network = var.network
Expand Down Expand Up @@ -158,7 +175,7 @@ resource "google_compute_firewall" "shadow_allow_pods" {
resource "google_compute_firewall" "shadow_allow_master" {
count = var.add_shadow_firewall_rules ? 1 : 0

name = "gke-shadow-${substr(var.name, 0, min(36, length(var.name)))}-master"
name = "gke-shadow-${local.rule_name_base}-master"
description = "Managed by terraform GKE module: A shadow firewall rule to match the default rule allowing worker nodes communication."
project = local.network_project_id
network = var.network
Expand All @@ -184,7 +201,7 @@ resource "google_compute_firewall" "shadow_allow_master" {
resource "google_compute_firewall" "shadow_allow_nodes" {
count = var.add_shadow_firewall_rules ? 1 : 0

name = "gke-shadow-${substr(var.name, 0, min(36, length(var.name)))}-vms"
name = "gke-shadow-${local.rule_name_base}-vms"
description = "Managed by Terraform GKE module: A shadow firewall rule to match the default rule allowing worker nodes communication."
project = local.network_project_id
network = var.network
Expand Down Expand Up @@ -219,7 +236,7 @@ resource "google_compute_firewall" "shadow_allow_nodes" {
resource "google_compute_firewall" "shadow_allow_inkubelet" {
count = var.add_shadow_firewall_rules ? 1 : 0

name = "gke-shadow-${substr(var.name, 0, min(36, length(var.name)))}-inkubelet"
name = "gke-shadow-${local.rule_name_base}-inkubelet"
description = "Managed by terraform GKE module: A shadow firewall rule to match the default rule allowing worker nodes & pods communication to kubelet."
project = local.network_project_id
network = var.network
Expand All @@ -246,7 +263,7 @@ resource "google_compute_firewall" "shadow_allow_inkubelet" {
resource "google_compute_firewall" "shadow_deny_exkubelet" {
count = var.add_shadow_firewall_rules ? 1 : 0

name = "gke-shadow-${substr(var.name, 0, min(36, length(var.name)))}-exkubelet"
name = "gke-shadow-${local.rule_name_base}-exkubelet"
description = "Managed by terraform GKE module: A shadow firewall rule to match the default deny rule to kubelet."
project = local.network_project_id
network = var.network
Expand Down
6 changes: 6 additions & 0 deletions modules/beta-public-cluster/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,3 +780,9 @@ variable "enable_gcfs" {
description = "Enable image streaming on cluster level."
default = false
}

variable "add_firewall_rule_name_unique_suffix" {
type = bool
description = "Create additional firewall rule unique suffix"
default = false
}
30 changes: 23 additions & 7 deletions modules/private-cluster/firewall.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,25 @@
Required for clusters when VPCs enforce
a default-deny egress rule
*****************************************/
locals {
rule_name_base = (
var.add_firewall_rule_name_unique_suffix ?
"${substr(var.name, 0, min(31, length(var.name)))}-${random_string.google_compute_firewall_suffix[0].result}" :
substr(var.name, 0, min(36, length(var.name)))
)
}

resource "random_string" "google_compute_firewall_suffix" {
count = var.add_firewall_rule_name_unique_suffix ? 1 : 0
upper = false
lower = true
special = false
length = 4
}

resource "google_compute_firewall" "intra_egress" {
count = var.add_cluster_firewall_rules ? 1 : 0
name = "gke-${substr(var.name, 0, min(36, length(var.name)))}-intra-cluster-egress"
name = "gke-${local.rule_name_base}-intra-cluster-egress"
description = "Managed by terraform gke module: Allow pods to communicate with each other and the master"
project = local.network_project_id
network = var.network
Expand Down Expand Up @@ -60,7 +76,7 @@ resource "google_compute_firewall" "intra_egress" {
*****************************************/
resource "google_compute_firewall" "master_webhooks" {
count = var.add_cluster_firewall_rules || var.add_master_webhook_firewall_rules ? 1 : 0
name = "gke-${substr(var.name, 0, min(36, length(var.name)))}-webhooks"
name = "gke-${local.rule_name_base}-webhooks"
description = "Managed by terraform gke module: Allow master to hit pods for admission controllers/webhooks"
project = local.network_project_id
network = var.network
Expand All @@ -87,7 +103,7 @@ resource "google_compute_firewall" "master_webhooks" {
resource "google_compute_firewall" "shadow_allow_pods" {
count = var.add_shadow_firewall_rules ? 1 : 0

name = "gke-shadow-${substr(var.name, 0, min(36, length(var.name)))}-all"
name = "gke-shadow-${local.rule_name_base}-all"
description = "Managed by terraform gke module: A shadow firewall rule to match the default rule allowing pod communication."
project = local.network_project_id
network = var.network
Expand Down Expand Up @@ -116,7 +132,7 @@ resource "google_compute_firewall" "shadow_allow_pods" {
resource "google_compute_firewall" "shadow_allow_master" {
count = var.add_shadow_firewall_rules ? 1 : 0

name = "gke-shadow-${substr(var.name, 0, min(36, length(var.name)))}-master"
name = "gke-shadow-${local.rule_name_base}-master"
description = "Managed by terraform GKE module: A shadow firewall rule to match the default rule allowing worker nodes communication."
project = local.network_project_id
network = var.network
Expand All @@ -142,7 +158,7 @@ resource "google_compute_firewall" "shadow_allow_master" {
resource "google_compute_firewall" "shadow_allow_nodes" {
count = var.add_shadow_firewall_rules ? 1 : 0

name = "gke-shadow-${substr(var.name, 0, min(36, length(var.name)))}-vms"
name = "gke-shadow-${local.rule_name_base}-vms"
description = "Managed by Terraform GKE module: A shadow firewall rule to match the default rule allowing worker nodes communication."
project = local.network_project_id
network = var.network
Expand Down Expand Up @@ -177,7 +193,7 @@ resource "google_compute_firewall" "shadow_allow_nodes" {
resource "google_compute_firewall" "shadow_allow_inkubelet" {
count = var.add_shadow_firewall_rules ? 1 : 0

name = "gke-shadow-${substr(var.name, 0, min(36, length(var.name)))}-inkubelet"
name = "gke-shadow-${local.rule_name_base}-inkubelet"
description = "Managed by terraform GKE module: A shadow firewall rule to match the default rule allowing worker nodes & pods communication to kubelet."
project = local.network_project_id
network = var.network
Expand All @@ -204,7 +220,7 @@ resource "google_compute_firewall" "shadow_allow_inkubelet" {
resource "google_compute_firewall" "shadow_deny_exkubelet" {
count = var.add_shadow_firewall_rules ? 1 : 0

name = "gke-shadow-${substr(var.name, 0, min(36, length(var.name)))}-exkubelet"
name = "gke-shadow-${local.rule_name_base}-exkubelet"
description = "Managed by terraform GKE module: A shadow firewall rule to match the default deny rule to kubelet."
project = local.network_project_id
network = var.network
Expand Down
6 changes: 6 additions & 0 deletions modules/private-cluster/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,12 @@ variable "add_master_webhook_firewall_rules" {
default = false
}

variable "add_firewall_rule_name_unique_suffix" {
type = bool
description = "Create additional firewall rule unique suffix"
default = false
}

variable "firewall_priority" {
type = number
description = "Priority rule for firewall rules"
Expand Down