Skip to content

Commit 7531f90

Browse files
Jberlinskybharathkkb
Jberlinsky
and
bharathkkb
authored
feat!: Add support for enable_l4_ilb_subsetting flag (#896)
* Add support for enable_l4_ilb_subsetting flag * Fix typo * Bump minimum google-beta provider version * Bump google-provider-beta version in test definitions * Update autogen/main/variables.tf.tmpl Remove unnecessary mention of `enabled` RE: `enable_l4_ilb_subsetting` variable Co-authored-by: Bharath KKB <[email protected]> * Remove unnecessary `enabled` identifier in description Co-authored-by: Bharath KKB <[email protected]>
1 parent 5d48439 commit 7531f90

File tree

30 files changed

+60
-16
lines changed

30 files changed

+60
-16
lines changed

‎autogen/main/cluster.tf.tmpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ resource "google_container_cluster" "primary" {
118118
enabled = pod_security_policy_config.value
119119
}
120120
}
121+
122+
enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting
121123
{% endif %}
122124
dynamic "master_authorized_networks_config" {
123125
for_each = local.master_authorized_networks_config

‎autogen/main/variables.tf.tmpl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -505,6 +505,12 @@ variable "enable_pod_security_policy" {
505505
default = false
506506
}
507507

508+
variable "enable_l4_ilb_subsetting" {
509+
type = bool
510+
description = "Enable L4 ILB Subsetting on the cluster"
511+
default = false
512+
}
513+
508514
variable "sandbox_enabled" {
509515
type = bool
510516
description = "(Beta) Enable GKE Sandbox (Do not forget to set `image_type` = `COS_CONTAINERD` to use it)."

‎autogen/main/versions.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ terraform {
2424
required_providers {
2525
google-beta = {
2626
source = "hashicorp/google-beta"
27-
version = ">= 3.49.0, <4.0.0"
27+
version = ">= 3.63.0, <4.0.0"
2828
}
2929
kubernetes = {
3030
source = "hashicorp/kubernetes"

‎examples/node_pool/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
}
2020

2121
provider "google-beta" {
22-
version = "~> 3.49.0"
22+
version = "~> 3.63.0"
2323
region = var.region
2424
}
2525

‎examples/node_pool_update_variant_beta/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
}
2020

2121
provider "google-beta" {
22-
version = "~> 3.49.0"
22+
version = "~> 3.63.0"
2323
credentials = file(var.credentials_path)
2424
region = var.region
2525
}

‎examples/node_pool_update_variant_public_beta/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
}
2020

2121
provider "google-beta" {
22-
version = "~> 3.49.0"
22+
version = "~> 3.63.0"
2323
credentials = file(var.credentials_path)
2424
region = var.region
2525
}

‎examples/regional_private_node_pool_oauth_scopes/provider.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ provider "google" {
1919
}
2020

2121
provider "google-beta" {
22-
version = "~> 3.49.0"
22+
version = "~> 3.63.0"
2323
}
2424

2525
data "google_client_config" "default" {}

‎examples/safer_cluster/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ provider "google" {
3535
}
3636

3737
provider "google-beta" {
38-
version = "~> 3.49.0"
38+
version = "~> 3.63.0"
3939
}
4040

4141
data "google_client_config" "default" {}

‎examples/safer_cluster_iap_bastion/provider.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ provider "google" {
1919
}
2020

2121
provider "google-beta" {
22-
version = "~> 3.49.0"
22+
version = "~> 3.63.0"
2323
}
2424

2525
data "google_client_config" "default" {}

‎examples/simple_regional_beta/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
}
2020

2121
provider "google-beta" {
22-
version = "~> 3.49.0"
22+
version = "~> 3.63.0"
2323
region = var.region
2424
}
2525

‎examples/simple_regional_private_beta/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ provider "google" {
2424
}
2525

2626
provider "google-beta" {
27-
version = "~> 3.49.0"
27+
version = "~> 3.63.0"
2828
region = var.region
2929
}
3030

‎examples/simple_zonal_with_asm/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
}
2020

2121
provider "google-beta" {
22-
version = "~> 3.49.0"
22+
version = "~> 3.63.0"
2323
region = var.region
2424
}
2525

‎examples/workload_metadata_config/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
}
2020

2121
provider "google-beta" {
22-
version = "~> 3.49.0"
22+
version = "~> 3.63.0"
2323
region = var.region
2424
}
2525

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ Then perform the following commands on the root folder:
180180
| enable\_binary\_authorization | Enable BinAuthZ Admission controller | `bool` | `false` | no |
181181
| enable\_intranode\_visibility | Whether Intra-node visibility is enabled for this cluster. This makes same node pod to pod traffic visible for VPC network | `bool` | `false` | no |
182182
| 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 |
183+
| enable\_l4\_ilb\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |
183184
| 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 |
184185
| enable\_pod\_security\_policy | enabled - Enable the PodSecurityPolicy controller for this cluster. If enabled, pods must be valid under a PodSecurityPolicy to be created. | `bool` | `false` | no |
185186
| enable\_private\_endpoint | (Beta) Whether the master's internal IP address is used as the cluster endpoint | `bool` | `false` | no |

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ resource "google_container_cluster" "primary" {
104104
enabled = pod_security_policy_config.value
105105
}
106106
}
107+
108+
enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting
107109
dynamic "master_authorized_networks_config" {
108110
for_each = local.master_authorized_networks_config
109111
content {

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,12 @@ variable "enable_pod_security_policy" {
486486
default = false
487487
}
488488

489+
variable "enable_l4_ilb_subsetting" {
490+
type = bool
491+
description = "Enable L4 ILB Subsetting on the cluster"
492+
default = false
493+
}
494+
489495
variable "sandbox_enabled" {
490496
type = bool
491497
description = "(Beta) Enable GKE Sandbox (Do not forget to set `image_type` = `COS_CONTAINERD` to use it)."

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ terraform {
2121
required_providers {
2222
google-beta = {
2323
source = "hashicorp/google-beta"
24-
version = ">= 3.49.0, <4.0.0"
24+
version = ">= 3.63.0, <4.0.0"
2525
}
2626
kubernetes = {
2727
source = "hashicorp/kubernetes"

‎modules/beta-private-cluster/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\_binary\_authorization | Enable BinAuthZ Admission controller | `bool` | `false` | no |
159159
| enable\_intranode\_visibility | Whether Intra-node visibility is enabled for this cluster. This makes same node pod to pod traffic visible for VPC network | `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\_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 |
162163
| enable\_pod\_security\_policy | enabled - Enable the PodSecurityPolicy controller for this cluster. If enabled, pods must be valid under a PodSecurityPolicy to be created. | `bool` | `false` | no |
163164
| enable\_private\_endpoint | (Beta) Whether the master's internal IP address is used as the cluster endpoint | `bool` | `false` | no |

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ resource "google_container_cluster" "primary" {
104104
enabled = pod_security_policy_config.value
105105
}
106106
}
107+
108+
enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting
107109
dynamic "master_authorized_networks_config" {
108110
for_each = local.master_authorized_networks_config
109111
content {

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,12 @@ variable "enable_pod_security_policy" {
486486
default = false
487487
}
488488

489+
variable "enable_l4_ilb_subsetting" {
490+
type = bool
491+
description = "Enable L4 ILB Subsetting on the cluster"
492+
default = false
493+
}
494+
489495
variable "sandbox_enabled" {
490496
type = bool
491497
description = "(Beta) Enable GKE Sandbox (Do not forget to set `image_type` = `COS_CONTAINERD` to use it)."

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ terraform {
2121
required_providers {
2222
google-beta = {
2323
source = "hashicorp/google-beta"
24-
version = ">= 3.49.0, <4.0.0"
24+
version = ">= 3.63.0, <4.0.0"
2525
}
2626
kubernetes = {
2727
source = "hashicorp/kubernetes"

‎modules/beta-public-cluster-update-variant/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ Then perform the following commands on the root folder:
173173
| enable\_binary\_authorization | Enable BinAuthZ Admission controller | `bool` | `false` | no |
174174
| enable\_intranode\_visibility | Whether Intra-node visibility is enabled for this cluster. This makes same node pod to pod traffic visible for VPC network | `bool` | `false` | no |
175175
| 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 |
176+
| enable\_l4\_ilb\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |
176177
| 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 |
177178
| enable\_pod\_security\_policy | enabled - Enable the PodSecurityPolicy controller for this cluster. If enabled, pods must be valid under a PodSecurityPolicy to be created. | `bool` | `false` | no |
178179
| 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 |

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ resource "google_container_cluster" "primary" {
104104
enabled = pod_security_policy_config.value
105105
}
106106
}
107+
108+
enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting
107109
dynamic "master_authorized_networks_config" {
108110
for_each = local.master_authorized_networks_config
109111
content {

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,12 @@ variable "enable_pod_security_policy" {
455455
default = false
456456
}
457457

458+
variable "enable_l4_ilb_subsetting" {
459+
type = bool
460+
description = "Enable L4 ILB Subsetting on the cluster"
461+
default = false
462+
}
463+
458464
variable "sandbox_enabled" {
459465
type = bool
460466
description = "(Beta) Enable GKE Sandbox (Do not forget to set `image_type` = `COS_CONTAINERD` to use it)."

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ terraform {
2121
required_providers {
2222
google-beta = {
2323
source = "hashicorp/google-beta"
24-
version = ">= 3.49.0, <4.0.0"
24+
version = ">= 3.63.0, <4.0.0"
2525
}
2626
kubernetes = {
2727
source = "hashicorp/kubernetes"

‎modules/beta-public-cluster/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ Then perform the following commands on the root folder:
151151
| enable\_binary\_authorization | Enable BinAuthZ Admission controller | `bool` | `false` | no |
152152
| enable\_intranode\_visibility | Whether Intra-node visibility is enabled for this cluster. This makes same node pod to pod traffic visible for VPC network | `bool` | `false` | no |
153153
| 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 |
154+
| enable\_l4\_ilb\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |
154155
| 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 |
155156
| enable\_pod\_security\_policy | enabled - Enable the PodSecurityPolicy controller for this cluster. If enabled, pods must be valid under a PodSecurityPolicy to be created. | `bool` | `false` | no |
156157
| 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 |

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ resource "google_container_cluster" "primary" {
104104
enabled = pod_security_policy_config.value
105105
}
106106
}
107+
108+
enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting
107109
dynamic "master_authorized_networks_config" {
108110
for_each = local.master_authorized_networks_config
109111
content {

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,12 @@ variable "enable_pod_security_policy" {
455455
default = false
456456
}
457457

458+
variable "enable_l4_ilb_subsetting" {
459+
type = bool
460+
description = "Enable L4 ILB Subsetting on the cluster"
461+
default = false
462+
}
463+
458464
variable "sandbox_enabled" {
459465
type = bool
460466
description = "(Beta) Enable GKE Sandbox (Do not forget to set `image_type` = `COS_CONTAINERD` to use it)."

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ terraform {
2121
required_providers {
2222
google-beta = {
2323
source = "hashicorp/google-beta"
24-
version = ">= 3.49.0, <4.0.0"
24+
version = ">= 3.63.0, <4.0.0"
2525
}
2626
kubernetes = {
2727
source = "hashicorp/kubernetes"

‎test/bundle.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ providers {
88
source = "hashicorp/google"
99
}
1010
google-beta = {
11-
version = "~> 3.49.0"
11+
version = "~> 3.63.0"
1212
source = "hashicorp/google-beta"
1313
}
1414
external = {

0 commit comments

Comments
 (0)