feat: Add enable_l4_ilb_subsetting for autopilot clusters (#1969)

kliu47 · apeabody · web-flow · commit c48dc6eb00f4 · 2024-06-20T11:59:29.000-07:00
Co-authored-by: Andrew Peabody &lt;andrewpeabody@google.com&gt;
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -235,9 +235,9 @@ resource "google_container_cluster" "primary" {
     }
   }
   {% endif %}
+  {% endif %}
 
   enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting
-  {% endif %}
 {% if beta_cluster %}
   enable_fqdn_network_policy = var.enable_fqdn_network_policy
 {% endif %}
diff --git a/autogen/main/variables.tf.tmpl b/autogen/main/variables.tf.tmpl
@@ -810,12 +810,12 @@ variable "config_connector" {
   default     = false
 }
 
+{% endif %}
 variable "enable_l4_ilb_subsetting" {
   type        = bool
   description = "Enable L4 ILB Subsetting on the cluster"
   default     = false
 }
-{% endif %}
 {% if beta_cluster %}
   {% if autopilot_cluster != true %}
 
diff --git a/examples/simple_autopilot_public/main.tf b/examples/simple_autopilot_public/main.tf
@@ -48,4 +48,5 @@ module "gke" {
   enable_vertical_pod_autoscaling = true
   network_tags                    = [local.cluster_type]
   deletion_protection             = false
+  enable_l4_ilb_subsetting        = true
 }
diff --git a/modules/beta-autopilot-private-cluster/README.md b/modules/beta-autopilot-private-cluster/README.md
@@ -91,6 +91,7 @@ Then perform the following commands on the root folder:
 | enable\_confidential\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |
 | enable\_cost\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |
 | enable\_fqdn\_network\_policy | Enable FQDN Network Policies on the cluster | `bool` | `null` | no |
+| enable\_l4\_ilb\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |
 | enable\_network\_egress\_export | Whether to enable network egress metering for this cluster. If enabled, a daemonset will be created in the cluster to meter network egress traffic. | `bool` | `false` | no |
 | enable\_private\_endpoint | Whether the master's internal IP address is used as the cluster endpoint | `bool` | `false` | no |
 | enable\_private\_nodes | Whether nodes have internal IP addresses only | `bool` | `false` | no |
diff --git a/modules/beta-autopilot-private-cluster/cluster.tf b/modules/beta-autopilot-private-cluster/cluster.tf
@@ -84,6 +84,8 @@ resource "google_container_cluster" "primary" {
   vertical_pod_autoscaling {
     enabled = var.enable_vertical_pod_autoscaling
   }
+
+  enable_l4_ilb_subsetting   = var.enable_l4_ilb_subsetting
   enable_fqdn_network_policy = var.enable_fqdn_network_policy
   enable_autopilot           = true
   dynamic "master_authorized_networks_config" {
diff --git a/modules/beta-autopilot-private-cluster/variables.tf b/modules/beta-autopilot-private-cluster/variables.tf
@@ -456,6 +456,11 @@ variable "timeouts" {
   }
 }
 
+variable "enable_l4_ilb_subsetting" {
+  type        = bool
+  description = "Enable L4 ILB Subsetting on the cluster"
+  default     = false
+}
 variable "allow_net_admin" {
   description = "(Optional) Enable NET_ADMIN for the cluster."
   type        = bool
diff --git a/modules/beta-autopilot-public-cluster/README.md b/modules/beta-autopilot-public-cluster/README.md
@@ -84,6 +84,7 @@ Then perform the following commands on the root folder:
 | enable\_confidential\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |
 | enable\_cost\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |
 | enable\_fqdn\_network\_policy | Enable FQDN Network Policies on the cluster | `bool` | `null` | no |
+| enable\_l4\_ilb\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |
 | enable\_network\_egress\_export | Whether to enable network egress metering for this cluster. If enabled, a daemonset will be created in the cluster to meter network egress traffic. | `bool` | `false` | no |
 | enable\_resource\_consumption\_export | Whether to enable resource consumption metering on this cluster. When enabled, a table will be created in the resource export BigQuery dataset to store resource consumption data. The resulting table can be joined with the resource usage table or with BigQuery billing export. | `bool` | `true` | no |
 | enable\_tpu | Enable Cloud TPU resources in the cluster. WARNING: changing this after cluster creation is destructive! | `bool` | `false` | no |
diff --git a/modules/beta-autopilot-public-cluster/cluster.tf b/modules/beta-autopilot-public-cluster/cluster.tf
@@ -84,6 +84,8 @@ resource "google_container_cluster" "primary" {
   vertical_pod_autoscaling {
     enabled = var.enable_vertical_pod_autoscaling
   }
+
+  enable_l4_ilb_subsetting   = var.enable_l4_ilb_subsetting
   enable_fqdn_network_policy = var.enable_fqdn_network_policy
   enable_autopilot           = true
   dynamic "master_authorized_networks_config" {
diff --git a/modules/beta-autopilot-public-cluster/variables.tf b/modules/beta-autopilot-public-cluster/variables.tf
@@ -426,6 +426,11 @@ variable "timeouts" {
   }
 }
 
+variable "enable_l4_ilb_subsetting" {
+  type        = bool
+  description = "Enable L4 ILB Subsetting on the cluster"
+  default     = false
+}
 variable "allow_net_admin" {
   description = "(Optional) Enable NET_ADMIN for the cluster."
   type        = bool

Original file line number	Diff line number	Diff line change
`@@ -235,9 +235,9 @@ resource "google_container_cluster" "primary" {`
`235`	`235`	`}`
`236`	`236`	`}`
`237`	`237`	`{% endif %}`
	`238`	`+ {% endif %}`
`238`	`239`
`239`	`240`	`enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting`
`240`		`- {% endif %}`
`241`	`241`	`{% if beta_cluster %}`
`242`	`242`	`enable_fqdn_network_policy = var.enable_fqdn_network_policy`
`243`	`243`	`{% endif %}`
Original file line number	Diff line number	Diff line change
`@@ -810,12 +810,12 @@ variable "config_connector" {`
`810`	`810`	`default = false`
`811`	`811`	`}`
`812`	`812`
	`813`	`+{% endif %}`
`813`	`814`	`variable "enable_l4_ilb_subsetting" {`
`814`	`815`	`type = bool`
`815`	`816`	`description = "Enable L4 ILB Subsetting on the cluster"`
`816`	`817`	`default = false`
`817`	`818`	`}`
`818`		`-{% endif %}`
`819`	`819`	`{% if beta_cluster %}`
`820`	`820`	`{% if autopilot_cluster != true %}`
`821`	`821`
Original file line number	Diff line number	Diff line change
`@@ -48,4 +48,5 @@ module "gke" {`
`48`	`48`	`enable_vertical_pod_autoscaling = true`
`49`	`49`	`network_tags = [local.cluster_type]`
`50`	`50`	`deletion_protection = false`
	`51`	`+ enable_l4_ilb_subsetting = true`
`51`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,8 @@ resource "google_container_cluster" "primary" {`
`84`	`84`	`vertical_pod_autoscaling {`
`85`	`85`	`enabled = var.enable_vertical_pod_autoscaling`
`86`	`86`	`}`
	`87`	`+`
	`88`	`+ enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting`
`87`	`89`	`enable_fqdn_network_policy = var.enable_fqdn_network_policy`
`88`	`90`	`enable_autopilot = true`
`89`	`91`	`dynamic "master_authorized_networks_config" {`
Original file line number	Diff line number	Diff line change
`@@ -456,6 +456,11 @@ variable "timeouts" {`
`456`	`456`	`}`
`457`	`457`	`}`
`458`	`458`
	`459`	`+variable "enable_l4_ilb_subsetting" {`
	`460`	`+ type = bool`
	`461`	`+ description = "Enable L4 ILB Subsetting on the cluster"`
	`462`	`+ default = false`
	`463`	`+}`
`459`	`464`	`variable "allow_net_admin" {`
`460`	`465`	`description = "(Optional) Enable NET_ADMIN for the cluster."`
`461`	`466`	`type = bool`
Original file line number	Diff line number	Diff line change
`@@ -426,6 +426,11 @@ variable "timeouts" {`
`426`	`426`	`}`
`427`	`427`	`}`
`428`	`428`
	`429`	`+variable "enable_l4_ilb_subsetting" {`
	`430`	`+ type = bool`
	`431`	`+ description = "Enable L4 ILB Subsetting on the cluster"`
	`432`	`+ default = false`
	`433`	`+}`
`429`	`434`	`variable "allow_net_admin" {`
`430`	`435`	`description = "(Optional) Enable NET_ADMIN for the cluster."`
`431`	`436`	`type = bool`