Skip to content

Commit 67d9764

Browse files
committed
feat!: align keepers with ForceNew: true fields
Will cause node pools to be re-created on update, unless remote state of the `random_id` resources is manually modified to reflect the new keepers. Fixes #1695
1 parent ba22351 commit 67d9764

File tree

4 files changed

+12
-88
lines changed

4 files changed

+12
-88
lines changed

autogen/main/cluster.tf.tmpl

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -569,10 +569,12 @@ locals {
569569
"disk_type",
570570
"accelerator_count",
571571
"accelerator_type",
572+
"gpu_partition_size",
572573
"enable_secure_boot",
573574
"enable_integrity_monitoring",
574575
"local_ssd_count",
575576
"machine_type",
577+
"placement_policy",
576578
"max_pods_per_node",
577579
"min_cpu_platform",
578580
"pod_range",
@@ -582,6 +584,7 @@ locals {
582584
"enable_gcfs",
583585
"enable_gvnic",
584586
"enable_secure_boot",
587+
"boot_disk_kms_key",
585588
]
586589
}
587590

@@ -598,18 +601,6 @@ resource "random_id" "name" {
598601
local.force_node_pool_recreation_resources,
599602
[for keeper in local.force_node_pool_recreation_resources : lookup(each.value, keeper, "")]
600603
),
601-
{
602-
labels = join(",",
603-
sort(
604-
concat(
605-
keys(local.node_pools_labels["all"]),
606-
values(local.node_pools_labels["all"]),
607-
keys(local.node_pools_labels[each.value["name"]]),
608-
values(local.node_pools_labels[each.value["name"]])
609-
)
610-
)
611-
)
612-
},
613604
{
614605
taints = join(",",
615606
sort(
@@ -643,16 +634,6 @@ resource "random_id" "name" {
643634
)
644635
)
645636
)
646-
},
647-
{
648-
tags = join(",",
649-
sort(
650-
concat(
651-
local.node_pools_tags["all"],
652-
local.node_pools_tags[each.value["name"]]
653-
)
654-
)
655-
)
656637
}
657638
)
658639
}

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

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -484,10 +484,12 @@ locals {
484484
"disk_type",
485485
"accelerator_count",
486486
"accelerator_type",
487+
"gpu_partition_size",
487488
"enable_secure_boot",
488489
"enable_integrity_monitoring",
489490
"local_ssd_count",
490491
"machine_type",
492+
"placement_policy",
491493
"max_pods_per_node",
492494
"min_cpu_platform",
493495
"pod_range",
@@ -497,6 +499,7 @@ locals {
497499
"enable_gcfs",
498500
"enable_gvnic",
499501
"enable_secure_boot",
502+
"boot_disk_kms_key",
500503
]
501504
}
502505

@@ -513,18 +516,6 @@ resource "random_id" "name" {
513516
local.force_node_pool_recreation_resources,
514517
[for keeper in local.force_node_pool_recreation_resources : lookup(each.value, keeper, "")]
515518
),
516-
{
517-
labels = join(",",
518-
sort(
519-
concat(
520-
keys(local.node_pools_labels["all"]),
521-
values(local.node_pools_labels["all"]),
522-
keys(local.node_pools_labels[each.value["name"]]),
523-
values(local.node_pools_labels[each.value["name"]])
524-
)
525-
)
526-
)
527-
},
528519
{
529520
taints = join(",",
530521
sort(
@@ -558,16 +549,6 @@ resource "random_id" "name" {
558549
)
559550
)
560551
)
561-
},
562-
{
563-
tags = join(",",
564-
sort(
565-
concat(
566-
local.node_pools_tags["all"],
567-
local.node_pools_tags[each.value["name"]]
568-
)
569-
)
570-
)
571552
}
572553
)
573554
}

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

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -465,10 +465,12 @@ locals {
465465
"disk_type",
466466
"accelerator_count",
467467
"accelerator_type",
468+
"gpu_partition_size",
468469
"enable_secure_boot",
469470
"enable_integrity_monitoring",
470471
"local_ssd_count",
471472
"machine_type",
473+
"placement_policy",
472474
"max_pods_per_node",
473475
"min_cpu_platform",
474476
"pod_range",
@@ -478,6 +480,7 @@ locals {
478480
"enable_gcfs",
479481
"enable_gvnic",
480482
"enable_secure_boot",
483+
"boot_disk_kms_key",
481484
]
482485
}
483486

@@ -494,18 +497,6 @@ resource "random_id" "name" {
494497
local.force_node_pool_recreation_resources,
495498
[for keeper in local.force_node_pool_recreation_resources : lookup(each.value, keeper, "")]
496499
),
497-
{
498-
labels = join(",",
499-
sort(
500-
concat(
501-
keys(local.node_pools_labels["all"]),
502-
values(local.node_pools_labels["all"]),
503-
keys(local.node_pools_labels[each.value["name"]]),
504-
values(local.node_pools_labels[each.value["name"]])
505-
)
506-
)
507-
)
508-
},
509500
{
510501
taints = join(",",
511502
sort(
@@ -539,16 +530,6 @@ resource "random_id" "name" {
539530
)
540531
)
541532
)
542-
},
543-
{
544-
tags = join(",",
545-
sort(
546-
concat(
547-
local.node_pools_tags["all"],
548-
local.node_pools_tags[each.value["name"]]
549-
)
550-
)
551-
)
552533
}
553534
)
554535
}

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

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -411,10 +411,12 @@ locals {
411411
"disk_type",
412412
"accelerator_count",
413413
"accelerator_type",
414+
"gpu_partition_size",
414415
"enable_secure_boot",
415416
"enable_integrity_monitoring",
416417
"local_ssd_count",
417418
"machine_type",
419+
"placement_policy",
418420
"max_pods_per_node",
419421
"min_cpu_platform",
420422
"pod_range",
@@ -424,6 +426,7 @@ locals {
424426
"enable_gcfs",
425427
"enable_gvnic",
426428
"enable_secure_boot",
429+
"boot_disk_kms_key",
427430
]
428431
}
429432

@@ -440,18 +443,6 @@ resource "random_id" "name" {
440443
local.force_node_pool_recreation_resources,
441444
[for keeper in local.force_node_pool_recreation_resources : lookup(each.value, keeper, "")]
442445
),
443-
{
444-
labels = join(",",
445-
sort(
446-
concat(
447-
keys(local.node_pools_labels["all"]),
448-
values(local.node_pools_labels["all"]),
449-
keys(local.node_pools_labels[each.value["name"]]),
450-
values(local.node_pools_labels[each.value["name"]])
451-
)
452-
)
453-
)
454-
},
455446
{
456447
taints = join(",",
457448
sort(
@@ -485,16 +476,6 @@ resource "random_id" "name" {
485476
)
486477
)
487478
)
488-
},
489-
{
490-
tags = join(",",
491-
sort(
492-
concat(
493-
local.node_pools_tags["all"],
494-
local.node_pools_tags[each.value["name"]]
495-
)
496-
)
497-
)
498479
}
499480
)
500481
}

0 commit comments

Comments
 (0)