Skip to content

Commit da0476a

Browse files
apeabodyapeabody
authored
feat: add enable_l4_ilb_subsetting for GA TPG (#1924)
1 parent e711adb commit da0476a

File tree

15 files changed

+58
-31
lines changed

15 files changed

+58
-31
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ Then perform the following commands on the root folder:
158158
| enable\_confidential\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |
159159
| 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 |
160160
| enable\_kubernetes\_alpha | Whether to enable Kubernetes Alpha features for this cluster. Note that when this option is enabled, the cluster cannot be upgraded and will be automatically deleted after 30 days. | `bool` | `false` | no |
161+
| enable\_l4\_ilb\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |
161162
| enable\_mesh\_certificates | Controls the issuance of workload mTLS certificates. When enabled the GKE Workload Identity Certificates controller and node agent will be deployed in the cluster. Requires Workload Identity. | `bool` | `false` | no |
162163
| 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 |
163164
| 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 |

‎autogen/main/cluster.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,10 @@ resource "google_container_cluster" "primary" {
206206
enabled = identity_service_config.value
207207
}
208208
}
209+
{% endif %}
209210

210211
enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting
211212
{% endif %}
212-
{% endif %}
213213
{% if beta_cluster %}
214214
enable_fqdn_network_policy = var.enable_fqdn_network_policy
215215
{% endif %}

‎autogen/main/variables.tf.tmpl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -782,6 +782,12 @@ variable "config_connector" {
782782
description = "Whether ConfigConnector is enabled for this cluster."
783783
default = false
784784
}
785+
786+
variable "enable_l4_ilb_subsetting" {
787+
type = bool
788+
description = "Enable L4 ILB Subsetting on the cluster"
789+
default = false
790+
}
785791
{% endif %}
786792
{% if beta_cluster %}
787793
{% if autopilot_cluster != true %}
@@ -822,12 +828,6 @@ variable "enable_pod_security_policy" {
822828
default = false
823829
}
824830

825-
variable "enable_l4_ilb_subsetting" {
826-
type = bool
827-
description = "Enable L4 ILB Subsetting on the cluster"
828-
default = false
829-
}
830-
831831
variable "sandbox_enabled" {
832832
type = bool
833833
description = "(Beta) Enable GKE Sandbox (Do not forget to set `image_type` = `COS_CONTAINERD` to use it)."

‎cluster.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ resource "google_container_cluster" "primary" {
147147

148148
enable_kubernetes_alpha = var.enable_kubernetes_alpha
149149
enable_tpu = var.enable_tpu
150+
151+
enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting
150152
dynamic "master_authorized_networks_config" {
151153
for_each = local.master_authorized_networks_config
152154
content {

‎modules/beta-private-cluster-update-variant/variables.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -752,6 +752,12 @@ variable "config_connector" {
752752
default = false
753753
}
754754

755+
variable "enable_l4_ilb_subsetting" {
756+
type = bool
757+
description = "Enable L4 ILB Subsetting on the cluster"
758+
default = false
759+
}
760+
755761
variable "istio" {
756762
description = "(Beta) Enable Istio addon"
757763
type = bool
@@ -788,12 +794,6 @@ variable "enable_pod_security_policy" {
788794
default = false
789795
}
790796

791-
variable "enable_l4_ilb_subsetting" {
792-
type = bool
793-
description = "Enable L4 ILB Subsetting on the cluster"
794-
default = false
795-
}
796-
797797
variable "sandbox_enabled" {
798798
type = bool
799799
description = "(Beta) Enable GKE Sandbox (Do not forget to set `image_type` = `COS_CONTAINERD` to use it)."

‎modules/beta-private-cluster/variables.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -752,6 +752,12 @@ variable "config_connector" {
752752
default = false
753753
}
754754

755+
variable "enable_l4_ilb_subsetting" {
756+
type = bool
757+
description = "Enable L4 ILB Subsetting on the cluster"
758+
default = false
759+
}
760+
755761
variable "istio" {
756762
description = "(Beta) Enable Istio addon"
757763
type = bool
@@ -788,12 +794,6 @@ variable "enable_pod_security_policy" {
788794
default = false
789795
}
790796

791-
variable "enable_l4_ilb_subsetting" {
792-
type = bool
793-
description = "Enable L4 ILB Subsetting on the cluster"
794-
default = false
795-
}
796-
797797
variable "sandbox_enabled" {
798798
type = bool
799799
description = "(Beta) Enable GKE Sandbox (Do not forget to set `image_type` = `COS_CONTAINERD` to use it)."

‎modules/beta-public-cluster-update-variant/variables.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -722,6 +722,12 @@ variable "config_connector" {
722722
default = false
723723
}
724724

725+
variable "enable_l4_ilb_subsetting" {
726+
type = bool
727+
description = "Enable L4 ILB Subsetting on the cluster"
728+
default = false
729+
}
730+
725731
variable "istio" {
726732
description = "(Beta) Enable Istio addon"
727733
type = bool
@@ -758,12 +764,6 @@ variable "enable_pod_security_policy" {
758764
default = false
759765
}
760766

761-
variable "enable_l4_ilb_subsetting" {
762-
type = bool
763-
description = "Enable L4 ILB Subsetting on the cluster"
764-
default = false
765-
}
766-
767767
variable "sandbox_enabled" {
768768
type = bool
769769
description = "(Beta) Enable GKE Sandbox (Do not forget to set `image_type` = `COS_CONTAINERD` to use it)."

‎modules/beta-public-cluster/variables.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -722,6 +722,12 @@ variable "config_connector" {
722722
default = false
723723
}
724724

725+
variable "enable_l4_ilb_subsetting" {
726+
type = bool
727+
description = "Enable L4 ILB Subsetting on the cluster"
728+
default = false
729+
}
730+
725731
variable "istio" {
726732
description = "(Beta) Enable Istio addon"
727733
type = bool
@@ -758,12 +764,6 @@ variable "enable_pod_security_policy" {
758764
default = false
759765
}
760766

761-
variable "enable_l4_ilb_subsetting" {
762-
type = bool
763-
description = "Enable L4 ILB Subsetting on the cluster"
764-
default = false
765-
}
766-
767767
variable "sandbox_enabled" {
768768
type = bool
769769
description = "(Beta) Enable GKE Sandbox (Do not forget to set `image_type` = `COS_CONTAINERD` to use it)."

‎modules/private-cluster-update-variant/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ Then perform the following commands on the root folder:
187187
| enable\_confidential\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |
188188
| 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 |
189189
| enable\_kubernetes\_alpha | Whether to enable Kubernetes Alpha features for this cluster. Note that when this option is enabled, the cluster cannot be upgraded and will be automatically deleted after 30 days. | `bool` | `false` | no |
190+
| enable\_l4\_ilb\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |
190191
| enable\_mesh\_certificates | Controls the issuance of workload mTLS certificates. When enabled the GKE Workload Identity Certificates controller and node agent will be deployed in the cluster. Requires Workload Identity. | `bool` | `false` | no |
191192
| 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 |
192193
| enable\_private\_endpoint | (Beta) Whether the master's internal IP address is used as the cluster endpoint | `bool` | `false` | no |

‎modules/private-cluster-update-variant/cluster.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ resource "google_container_cluster" "primary" {
147147

148148
enable_kubernetes_alpha = var.enable_kubernetes_alpha
149149
enable_tpu = var.enable_tpu
150+
151+
enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting
150152
dynamic "master_authorized_networks_config" {
151153
for_each = local.master_authorized_networks_config
152154
content {

‎modules/private-cluster-update-variant/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -728,6 +728,12 @@ variable "config_connector" {
728728
default = false
729729
}
730730

731+
variable "enable_l4_ilb_subsetting" {
732+
type = bool
733+
description = "Enable L4 ILB Subsetting on the cluster"
734+
default = false
735+
}
736+
731737
variable "fleet_project" {
732738
description = "(Optional) Register the cluster with the fleet in this project."
733739
type = string

‎modules/private-cluster/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ Then perform the following commands on the root folder:
165165
| enable\_confidential\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |
166166
| 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 |
167167
| enable\_kubernetes\_alpha | Whether to enable Kubernetes Alpha features for this cluster. Note that when this option is enabled, the cluster cannot be upgraded and will be automatically deleted after 30 days. | `bool` | `false` | no |
168+
| enable\_l4\_ilb\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |
168169
| enable\_mesh\_certificates | Controls the issuance of workload mTLS certificates. When enabled the GKE Workload Identity Certificates controller and node agent will be deployed in the cluster. Requires Workload Identity. | `bool` | `false` | no |
169170
| 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 |
170171
| enable\_private\_endpoint | (Beta) Whether the master's internal IP address is used as the cluster endpoint | `bool` | `false` | no |

‎modules/private-cluster/cluster.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ resource "google_container_cluster" "primary" {
147147

148148
enable_kubernetes_alpha = var.enable_kubernetes_alpha
149149
enable_tpu = var.enable_tpu
150+
151+
enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting
150152
dynamic "master_authorized_networks_config" {
151153
for_each = local.master_authorized_networks_config
152154
content {

‎modules/private-cluster/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -728,6 +728,12 @@ variable "config_connector" {
728728
default = false
729729
}
730730

731+
variable "enable_l4_ilb_subsetting" {
732+
type = bool
733+
description = "Enable L4 ILB Subsetting on the cluster"
734+
default = false
735+
}
736+
731737
variable "fleet_project" {
732738
description = "(Optional) Register the cluster with the fleet in this project."
733739
type = string

‎variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -698,6 +698,12 @@ variable "config_connector" {
698698
default = false
699699
}
700700

701+
variable "enable_l4_ilb_subsetting" {
702+
type = bool
703+
description = "Enable L4 ILB Subsetting on the cluster"
704+
default = false
705+
}
706+
701707
variable "fleet_project" {
702708
description = "(Optional) Register the cluster with the fleet in this project."
703709
type = string

0 commit comments

Comments
 (0)