Skip to content

Commit 062341e

Browse files
apeabodyapeabody
committed
add fleet block
1 parent 4e148ed commit 062341e

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

+287
-0
lines changed

‎README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,8 @@ Then perform the following commands on the root folder:
167167
| filestore\_csi\_driver | The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes | `bool` | `false` | no |
168168
| 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 |
169169
| firewall\_priority | Priority rule for firewall rules | `number` | `1000` | no |
170+
| fleet\_project | Register cluster with custom fleet host project. | `string` | `null` | no |
171+
| fleet\_register | Register cluster with fleet. | `bool` | `false` | no |
170172
| gateway\_api\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |
171173
| gce\_pd\_csi\_driver | Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |
172174
| gcs\_fuse\_csi\_driver | Whether GCE FUSE CSI driver is enabled for this cluster. | `bool` | `false` | no |
@@ -239,6 +241,7 @@ Then perform the following commands on the root folder:
239241
| ca\_certificate | Cluster ca certificate (base64 encoded) |
240242
| cluster\_id | Cluster ID |
241243
| endpoint | Cluster endpoint |
244+
| fleet\_membership | Fleet membership (if enabled) |
242245
| gateway\_api\_channel | The gateway api channel of this cluster. |
243246
| horizontal\_pod\_autoscaling\_enabled | Whether horizontal pod autoscaling enabled |
244247
| http\_load\_balancing\_enabled | Whether http load balancing enabled |

‎autogen/main/cluster.tf.tmpl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,13 @@ resource "google_container_cluster" "primary" {
347347
vulnerability_mode = var.security_posture_vulnerability_mode
348348
}
349349

350+
dynamic "fleet" {
351+
for_each = var.fleet_register == true ? [1] : []
352+
content {
353+
project = var.fleet_project
354+
}
355+
}
356+
350357
ip_allocation_policy {
351358
cluster_secondary_range_name = var.ip_range_pods
352359
services_secondary_range_name = var.ip_range_services

‎autogen/main/main.tf.tmpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ locals {
6060
windows_node_pools = zipmap(local.windows_node_pool_names, tolist(toset(var.windows_node_pools)))
6161
{% endif %}
6262

63+
fleet_membership = var.fleet_register ? google_container_cluster.primary.fleet[0].membership : null
64+
6365
release_channel = var.release_channel != null ? [{ channel : var.release_channel }] : []
6466
gateway_api_config = var.gateway_api_channel != null ? [{ channel : var.gateway_api_channel }] : []
6567

‎autogen/main/outputs.tf.tmpl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,3 +234,8 @@ output "identity_service_enabled" {
234234
value = local.cluster_pod_security_policy_enabled
235235
}
236236
{% endif %}
237+
238+
output "fleet_membership" {
239+
description = "Fleet membership (if enabled)"
240+
value = local.fleet_membership
241+
}

‎autogen/main/variables.tf.tmpl

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -857,3 +857,15 @@ variable "allow_net_admin" {
857857
default = null
858858
}
859859
{% endif %}
860+
861+
variable "fleet_register" {
862+
description = "Register cluster with fleet."
863+
type = bool
864+
default = false
865+
}
866+
867+
variable "fleet_project" {
868+
description = "Register cluster with custom fleet host project."
869+
type = string
870+
default = null
871+
}

‎cluster.tf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,13 @@ resource "google_container_cluster" "primary" {
231231
vulnerability_mode = var.security_posture_vulnerability_mode
232232
}
233233

234+
dynamic "fleet" {
235+
for_each = var.fleet_register == true ? [1] : []
236+
content {
237+
project = var.fleet_project
238+
}
239+
}
240+
234241
ip_allocation_policy {
235242
cluster_secondary_range_name = var.ip_range_pods
236243
services_secondary_range_name = var.ip_range_services

‎main.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ locals {
5454
windows_node_pool_names = [for np in toset(var.windows_node_pools) : np.name]
5555
windows_node_pools = zipmap(local.windows_node_pool_names, tolist(toset(var.windows_node_pools)))
5656

57+
fleet_membership = var.fleet_register ? google_container_cluster.primary.fleet[0].membership : null
58+
5759
release_channel = var.release_channel != null ? [{ channel : var.release_channel }] : []
5860
gateway_api_config = var.gateway_api_channel != null ? [{ channel : var.gateway_api_channel }] : []
5961

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ Then perform the following commands on the root folder:
9898
| enable\_vertical\_pod\_autoscaling | Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it | `bool` | `true` | no |
9999
| 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 |
100100
| firewall\_priority | Priority rule for firewall rules | `number` | `1000` | no |
101+
| fleet\_project | Register cluster with custom fleet host project. | `string` | `null` | no |
102+
| fleet\_register | Register cluster with fleet. | `bool` | `false` | no |
101103
| gateway\_api\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |
102104
| grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles. | `bool` | `false` | no |
103105
| horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |
@@ -153,6 +155,7 @@ Then perform the following commands on the root folder:
153155
| cluster\_id | Cluster ID |
154156
| dns\_cache\_enabled | Whether DNS Cache enabled |
155157
| endpoint | Cluster endpoint |
158+
| fleet\_membership | Fleet membership (if enabled) |
156159
| gateway\_api\_channel | The gateway api channel of this cluster. |
157160
| horizontal\_pod\_autoscaling\_enabled | Whether horizontal pod autoscaling enabled |
158161
| http\_load\_balancing\_enabled | Whether http load balancing enabled |

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,13 @@ resource "google_container_cluster" "primary" {
147147
vulnerability_mode = var.security_posture_vulnerability_mode
148148
}
149149

150+
dynamic "fleet" {
151+
for_each = var.fleet_register == true ? [1] : []
152+
content {
153+
project = var.fleet_project
154+
}
155+
}
156+
150157
ip_allocation_policy {
151158
cluster_secondary_range_name = var.ip_range_pods
152159
services_secondary_range_name = var.ip_range_services

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ locals {
4949
master_version_zonal = var.kubernetes_version != "latest" ? var.kubernetes_version : data.google_container_engine_versions.zone.latest_master_version
5050
master_version = var.regional ? local.master_version_regional : local.master_version_zonal
5151

52+
fleet_membership = var.fleet_register ? google_container_cluster.primary.fleet[0].membership : null
53+
5254
release_channel = var.release_channel != null ? [{ channel : var.release_channel }] : []
5355
gateway_api_config = var.gateway_api_channel != null ? [{ channel : var.gateway_api_channel }] : []
5456

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,3 +188,8 @@ output "identity_service_enabled" {
188188
description = "Whether Identity Service is enabled"
189189
value = local.cluster_pod_security_policy_enabled
190190
}
191+
192+
output "fleet_membership" {
193+
description = "Fleet membership (if enabled)"
194+
value = local.fleet_membership
195+
}

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,3 +460,15 @@ variable "allow_net_admin" {
460460
type = bool
461461
default = null
462462
}
463+
464+
variable "fleet_register" {
465+
description = "Register cluster with fleet."
466+
type = bool
467+
default = false
468+
}
469+
470+
variable "fleet_project" {
471+
description = "Register cluster with custom fleet host project."
472+
type = string
473+
default = null
474+
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ Then perform the following commands on the root folder:
8989
| enable\_vertical\_pod\_autoscaling | Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it | `bool` | `true` | no |
9090
| 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 |
9191
| firewall\_priority | Priority rule for firewall rules | `number` | `1000` | no |
92+
| fleet\_project | Register cluster with custom fleet host project. | `string` | `null` | no |
93+
| fleet\_register | Register cluster with fleet. | `bool` | `false` | no |
9294
| gateway\_api\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |
9395
| grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles. | `bool` | `false` | no |
9496
| horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |
@@ -142,6 +144,7 @@ Then perform the following commands on the root folder:
142144
| cluster\_id | Cluster ID |
143145
| dns\_cache\_enabled | Whether DNS Cache enabled |
144146
| endpoint | Cluster endpoint |
147+
| fleet\_membership | Fleet membership (if enabled) |
145148
| gateway\_api\_channel | The gateway api channel of this cluster. |
146149
| horizontal\_pod\_autoscaling\_enabled | Whether horizontal pod autoscaling enabled |
147150
| http\_load\_balancing\_enabled | Whether http load balancing enabled |

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,13 @@ resource "google_container_cluster" "primary" {
147147
vulnerability_mode = var.security_posture_vulnerability_mode
148148
}
149149

150+
dynamic "fleet" {
151+
for_each = var.fleet_register == true ? [1] : []
152+
content {
153+
project = var.fleet_project
154+
}
155+
}
156+
150157
ip_allocation_policy {
151158
cluster_secondary_range_name = var.ip_range_pods
152159
services_secondary_range_name = var.ip_range_services

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ locals {
4949
master_version_zonal = var.kubernetes_version != "latest" ? var.kubernetes_version : data.google_container_engine_versions.zone.latest_master_version
5050
master_version = var.regional ? local.master_version_regional : local.master_version_zonal
5151

52+
fleet_membership = var.fleet_register ? google_container_cluster.primary.fleet[0].membership : null
53+
5254
release_channel = var.release_channel != null ? [{ channel : var.release_channel }] : []
5355
gateway_api_config = var.gateway_api_channel != null ? [{ channel : var.gateway_api_channel }] : []
5456

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,3 +178,8 @@ output "identity_service_enabled" {
178178
description = "Whether Identity Service is enabled"
179179
value = local.cluster_pod_security_policy_enabled
180180
}
181+
182+
output "fleet_membership" {
183+
description = "Fleet membership (if enabled)"
184+
value = local.fleet_membership
185+
}

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,3 +430,15 @@ variable "allow_net_admin" {
430430
type = bool
431431
default = null
432432
}
433+
434+
variable "fleet_register" {
435+
description = "Register cluster with fleet."
436+
type = bool
437+
default = false
438+
}
439+
440+
variable "fleet_project" {
441+
description = "Register cluster with custom fleet host project."
442+
type = string
443+
default = null
444+
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,8 @@ Then perform the following commands on the root folder:
211211
| filestore\_csi\_driver | The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes | `bool` | `false` | no |
212212
| 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 |
213213
| firewall\_priority | Priority rule for firewall rules | `number` | `1000` | no |
214+
| fleet\_project | Register cluster with custom fleet host project. | `string` | `null` | no |
215+
| fleet\_register | Register cluster with fleet. | `bool` | `false` | no |
214216
| gateway\_api\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |
215217
| gce\_pd\_csi\_driver | Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |
216218
| gcs\_fuse\_csi\_driver | Whether GCE FUSE CSI driver is enabled for this cluster. | `bool` | `false` | no |
@@ -293,6 +295,7 @@ Then perform the following commands on the root folder:
293295
| cluster\_id | Cluster ID |
294296
| dns\_cache\_enabled | Whether DNS Cache enabled |
295297
| endpoint | Cluster endpoint |
298+
| fleet\_membership | Fleet membership (if enabled) |
296299
| gateway\_api\_channel | The gateway api channel of this cluster. |
297300
| horizontal\_pod\_autoscaling\_enabled | Whether horizontal pod autoscaling enabled |
298301
| http\_load\_balancing\_enabled | Whether http load balancing enabled |

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,13 @@ resource "google_container_cluster" "primary" {
281281
vulnerability_mode = var.security_posture_vulnerability_mode
282282
}
283283

284+
dynamic "fleet" {
285+
for_each = var.fleet_register == true ? [1] : []
286+
content {
287+
project = var.fleet_project
288+
}
289+
}
290+
284291
ip_allocation_policy {
285292
cluster_secondary_range_name = var.ip_range_pods
286293
services_secondary_range_name = var.ip_range_services

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ locals {
5454
windows_node_pool_names = [for np in toset(var.windows_node_pools) : np.name]
5555
windows_node_pools = zipmap(local.windows_node_pool_names, tolist(toset(var.windows_node_pools)))
5656

57+
fleet_membership = var.fleet_register ? google_container_cluster.primary.fleet[0].membership : null
58+
5759
release_channel = var.release_channel != null ? [{ channel : var.release_channel }] : []
5860
gateway_api_config = var.gateway_api_channel != null ? [{ channel : var.gateway_api_channel }] : []
5961

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,3 +214,8 @@ output "identity_service_enabled" {
214214
description = "Whether Identity Service is enabled"
215215
value = local.cluster_pod_security_policy_enabled
216216
}
217+
218+
output "fleet_membership" {
219+
description = "Fleet membership (if enabled)"
220+
value = local.fleet_membership
221+
}

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -811,3 +811,15 @@ variable "enable_gcfs" {
811811
description = "Enable image streaming on cluster level."
812812
default = false
813813
}
814+
815+
variable "fleet_register" {
816+
description = "Register cluster with fleet."
817+
type = bool
818+
default = false
819+
}
820+
821+
variable "fleet_project" {
822+
description = "Register cluster with custom fleet host project."
823+
type = string
824+
default = null
825+
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,8 @@ Then perform the following commands on the root folder:
189189
| filestore\_csi\_driver | The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes | `bool` | `false` | no |
190190
| 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 |
191191
| firewall\_priority | Priority rule for firewall rules | `number` | `1000` | no |
192+
| fleet\_project | Register cluster with custom fleet host project. | `string` | `null` | no |
193+
| fleet\_register | Register cluster with fleet. | `bool` | `false` | no |
192194
| gateway\_api\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |
193195
| gce\_pd\_csi\_driver | Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |
194196
| gcs\_fuse\_csi\_driver | Whether GCE FUSE CSI driver is enabled for this cluster. | `bool` | `false` | no |
@@ -271,6 +273,7 @@ Then perform the following commands on the root folder:
271273
| cluster\_id | Cluster ID |
272274
| dns\_cache\_enabled | Whether DNS Cache enabled |
273275
| endpoint | Cluster endpoint |
276+
| fleet\_membership | Fleet membership (if enabled) |
274277
| gateway\_api\_channel | The gateway api channel of this cluster. |
275278
| horizontal\_pod\_autoscaling\_enabled | Whether horizontal pod autoscaling enabled |
276279
| http\_load\_balancing\_enabled | Whether http load balancing enabled |

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,13 @@ resource "google_container_cluster" "primary" {
281281
vulnerability_mode = var.security_posture_vulnerability_mode
282282
}
283283

284+
dynamic "fleet" {
285+
for_each = var.fleet_register == true ? [1] : []
286+
content {
287+
project = var.fleet_project
288+
}
289+
}
290+
284291
ip_allocation_policy {
285292
cluster_secondary_range_name = var.ip_range_pods
286293
services_secondary_range_name = var.ip_range_services

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ locals {
5454
windows_node_pool_names = [for np in toset(var.windows_node_pools) : np.name]
5555
windows_node_pools = zipmap(local.windows_node_pool_names, tolist(toset(var.windows_node_pools)))
5656

57+
fleet_membership = var.fleet_register ? google_container_cluster.primary.fleet[0].membership : null
58+
5759
release_channel = var.release_channel != null ? [{ channel : var.release_channel }] : []
5860
gateway_api_config = var.gateway_api_channel != null ? [{ channel : var.gateway_api_channel }] : []
5961

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,3 +214,8 @@ output "identity_service_enabled" {
214214
description = "Whether Identity Service is enabled"
215215
value = local.cluster_pod_security_policy_enabled
216216
}
217+
218+
output "fleet_membership" {
219+
description = "Fleet membership (if enabled)"
220+
value = local.fleet_membership
221+
}

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -811,3 +811,15 @@ variable "enable_gcfs" {
811811
description = "Enable image streaming on cluster level."
812812
default = false
813813
}
814+
815+
variable "fleet_register" {
816+
description = "Register cluster with fleet."
817+
type = bool
818+
default = false
819+
}
820+
821+
variable "fleet_project" {
822+
description = "Register cluster with custom fleet host project."
823+
type = string
824+
default = null
825+
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,8 @@ Then perform the following commands on the root folder:
202202
| filestore\_csi\_driver | The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes | `bool` | `false` | no |
203203
| 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 |
204204
| firewall\_priority | Priority rule for firewall rules | `number` | `1000` | no |
205+
| fleet\_project | Register cluster with custom fleet host project. | `string` | `null` | no |
206+
| fleet\_register | Register cluster with fleet. | `bool` | `false` | no |
205207
| gateway\_api\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |
206208
| gce\_pd\_csi\_driver | Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |
207209
| gcs\_fuse\_csi\_driver | Whether GCE FUSE CSI driver is enabled for this cluster. | `bool` | `false` | no |
@@ -282,6 +284,7 @@ Then perform the following commands on the root folder:
282284
| cluster\_id | Cluster ID |
283285
| dns\_cache\_enabled | Whether DNS Cache enabled |
284286
| endpoint | Cluster endpoint |
287+
| fleet\_membership | Fleet membership (if enabled) |
285288
| gateway\_api\_channel | The gateway api channel of this cluster. |
286289
| horizontal\_pod\_autoscaling\_enabled | Whether horizontal pod autoscaling enabled |
287290
| http\_load\_balancing\_enabled | Whether http load balancing enabled |

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,13 @@ resource "google_container_cluster" "primary" {
281281
vulnerability_mode = var.security_posture_vulnerability_mode
282282
}
283283

284+
dynamic "fleet" {
285+
for_each = var.fleet_register == true ? [1] : []
286+
content {
287+
project = var.fleet_project
288+
}
289+
}
290+
284291
ip_allocation_policy {
285292
cluster_secondary_range_name = var.ip_range_pods
286293
services_secondary_range_name = var.ip_range_services

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ locals {
5454
windows_node_pool_names = [for np in toset(var.windows_node_pools) : np.name]
5555
windows_node_pools = zipmap(local.windows_node_pool_names, tolist(toset(var.windows_node_pools)))
5656

57+
fleet_membership = var.fleet_register ? google_container_cluster.primary.fleet[0].membership : null
58+
5759
release_channel = var.release_channel != null ? [{ channel : var.release_channel }] : []
5860
gateway_api_config = var.gateway_api_channel != null ? [{ channel : var.gateway_api_channel }] : []
5961

0 commit comments

Comments
 (0)