Skip to content

Commit fb65b74

Browse files
tuunittuunit
committed
add support for gateway api
1 parent bcd5e03 commit fb65b74

Some content is hidden

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

49 files changed

+237
-9
lines changed

‎README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ Then perform the following commands on the root folder:
155155
| filestore\_csi\_driver | The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes | `bool` | `false` | no |
156156
| firewall\_inbound\_ports | List of TCP ports for admission/webhook controllers. Either flag `add_master_webhook_firewall_rules` or `add_cluster_firewall_rules` (also adds egress rules) must be set to `true` for inbound-ports firewall rules to be applied. | `list(string)` | <pre>[<br> "8443",<br> "9443",<br> "15017"<br>]</pre> | no |
157157
| firewall\_priority | Priority rule for firewall rules | `number` | `1000` | no |
158+
| gateway\_api\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |
158159
| gce\_pd\_csi\_driver | Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |
159160
| grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles. | `bool` | `false` | no |
160161
| horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |
@@ -215,6 +216,7 @@ Then perform the following commands on the root folder:
215216
| ca\_certificate | Cluster ca certificate (base64 encoded) |
216217
| cluster\_id | Cluster ID |
217218
| endpoint | Cluster endpoint |
219+
| gateway\_api\_channel | The gateway api channel of this cluster. |
218220
| horizontal\_pod\_autoscaling\_enabled | Whether horizontal pod autoscaling enabled |
219221
| http\_load\_balancing\_enabled | Whether http load balancing enabled |
220222
| identity\_namespace | Workload Identity pool |

‎autogen/main/cluster.tf.tmpl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,15 @@ resource "google_container_cluster" "primary" {
5353
channel = release_channel.value.channel
5454
}
5555
}
56+
57+
dynamic "gateway_api_config" {
58+
for_each = local.gateway_api_config
59+
60+
content {
61+
channel = gateway_api_config.value.channel
62+
}
63+
}
64+
5665
dynamic "cost_management_config" {
5766
for_each = var.enable_cost_allocation ? [1] : []
5867
content {

‎autogen/main/main.tf.tmpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ locals {
5757
{% endif %}
5858

5959
release_channel = var.release_channel != null ? [{ channel : var.release_channel }] : []
60+
gateway_api_config = var.gateway_api_channel != null ? [{ channel : var.gateway_api_channel }] : []
6061

6162
{% if autopilot_cluster != true %}
6263
autoscaling_resource_limits = var.cluster_autoscaling.enabled ? concat([{

‎autogen/main/outputs.tf.tmpl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,11 @@ output "release_channel" {
158158
value = var.release_channel
159159
}
160160

161+
output "gateway_api_channel" {
162+
description = "The gateway api channel of this cluster."
163+
value = var.gateway_api_channel
164+
}
165+
161166
output "identity_namespace" {
162167
description = "Workload Identity pool"
163168
value = length(local.cluster_workload_identity_config) > 0 ? local.cluster_workload_identity_config[0].workload_pool : null

‎autogen/main/variables.tf.tmpl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,12 @@ variable "release_channel" {
454454
default = null
455455
}
456456

457+
variable "gateway_api_channel" {
458+
type = string
459+
description = "The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`."
460+
default = null
461+
}
462+
457463
variable "add_cluster_firewall_rules" {
458464
type = bool
459465
description = "Create additional firewall rules"

‎cluster.tf

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,15 @@ resource "google_container_cluster" "primary" {
4747
channel = release_channel.value.channel
4848
}
4949
}
50+
51+
dynamic "gateway_api_config" {
52+
for_each = local.gateway_api_config
53+
54+
content {
55+
channel = gateway_api_config.value.channel
56+
}
57+
}
58+
5059
dynamic "cost_management_config" {
5160
for_each = var.enable_cost_allocation ? [1] : []
5261
content {

‎main.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ locals {
5050
windows_node_pool_names = [for np in toset(var.windows_node_pools) : np.name]
5151
windows_node_pools = zipmap(local.windows_node_pool_names, tolist(toset(var.windows_node_pools)))
5252

53-
release_channel = var.release_channel != null ? [{ channel : var.release_channel }] : []
53+
release_channel = var.release_channel != null ? [{ channel : var.release_channel }] : []
54+
gateway_api_config = var.gateway_api_channel != null ? [{ channel : var.gateway_api_channel }] : []
5455

5556
autoscaling_resource_limits = var.cluster_autoscaling.enabled ? concat([{
5657
resource_type = "cpu"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ Then perform the following commands on the root folder:
9292
| enable\_vertical\_pod\_autoscaling | Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it | `bool` | `false` | no |
9393
| firewall\_inbound\_ports | List of TCP ports for admission/webhook controllers. Either flag `add_master_webhook_firewall_rules` or `add_cluster_firewall_rules` (also adds egress rules) must be set to `true` for inbound-ports firewall rules to be applied. | `list(string)` | <pre>[<br> "8443",<br> "9443",<br> "15017"<br>]</pre> | no |
9494
| firewall\_priority | Priority rule for firewall rules | `number` | `1000` | no |
95+
| gateway\_api\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |
9596
| grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles. | `bool` | `false` | no |
9697
| horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |
9798
| http\_load\_balancing | Enable httpload balancer addon | `bool` | `true` | no |
@@ -143,6 +144,7 @@ Then perform the following commands on the root folder:
143144
| cluster\_id | Cluster ID |
144145
| dns\_cache\_enabled | Whether DNS Cache enabled |
145146
| endpoint | Cluster endpoint |
147+
| gateway\_api\_channel | The gateway api channel of this cluster. |
146148
| horizontal\_pod\_autoscaling\_enabled | Whether horizontal pod autoscaling enabled |
147149
| http\_load\_balancing\_enabled | Whether http load balancing enabled |
148150
| identity\_namespace | Workload Identity pool |

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,15 @@ resource "google_container_cluster" "primary" {
3939
channel = release_channel.value.channel
4040
}
4141
}
42+
43+
dynamic "gateway_api_config" {
44+
for_each = local.gateway_api_config
45+
46+
content {
47+
channel = gateway_api_config.value.channel
48+
}
49+
}
50+
4251
dynamic "cost_management_config" {
4352
for_each = var.enable_cost_allocation ? [1] : []
4453
content {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ locals {
4545
master_version_zonal = var.kubernetes_version != "latest" ? var.kubernetes_version : data.google_container_engine_versions.zone.latest_master_version
4646
master_version = var.regional ? local.master_version_regional : local.master_version_zonal
4747

48-
release_channel = var.release_channel != null ? [{ channel : var.release_channel }] : []
48+
release_channel = var.release_channel != null ? [{ channel : var.release_channel }] : []
49+
gateway_api_config = var.gateway_api_channel != null ? [{ channel : var.gateway_api_channel }] : []
4950

5051

5152

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,11 @@ output "release_channel" {
129129
value = var.release_channel
130130
}
131131

132+
output "gateway_api_channel" {
133+
description = "The gateway api channel of this cluster."
134+
value = var.gateway_api_channel
135+
}
136+
132137
output "identity_namespace" {
133138
description = "Workload Identity pool"
134139
value = length(local.cluster_workload_identity_config) > 0 ? local.cluster_workload_identity_config[0].workload_pool : null

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,12 @@ variable "release_channel" {
323323
default = null
324324
}
325325

326+
variable "gateway_api_channel" {
327+
type = string
328+
description = "The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`."
329+
default = null
330+
}
331+
326332
variable "add_cluster_firewall_rules" {
327333
type = bool
328334
description = "Create additional firewall rules"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ Then perform the following commands on the root folder:
8383
| enable\_vertical\_pod\_autoscaling | Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it | `bool` | `false` | no |
8484
| firewall\_inbound\_ports | List of TCP ports for admission/webhook controllers. Either flag `add_master_webhook_firewall_rules` or `add_cluster_firewall_rules` (also adds egress rules) must be set to `true` for inbound-ports firewall rules to be applied. | `list(string)` | <pre>[<br> "8443",<br> "9443",<br> "15017"<br>]</pre> | no |
8585
| firewall\_priority | Priority rule for firewall rules | `number` | `1000` | no |
86+
| gateway\_api\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |
8687
| grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles. | `bool` | `false` | no |
8788
| horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |
8889
| http\_load\_balancing | Enable httpload balancer addon | `bool` | `true` | no |
@@ -132,6 +133,7 @@ Then perform the following commands on the root folder:
132133
| cluster\_id | Cluster ID |
133134
| dns\_cache\_enabled | Whether DNS Cache enabled |
134135
| endpoint | Cluster endpoint |
136+
| gateway\_api\_channel | The gateway api channel of this cluster. |
135137
| horizontal\_pod\_autoscaling\_enabled | Whether horizontal pod autoscaling enabled |
136138
| http\_load\_balancing\_enabled | Whether http load balancing enabled |
137139
| identity\_namespace | Workload Identity pool |

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,15 @@ resource "google_container_cluster" "primary" {
3939
channel = release_channel.value.channel
4040
}
4141
}
42+
43+
dynamic "gateway_api_config" {
44+
for_each = local.gateway_api_config
45+
46+
content {
47+
channel = gateway_api_config.value.channel
48+
}
49+
}
50+
4251
dynamic "cost_management_config" {
4352
for_each = var.enable_cost_allocation ? [1] : []
4453
content {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ locals {
4545
master_version_zonal = var.kubernetes_version != "latest" ? var.kubernetes_version : data.google_container_engine_versions.zone.latest_master_version
4646
master_version = var.regional ? local.master_version_regional : local.master_version_zonal
4747

48-
release_channel = var.release_channel != null ? [{ channel : var.release_channel }] : []
48+
release_channel = var.release_channel != null ? [{ channel : var.release_channel }] : []
49+
gateway_api_config = var.gateway_api_channel != null ? [{ channel : var.gateway_api_channel }] : []
4950

5051

5152

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,11 @@ output "release_channel" {
129129
value = var.release_channel
130130
}
131131

132+
output "gateway_api_channel" {
133+
description = "The gateway api channel of this cluster."
134+
value = var.gateway_api_channel
135+
}
136+
132137
output "identity_namespace" {
133138
description = "Workload Identity pool"
134139
value = length(local.cluster_workload_identity_config) > 0 ? local.cluster_workload_identity_config[0].workload_pool : null

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,12 @@ variable "release_channel" {
293293
default = null
294294
}
295295

296+
variable "gateway_api_channel" {
297+
type = string
298+
description = "The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`."
299+
default = null
300+
}
301+
296302
variable "add_cluster_firewall_rules" {
297303
type = bool
298304
description = "Create additional firewall rules"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ Then perform the following commands on the root folder:
201201
| filestore\_csi\_driver | The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes | `bool` | `false` | no |
202202
| firewall\_inbound\_ports | List of TCP ports for admission/webhook controllers. Either flag `add_master_webhook_firewall_rules` or `add_cluster_firewall_rules` (also adds egress rules) must be set to `true` for inbound-ports firewall rules to be applied. | `list(string)` | <pre>[<br> "8443",<br> "9443",<br> "15017"<br>]</pre> | no |
203203
| firewall\_priority | Priority rule for firewall rules | `number` | `1000` | no |
204+
| gateway\_api\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |
204205
| gce\_pd\_csi\_driver | Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |
205206
| gke\_backup\_agent\_config | (Beta) Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |
206207
| grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles. | `bool` | `false` | no |
@@ -274,6 +275,7 @@ Then perform the following commands on the root folder:
274275
| cluster\_id | Cluster ID |
275276
| dns\_cache\_enabled | Whether DNS Cache enabled |
276277
| endpoint | Cluster endpoint |
278+
| gateway\_api\_channel | The gateway api channel of this cluster. |
277279
| horizontal\_pod\_autoscaling\_enabled | Whether horizontal pod autoscaling enabled |
278280
| http\_load\_balancing\_enabled | Whether http load balancing enabled |
279281
| identity\_namespace | Workload Identity pool |

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,15 @@ resource "google_container_cluster" "primary" {
4747
channel = release_channel.value.channel
4848
}
4949
}
50+
51+
dynamic "gateway_api_config" {
52+
for_each = local.gateway_api_config
53+
54+
content {
55+
channel = gateway_api_config.value.channel
56+
}
57+
}
58+
5059
dynamic "cost_management_config" {
5160
for_each = var.enable_cost_allocation ? [1] : []
5261
content {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ locals {
5050
windows_node_pool_names = [for np in toset(var.windows_node_pools) : np.name]
5151
windows_node_pools = zipmap(local.windows_node_pool_names, tolist(toset(var.windows_node_pools)))
5252

53-
release_channel = var.release_channel != null ? [{ channel : var.release_channel }] : []
53+
release_channel = var.release_channel != null ? [{ channel : var.release_channel }] : []
54+
gateway_api_config = var.gateway_api_channel != null ? [{ channel : var.gateway_api_channel }] : []
5455

5556
autoscaling_resource_limits = var.cluster_autoscaling.enabled ? concat([{
5657
resource_type = "cpu"

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,11 @@ output "release_channel" {
148148
value = var.release_channel
149149
}
150150

151+
output "gateway_api_channel" {
152+
description = "The gateway api channel of this cluster."
153+
value = var.gateway_api_channel
154+
}
155+
151156
output "identity_namespace" {
152157
description = "Workload Identity pool"
153158
value = length(local.cluster_workload_identity_config) > 0 ? local.cluster_workload_identity_config[0].workload_pool : null

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,12 @@ variable "release_channel" {
436436
default = null
437437
}
438438

439+
variable "gateway_api_channel" {
440+
type = string
441+
description = "The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`."
442+
default = null
443+
}
444+
439445
variable "add_cluster_firewall_rules" {
440446
type = bool
441447
description = "Create additional firewall rules"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ Then perform the following commands on the root folder:
179179
| filestore\_csi\_driver | The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes | `bool` | `false` | no |
180180
| firewall\_inbound\_ports | List of TCP ports for admission/webhook controllers. Either flag `add_master_webhook_firewall_rules` or `add_cluster_firewall_rules` (also adds egress rules) must be set to `true` for inbound-ports firewall rules to be applied. | `list(string)` | <pre>[<br> "8443",<br> "9443",<br> "15017"<br>]</pre> | no |
181181
| firewall\_priority | Priority rule for firewall rules | `number` | `1000` | no |
182+
| gateway\_api\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |
182183
| gce\_pd\_csi\_driver | Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |
183184
| gke\_backup\_agent\_config | (Beta) Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |
184185
| grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles. | `bool` | `false` | no |
@@ -252,6 +253,7 @@ Then perform the following commands on the root folder:
252253
| cluster\_id | Cluster ID |
253254
| dns\_cache\_enabled | Whether DNS Cache enabled |
254255
| endpoint | Cluster endpoint |
256+
| gateway\_api\_channel | The gateway api channel of this cluster. |
255257
| horizontal\_pod\_autoscaling\_enabled | Whether horizontal pod autoscaling enabled |
256258
| http\_load\_balancing\_enabled | Whether http load balancing enabled |
257259
| identity\_namespace | Workload Identity pool |

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,15 @@ resource "google_container_cluster" "primary" {
4747
channel = release_channel.value.channel
4848
}
4949
}
50+
51+
dynamic "gateway_api_config" {
52+
for_each = local.gateway_api_config
53+
54+
content {
55+
channel = gateway_api_config.value.channel
56+
}
57+
}
58+
5059
dynamic "cost_management_config" {
5160
for_each = var.enable_cost_allocation ? [1] : []
5261
content {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ locals {
5050
windows_node_pool_names = [for np in toset(var.windows_node_pools) : np.name]
5151
windows_node_pools = zipmap(local.windows_node_pool_names, tolist(toset(var.windows_node_pools)))
5252

53-
release_channel = var.release_channel != null ? [{ channel : var.release_channel }] : []
53+
release_channel = var.release_channel != null ? [{ channel : var.release_channel }] : []
54+
gateway_api_config = var.gateway_api_channel != null ? [{ channel : var.gateway_api_channel }] : []
5455

5556
autoscaling_resource_limits = var.cluster_autoscaling.enabled ? concat([{
5657
resource_type = "cpu"

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,11 @@ output "release_channel" {
148148
value = var.release_channel
149149
}
150150

151+
output "gateway_api_channel" {
152+
description = "The gateway api channel of this cluster."
153+
value = var.gateway_api_channel
154+
}
155+
151156
output "identity_namespace" {
152157
description = "Workload Identity pool"
153158
value = length(local.cluster_workload_identity_config) > 0 ? local.cluster_workload_identity_config[0].workload_pool : null

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,12 @@ variable "release_channel" {
436436
default = null
437437
}
438438

439+
variable "gateway_api_channel" {
440+
type = string
441+
description = "The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`."
442+
default = null
443+
}
444+
439445
variable "add_cluster_firewall_rules" {
440446
type = bool
441447
description = "Create additional firewall rules"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ Then perform the following commands on the root folder:
192192
| filestore\_csi\_driver | The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes | `bool` | `false` | no |
193193
| firewall\_inbound\_ports | List of TCP ports for admission/webhook controllers. Either flag `add_master_webhook_firewall_rules` or `add_cluster_firewall_rules` (also adds egress rules) must be set to `true` for inbound-ports firewall rules to be applied. | `list(string)` | <pre>[<br> "8443",<br> "9443",<br> "15017"<br>]</pre> | no |
194194
| firewall\_priority | Priority rule for firewall rules | `number` | `1000` | no |
195+
| gateway\_api\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |
195196
| gce\_pd\_csi\_driver | Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |
196197
| gke\_backup\_agent\_config | (Beta) Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |
197198
| grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles. | `bool` | `false` | no |
@@ -263,6 +264,7 @@ Then perform the following commands on the root folder:
263264
| cluster\_id | Cluster ID |
264265
| dns\_cache\_enabled | Whether DNS Cache enabled |
265266
| endpoint | Cluster endpoint |
267+
| gateway\_api\_channel | The gateway api channel of this cluster. |
266268
| horizontal\_pod\_autoscaling\_enabled | Whether horizontal pod autoscaling enabled |
267269
| http\_load\_balancing\_enabled | Whether http load balancing enabled |
268270
| identity\_namespace | Workload Identity pool |

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,15 @@ resource "google_container_cluster" "primary" {
4747
channel = release_channel.value.channel
4848
}
4949
}
50+
51+
dynamic "gateway_api_config" {
52+
for_each = local.gateway_api_config
53+
54+
content {
55+
channel = gateway_api_config.value.channel
56+
}
57+
}
58+
5059
dynamic "cost_management_config" {
5160
for_each = var.enable_cost_allocation ? [1] : []
5261
content {

0 commit comments

Comments
 (0)