Skip to content

Commit 81686e7

Browse files
bharathkkbbharathkkb
authored
fix: convert gcfs_config to dynamic block to prevent node pool recreation
1 parent aee12e7 commit 81686e7

File tree

8 files changed

+80
-32
lines changed

8 files changed

+80
-32
lines changed

‎autogen/main/cluster.tf.tmpl

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,11 @@ resource "google_container_cluster" "primary" {
295295
image_type = lookup(var.node_pools[0], "image_type", "COS_CONTAINERD")
296296
machine_type = lookup(var.node_pools[0], "machine_type", "e2-medium")
297297
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
298-
gcfs_config {
299-
enabled = lookup(var.node_pools[0], "enable_gcfs", false)
298+
dynamic "gcfs_config" {
299+
for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
300+
content {
301+
enabled = gcfs_config.value
302+
}
300303
}
301304

302305
service_account = lookup(var.node_pools[0], "service_account", local.service_account)
@@ -580,8 +583,11 @@ resource "google_container_node_pool" "pools" {
580583
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
581584
machine_type = lookup(each.value, "machine_type", "e2-medium")
582585
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
583-
gcfs_config {
584-
enabled = lookup(each.value, "enable_gcfs", false)
586+
dynamic "gcfs_config" {
587+
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
588+
content {
589+
enabled = gcfs_config.value
590+
}
585591
}
586592
labels = merge(
587593
lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},

‎cluster.tf

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,11 @@ resource "google_container_cluster" "primary" {
146146
image_type = lookup(var.node_pools[0], "image_type", "COS_CONTAINERD")
147147
machine_type = lookup(var.node_pools[0], "machine_type", "e2-medium")
148148
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
149-
gcfs_config {
150-
enabled = lookup(var.node_pools[0], "enable_gcfs", false)
149+
dynamic "gcfs_config" {
150+
for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
151+
content {
152+
enabled = gcfs_config.value
153+
}
151154
}
152155

153156
service_account = lookup(var.node_pools[0], "service_account", local.service_account)
@@ -269,8 +272,11 @@ resource "google_container_node_pool" "pools" {
269272
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
270273
machine_type = lookup(each.value, "machine_type", "e2-medium")
271274
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
272-
gcfs_config {
273-
enabled = lookup(each.value, "enable_gcfs", false)
275+
dynamic "gcfs_config" {
276+
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
277+
content {
278+
enabled = gcfs_config.value
279+
}
274280
}
275281
labels = merge(
276282
lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,11 @@ resource "google_container_cluster" "primary" {
252252
image_type = lookup(var.node_pools[0], "image_type", "COS_CONTAINERD")
253253
machine_type = lookup(var.node_pools[0], "machine_type", "e2-medium")
254254
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
255-
gcfs_config {
256-
enabled = lookup(var.node_pools[0], "enable_gcfs", false)
255+
dynamic "gcfs_config" {
256+
for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
257+
content {
258+
enabled = gcfs_config.value
259+
}
257260
}
258261

259262
service_account = lookup(var.node_pools[0], "service_account", local.service_account)
@@ -505,8 +508,11 @@ resource "google_container_node_pool" "pools" {
505508
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
506509
machine_type = lookup(each.value, "machine_type", "e2-medium")
507510
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
508-
gcfs_config {
509-
enabled = lookup(each.value, "enable_gcfs", false)
511+
dynamic "gcfs_config" {
512+
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
513+
content {
514+
enabled = gcfs_config.value
515+
}
510516
}
511517
labels = merge(
512518
lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,11 @@ resource "google_container_cluster" "primary" {
252252
image_type = lookup(var.node_pools[0], "image_type", "COS_CONTAINERD")
253253
machine_type = lookup(var.node_pools[0], "machine_type", "e2-medium")
254254
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
255-
gcfs_config {
256-
enabled = lookup(var.node_pools[0], "enable_gcfs", false)
255+
dynamic "gcfs_config" {
256+
for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
257+
content {
258+
enabled = gcfs_config.value
259+
}
257260
}
258261

259262
service_account = lookup(var.node_pools[0], "service_account", local.service_account)
@@ -418,8 +421,11 @@ resource "google_container_node_pool" "pools" {
418421
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
419422
machine_type = lookup(each.value, "machine_type", "e2-medium")
420423
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
421-
gcfs_config {
422-
enabled = lookup(each.value, "enable_gcfs", false)
424+
dynamic "gcfs_config" {
425+
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
426+
content {
427+
enabled = gcfs_config.value
428+
}
423429
}
424430
labels = merge(
425431
lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,11 @@ resource "google_container_cluster" "primary" {
252252
image_type = lookup(var.node_pools[0], "image_type", "COS_CONTAINERD")
253253
machine_type = lookup(var.node_pools[0], "machine_type", "e2-medium")
254254
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
255-
gcfs_config {
256-
enabled = lookup(var.node_pools[0], "enable_gcfs", false)
255+
dynamic "gcfs_config" {
256+
for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
257+
content {
258+
enabled = gcfs_config.value
259+
}
257260
}
258261

259262
service_account = lookup(var.node_pools[0], "service_account", local.service_account)
@@ -486,8 +489,11 @@ resource "google_container_node_pool" "pools" {
486489
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
487490
machine_type = lookup(each.value, "machine_type", "e2-medium")
488491
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
489-
gcfs_config {
490-
enabled = lookup(each.value, "enable_gcfs", false)
492+
dynamic "gcfs_config" {
493+
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
494+
content {
495+
enabled = gcfs_config.value
496+
}
491497
}
492498
labels = merge(
493499
lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,11 @@ resource "google_container_cluster" "primary" {
252252
image_type = lookup(var.node_pools[0], "image_type", "COS_CONTAINERD")
253253
machine_type = lookup(var.node_pools[0], "machine_type", "e2-medium")
254254
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
255-
gcfs_config {
256-
enabled = lookup(var.node_pools[0], "enable_gcfs", false)
255+
dynamic "gcfs_config" {
256+
for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
257+
content {
258+
enabled = gcfs_config.value
259+
}
257260
}
258261

259262
service_account = lookup(var.node_pools[0], "service_account", local.service_account)
@@ -399,8 +402,11 @@ resource "google_container_node_pool" "pools" {
399402
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
400403
machine_type = lookup(each.value, "machine_type", "e2-medium")
401404
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
402-
gcfs_config {
403-
enabled = lookup(each.value, "enable_gcfs", false)
405+
dynamic "gcfs_config" {
406+
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
407+
content {
408+
enabled = gcfs_config.value
409+
}
404410
}
405411
labels = merge(
406412
lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,11 @@ resource "google_container_cluster" "primary" {
146146
image_type = lookup(var.node_pools[0], "image_type", "COS_CONTAINERD")
147147
machine_type = lookup(var.node_pools[0], "machine_type", "e2-medium")
148148
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
149-
gcfs_config {
150-
enabled = lookup(var.node_pools[0], "enable_gcfs", false)
149+
dynamic "gcfs_config" {
150+
for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
151+
content {
152+
enabled = gcfs_config.value
153+
}
151154
}
152155

153156
service_account = lookup(var.node_pools[0], "service_account", local.service_account)
@@ -368,8 +371,11 @@ resource "google_container_node_pool" "pools" {
368371
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
369372
machine_type = lookup(each.value, "machine_type", "e2-medium")
370373
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
371-
gcfs_config {
372-
enabled = lookup(each.value, "enable_gcfs", false)
374+
dynamic "gcfs_config" {
375+
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
376+
content {
377+
enabled = gcfs_config.value
378+
}
373379
}
374380
labels = merge(
375381
lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},

‎modules/private-cluster/cluster.tf

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,11 @@ resource "google_container_cluster" "primary" {
146146
image_type = lookup(var.node_pools[0], "image_type", "COS_CONTAINERD")
147147
machine_type = lookup(var.node_pools[0], "machine_type", "e2-medium")
148148
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
149-
gcfs_config {
150-
enabled = lookup(var.node_pools[0], "enable_gcfs", false)
149+
dynamic "gcfs_config" {
150+
for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
151+
content {
152+
enabled = gcfs_config.value
153+
}
151154
}
152155

153156
service_account = lookup(var.node_pools[0], "service_account", local.service_account)
@@ -282,8 +285,11 @@ resource "google_container_node_pool" "pools" {
282285
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
283286
machine_type = lookup(each.value, "machine_type", "e2-medium")
284287
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
285-
gcfs_config {
286-
enabled = lookup(each.value, "enable_gcfs", false)
288+
dynamic "gcfs_config" {
289+
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
290+
content {
291+
enabled = gcfs_config.value
292+
}
287293
}
288294
labels = merge(
289295
lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},

0 commit comments

Comments
 (0)