Skip to content

Commit a91cc48

Browse files
apeabodyapeabody
authored
Merge branch 'main' into nap-cgroup-mode
2 parents b2ab65c + 132a981 commit a91cc48

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+175
-32
lines changed

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ Then perform the following commands on the root folder:
162162
| deletion\_protection | Whether or not to allow Terraform to destroy the cluster. | `bool` | `true` | no |
163163
| description | The description of the cluster | `string` | `""` | no |
164164
| disable\_default\_snat | Whether to disable the default SNAT to support the private use of public IP addresses | `bool` | `false` | no |
165+
| disable\_l4\_lb\_firewall\_reconciliation | Disable L4 Load Balancer firewall reconciliation | `bool` | `null` | no |
165166
| disable\_legacy\_metadata\_endpoints | Disable the /0.1/ and /v1beta1/ metadata server endpoints on the node. Changing this value will cause all node pools to be recreated. | `bool` | `true` | no |
166167
| dns\_allow\_external\_traffic | (Optional) Controls whether external traffic is allowed over the dns endpoint. | `bool` | `null` | no |
167168
| dns\_cache | The status of the NodeLocal DNSCache addon. | `bool` | `false` | no |
@@ -414,7 +415,7 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
414415
#### Terraform and Plugins
415416

416417
- [Terraform](https://www.terraform.io/downloads.html) 1.3+
417-
- [Terraform Provider for GCP][terraform-provider-google] v6.27+
418+
- [Terraform Provider for GCP][terraform-provider-google] v6.28+
418419

419420
#### gcloud
420421

‎autogen/main/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,9 +306,9 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
306306

307307
- [Terraform](https://www.terraform.io/downloads.html) 1.3+
308308
{% if beta_cluster %}
309-
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v6.27+
309+
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v6.28+
310310
{% else %}
311-
- [Terraform Provider for GCP][terraform-provider-google] v6.27+
311+
- [Terraform Provider for GCP][terraform-provider-google] v6.28+
312312
{% endif %}
313313

314314
#### gcloud

‎autogen/main/cluster.tf.tmpl

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

252252
enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting
253253

254+
disable_l4_lb_firewall_reconciliation = var.disable_l4_lb_firewall_reconciliation
255+
254256
enable_cilium_clusterwide_network_policy = var.enable_cilium_clusterwide_network_policy
255257

256258
dynamic "secret_manager_config" {

‎autogen/main/variables.tf.tmpl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -979,6 +979,12 @@ variable "enable_l4_ilb_subsetting" {
979979
description = "Enable L4 ILB Subsetting on the cluster"
980980
default = false
981981
}
982+
983+
variable "disable_l4_lb_firewall_reconciliation" {
984+
type = bool
985+
description = "Disable L4 Load Balancer firewall reconciliation"
986+
default = null
987+
}
982988
{% if beta_cluster %}
983989
{% if autopilot_cluster != true %}
984990

‎autogen/main/versions.tf.tmpl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,33 +24,33 @@ terraform {
2424
required_providers {
2525
google = {
2626
source = "hashicorp/google"
27-
version = ">= 6.27.0, < 7"
27+
version = ">= 6.28.0, < 7"
2828
}
2929
google-beta = {
3030
source = "hashicorp/google-beta"
31-
version = ">= 6.27.0, < 7"
31+
version = ">= 6.28.0, < 7"
3232
}
3333
{% elif beta_cluster and autopilot_cluster %}
3434
required_providers {
3535
google = {
3636
source = "hashicorp/google"
37-
version = ">= 6.27.0, < 7"
37+
version = ">= 6.28.0, < 7"
3838
}
3939
google-beta = {
4040
source = "hashicorp/google-beta"
41-
version = ">= 6.27.0, < 7"
41+
version = ">= 6.28.0, < 7"
4242
}
4343
{% elif autopilot_cluster %}
4444
required_providers {
4545
google = {
4646
source = "hashicorp/google"
47-
version = ">= 6.27.0, < 7"
47+
version = ">= 6.28.0, < 7"
4848
}
4949
{% else %}
5050
required_providers {
5151
google = {
5252
source = "hashicorp/google"
53-
version = ">= 6.27.0, < 7"
53+
version = ">= 6.28.0, < 7"
5454
}
5555
{% endif %}
5656
kubernetes = {

‎cluster.tf

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

191191
enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting
192192

193+
disable_l4_lb_firewall_reconciliation = var.disable_l4_lb_firewall_reconciliation
194+
193195
enable_cilium_clusterwide_network_policy = var.enable_cilium_clusterwide_network_policy
194196

195197
dynamic "secret_manager_config" {

‎metadata.display.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,9 @@ spec:
9393
disable_default_snat:
9494
name: disable_default_snat
9595
title: Disable Default Snat
96+
disable_l4_lb_firewall_reconciliation:
97+
name: disable_l4_lb_firewall_reconciliation
98+
title: Disable L4 Lb Firewall Reconciliation
9699
disable_legacy_metadata_endpoints:
97100
name: disable_legacy_metadata_endpoints
98101
title: Disable Legacy Metadata Endpoints

‎metadata.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -689,6 +689,9 @@ spec:
689689
description: Enable L4 ILB Subsetting on the cluster
690690
varType: bool
691691
defaultValue: false
692+
- name: disable_l4_lb_firewall_reconciliation
693+
description: Disable L4 Load Balancer firewall reconciliation
694+
varType: bool
692695
- name: enable_identity_service
693696
description: (Optional) Enable the Identity Service component, which allows customers to use external identity providers with the K8S API.
694697
varType: bool

‎modules/beta-autopilot-private-cluster/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ Then perform the following commands on the root folder:
9090
| deploy\_using\_private\_endpoint | A toggle for Terraform and kubectl to connect to the master's internal IP address during deployment. | `bool` | `false` | no |
9191
| description | The description of the cluster | `string` | `""` | no |
9292
| disable\_default\_snat | Whether to disable the default SNAT to support the private use of public IP addresses | `bool` | `false` | no |
93+
| disable\_l4\_lb\_firewall\_reconciliation | Disable L4 Load Balancer firewall reconciliation | `bool` | `null` | no |
9394
| dns\_allow\_external\_traffic | (Optional) Controls whether external traffic is allowed over the dns endpoint. | `bool` | `null` | no |
9495
| dns\_cache | The status of the NodeLocal DNSCache addon. | `bool` | `true` | no |
9596
| enable\_binary\_authorization | Enable BinAuthZ Admission controller | `bool` | `false` | no |
@@ -227,7 +228,7 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
227228
#### Terraform and Plugins
228229

229230
- [Terraform](https://www.terraform.io/downloads.html) 1.3+
230-
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v6.27+
231+
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v6.28+
231232

232233
#### gcloud
233234

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

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

111111
enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting
112112

113+
disable_l4_lb_firewall_reconciliation = var.disable_l4_lb_firewall_reconciliation
114+
113115
enable_cilium_clusterwide_network_policy = var.enable_cilium_clusterwide_network_policy
114116

115117
dynamic "secret_manager_config" {

‎modules/beta-autopilot-private-cluster/metadata.display.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ spec:
7676
disable_default_snat:
7777
name: disable_default_snat
7878
title: Disable Default Snat
79+
disable_l4_lb_firewall_reconciliation:
80+
name: disable_l4_lb_firewall_reconciliation
81+
title: Disable L4 Lb Firewall Reconciliation
7982
dns_allow_external_traffic:
8083
name: dns_allow_external_traffic
8184
title: Dns Allow External Traffic

‎modules/beta-autopilot-private-cluster/metadata.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,9 @@ spec:
473473
description: Enable L4 ILB Subsetting on the cluster
474474
varType: bool
475475
defaultValue: false
476+
- name: disable_l4_lb_firewall_reconciliation
477+
description: Disable L4 Load Balancer firewall reconciliation
478+
varType: bool
476479
- name: allow_net_admin
477480
description: (Optional) Enable NET_ADMIN for the cluster.
478481
varType: bool

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -604,6 +604,12 @@ variable "enable_l4_ilb_subsetting" {
604604
default = false
605605
}
606606

607+
variable "disable_l4_lb_firewall_reconciliation" {
608+
type = bool
609+
description = "Disable L4 Load Balancer firewall reconciliation"
610+
default = null
611+
}
612+
607613
variable "allow_net_admin" {
608614
description = "(Optional) Enable NET_ADMIN for the cluster."
609615
type = bool

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ terraform {
2121
required_providers {
2222
google = {
2323
source = "hashicorp/google"
24-
version = ">= 6.27.0, < 7"
24+
version = ">= 6.28.0, < 7"
2525
}
2626
google-beta = {
2727
source = "hashicorp/google-beta"
28-
version = ">= 6.27.0, < 7"
28+
version = ">= 6.28.0, < 7"
2929
}
3030
kubernetes = {
3131
source = "hashicorp/kubernetes"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ Then perform the following commands on the root folder:
8383
| deletion\_protection | Whether or not to allow Terraform to destroy the cluster. | `bool` | `true` | no |
8484
| description | The description of the cluster | `string` | `""` | no |
8585
| disable\_default\_snat | Whether to disable the default SNAT to support the private use of public IP addresses | `bool` | `false` | no |
86+
| disable\_l4\_lb\_firewall\_reconciliation | Disable L4 Load Balancer firewall reconciliation | `bool` | `null` | no |
8687
| dns\_allow\_external\_traffic | (Optional) Controls whether external traffic is allowed over the dns endpoint. | `bool` | `null` | no |
8788
| dns\_cache | The status of the NodeLocal DNSCache addon. | `bool` | `true` | no |
8889
| enable\_binary\_authorization | Enable BinAuthZ Admission controller | `bool` | `false` | no |
@@ -213,7 +214,7 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
213214
#### Terraform and Plugins
214215

215216
- [Terraform](https://www.terraform.io/downloads.html) 1.3+
216-
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v6.27+
217+
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v6.28+
217218

218219
#### gcloud
219220

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

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

111111
enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting
112112

113+
disable_l4_lb_firewall_reconciliation = var.disable_l4_lb_firewall_reconciliation
114+
113115
enable_cilium_clusterwide_network_policy = var.enable_cilium_clusterwide_network_policy
114116

115117
dynamic "secret_manager_config" {

‎modules/beta-autopilot-public-cluster/metadata.display.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ spec:
7373
disable_default_snat:
7474
name: disable_default_snat
7575
title: Disable Default Snat
76+
disable_l4_lb_firewall_reconciliation:
77+
name: disable_l4_lb_firewall_reconciliation
78+
title: Disable L4 Lb Firewall Reconciliation
7679
dns_allow_external_traffic:
7780
name: dns_allow_external_traffic
7881
title: Dns Allow External Traffic

‎modules/beta-autopilot-public-cluster/metadata.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,9 @@ spec:
451451
description: Enable L4 ILB Subsetting on the cluster
452452
varType: bool
453453
defaultValue: false
454+
- name: disable_l4_lb_firewall_reconciliation
455+
description: Disable L4 Load Balancer firewall reconciliation
456+
varType: bool
454457
- name: allow_net_admin
455458
description: (Optional) Enable NET_ADMIN for the cluster.
456459
varType: bool

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -568,6 +568,12 @@ variable "enable_l4_ilb_subsetting" {
568568
default = false
569569
}
570570

571+
variable "disable_l4_lb_firewall_reconciliation" {
572+
type = bool
573+
description = "Disable L4 Load Balancer firewall reconciliation"
574+
default = null
575+
}
576+
571577
variable "allow_net_admin" {
572578
description = "(Optional) Enable NET_ADMIN for the cluster."
573579
type = bool

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ terraform {
2121
required_providers {
2222
google = {
2323
source = "hashicorp/google"
24-
version = ">= 6.27.0, < 7"
24+
version = ">= 6.28.0, < 7"
2525
}
2626
google-beta = {
2727
source = "hashicorp/google-beta"
28-
version = ">= 6.27.0, < 7"
28+
version = ">= 6.28.0, < 7"
2929
}
3030
kubernetes = {
3131
source = "hashicorp/kubernetes"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ Then perform the following commands on the root folder:
197197
| deploy\_using\_private\_endpoint | A toggle for Terraform and kubectl to connect to the master's internal IP address during deployment. | `bool` | `false` | no |
198198
| description | The description of the cluster | `string` | `""` | no |
199199
| disable\_default\_snat | Whether to disable the default SNAT to support the private use of public IP addresses | `bool` | `false` | no |
200+
| disable\_l4\_lb\_firewall\_reconciliation | Disable L4 Load Balancer firewall reconciliation | `bool` | `null` | no |
200201
| disable\_legacy\_metadata\_endpoints | Disable the /0.1/ and /v1beta1/ metadata server endpoints on the node. Changing this value will cause all node pools to be recreated. | `bool` | `true` | no |
201202
| dns\_allow\_external\_traffic | (Optional) Controls whether external traffic is allowed over the dns endpoint. | `bool` | `null` | no |
202203
| dns\_cache | The status of the NodeLocal DNSCache addon. | `bool` | `false` | no |
@@ -469,7 +470,7 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
469470
#### Terraform and Plugins
470471

471472
- [Terraform](https://www.terraform.io/downloads.html) 1.3+
472-
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v6.27+
473+
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v6.28+
473474

474475
#### gcloud
475476

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

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

204204
enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting
205205

206+
disable_l4_lb_firewall_reconciliation = var.disable_l4_lb_firewall_reconciliation
207+
206208
enable_cilium_clusterwide_network_policy = var.enable_cilium_clusterwide_network_policy
207209

208210
dynamic "secret_manager_config" {

‎modules/beta-private-cluster-update-variant/metadata.display.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ spec:
106106
disable_default_snat:
107107
name: disable_default_snat
108108
title: Disable Default Snat
109+
disable_l4_lb_firewall_reconciliation:
110+
name: disable_l4_lb_firewall_reconciliation
111+
title: Disable L4 Lb Firewall Reconciliation
109112
disable_legacy_metadata_endpoints:
110113
name: disable_legacy_metadata_endpoints
111114
title: Disable Legacy Metadata Endpoints

‎modules/beta-private-cluster-update-variant/metadata.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -692,6 +692,9 @@ spec:
692692
description: Enable L4 ILB Subsetting on the cluster
693693
varType: bool
694694
defaultValue: false
695+
- name: disable_l4_lb_firewall_reconciliation
696+
description: Disable L4 Load Balancer firewall reconciliation
697+
varType: bool
695698
- name: istio
696699
description: (Beta) Enable Istio addon
697700
varType: bool

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -923,6 +923,12 @@ variable "enable_l4_ilb_subsetting" {
923923
default = false
924924
}
925925

926+
variable "disable_l4_lb_firewall_reconciliation" {
927+
type = bool
928+
description = "Disable L4 Load Balancer firewall reconciliation"
929+
default = null
930+
}
931+
926932
variable "istio" {
927933
description = "(Beta) Enable Istio addon"
928934
type = bool

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ terraform {
2121
required_providers {
2222
google = {
2323
source = "hashicorp/google"
24-
version = ">= 6.27.0, < 7"
24+
version = ">= 6.28.0, < 7"
2525
}
2626
google-beta = {
2727
source = "hashicorp/google-beta"
28-
version = ">= 6.27.0, < 7"
28+
version = ">= 6.28.0, < 7"
2929
}
3030
kubernetes = {
3131
source = "hashicorp/kubernetes"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ Then perform the following commands on the root folder:
175175
| deploy\_using\_private\_endpoint | A toggle for Terraform and kubectl to connect to the master's internal IP address during deployment. | `bool` | `false` | no |
176176
| description | The description of the cluster | `string` | `""` | no |
177177
| disable\_default\_snat | Whether to disable the default SNAT to support the private use of public IP addresses | `bool` | `false` | no |
178+
| disable\_l4\_lb\_firewall\_reconciliation | Disable L4 Load Balancer firewall reconciliation | `bool` | `null` | no |
178179
| disable\_legacy\_metadata\_endpoints | Disable the /0.1/ and /v1beta1/ metadata server endpoints on the node. Changing this value will cause all node pools to be recreated. | `bool` | `true` | no |
179180
| dns\_allow\_external\_traffic | (Optional) Controls whether external traffic is allowed over the dns endpoint. | `bool` | `null` | no |
180181
| dns\_cache | The status of the NodeLocal DNSCache addon. | `bool` | `false` | no |
@@ -447,7 +448,7 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
447448
#### Terraform and Plugins
448449

449450
- [Terraform](https://www.terraform.io/downloads.html) 1.3+
450-
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v6.27+
451+
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v6.28+
451452

452453
#### gcloud
453454

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

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

204204
enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting
205205

206+
disable_l4_lb_firewall_reconciliation = var.disable_l4_lb_firewall_reconciliation
207+
206208
enable_cilium_clusterwide_network_policy = var.enable_cilium_clusterwide_network_policy
207209

208210
dynamic "secret_manager_config" {

‎modules/beta-private-cluster/metadata.display.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ spec:
106106
disable_default_snat:
107107
name: disable_default_snat
108108
title: Disable Default Snat
109+
disable_l4_lb_firewall_reconciliation:
110+
name: disable_l4_lb_firewall_reconciliation
111+
title: Disable L4 Lb Firewall Reconciliation
109112
disable_legacy_metadata_endpoints:
110113
name: disable_legacy_metadata_endpoints
111114
title: Disable Legacy Metadata Endpoints

‎modules/beta-private-cluster/metadata.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -692,6 +692,9 @@ spec:
692692
description: Enable L4 ILB Subsetting on the cluster
693693
varType: bool
694694
defaultValue: false
695+
- name: disable_l4_lb_firewall_reconciliation
696+
description: Disable L4 Load Balancer firewall reconciliation
697+
varType: bool
695698
- name: istio
696699
description: (Beta) Enable Istio addon
697700
varType: bool

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -923,6 +923,12 @@ variable "enable_l4_ilb_subsetting" {
923923
default = false
924924
}
925925

926+
variable "disable_l4_lb_firewall_reconciliation" {
927+
type = bool
928+
description = "Disable L4 Load Balancer firewall reconciliation"
929+
default = null
930+
}
931+
926932
variable "istio" {
927933
description = "(Beta) Enable Istio addon"
928934
type = bool

0 commit comments

Comments
 (0)