Skip to content

Commit 2ce191b

Browse files
committed
Added confidential-node flag for node-pool config
1 parent 0733908 commit 2ce191b

File tree

8 files changed

+128
-4
lines changed

8 files changed

+128
-4
lines changed

autogen/main/cluster.tf.tmpl

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,8 @@ locals {
720720
"enable_confidential_storage",
721721
"consume_reservation_type",
722722
"reservation_affinity_key",
723-
"reservation_affinity_values"
723+
"reservation_affinity_values",
724+
"enable_confidential_nodes",
724725
]
725726
}
726727

@@ -1084,6 +1085,14 @@ resource "google_container_node_pool" "windows_pools" {
10841085
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
10851086
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
10861087
}
1088+
1089+
dynamic "confidential_nodes" {
1090+
for_each = lookup(each.value, "enable_confidential_nodes", false) ? [true] : []
1091+
content {
1092+
enabled = confidential_nodes.value
1093+
}
1094+
}
1095+
10871096
}
10881097

10891098
lifecycle {

cluster.tf

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -771,6 +771,14 @@ resource "google_container_node_pool" "pools" {
771771
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
772772
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
773773
}
774+
775+
dynamic "confidential_nodes" {
776+
for_each = lookup(each.value, "enable_confidential_nodes", false) ? [true] : []
777+
content {
778+
enabled = confidential_nodes.value
779+
}
780+
}
781+
774782
}
775783

776784
lifecycle {
@@ -1038,6 +1046,14 @@ resource "google_container_node_pool" "windows_pools" {
10381046
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
10391047
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
10401048
}
1049+
1050+
dynamic "confidential_nodes" {
1051+
for_each = lookup(each.value, "enable_confidential_nodes", false) ? [true] : []
1052+
content {
1053+
enabled = confidential_nodes.value
1054+
}
1055+
}
1056+
10411057
}
10421058

10431059
lifecycle {

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

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,8 @@ locals {
616616
"enable_confidential_storage",
617617
"consume_reservation_type",
618618
"reservation_affinity_key",
619-
"reservation_affinity_values"
619+
"reservation_affinity_values",
620+
"enable_confidential_nodes",
620621
]
621622
}
622623

@@ -951,6 +952,14 @@ resource "google_container_node_pool" "pools" {
951952
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
952953
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
953954
}
955+
956+
dynamic "confidential_nodes" {
957+
for_each = lookup(each.value, "enable_confidential_nodes", false) ? [true] : []
958+
content {
959+
enabled = confidential_nodes.value
960+
}
961+
}
962+
954963
}
955964

956965
lifecycle {
@@ -1232,6 +1241,14 @@ resource "google_container_node_pool" "windows_pools" {
12321241
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
12331242
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
12341243
}
1244+
1245+
dynamic "confidential_nodes" {
1246+
for_each = lookup(each.value, "enable_confidential_nodes", false) ? [true] : []
1247+
content {
1248+
enabled = confidential_nodes.value
1249+
}
1250+
}
1251+
12351252
}
12361253

12371254
lifecycle {

modules/beta-private-cluster/cluster.tf

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -869,6 +869,14 @@ resource "google_container_node_pool" "pools" {
869869
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
870870
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
871871
}
872+
873+
dynamic "confidential_nodes" {
874+
for_each = lookup(each.value, "enable_confidential_nodes", false) ? [true] : []
875+
content {
876+
enabled = confidential_nodes.value
877+
}
878+
}
879+
872880
}
873881

874882
lifecycle {
@@ -1149,6 +1157,14 @@ resource "google_container_node_pool" "windows_pools" {
11491157
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
11501158
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
11511159
}
1160+
1161+
dynamic "confidential_nodes" {
1162+
for_each = lookup(each.value, "enable_confidential_nodes", false) ? [true] : []
1163+
content {
1164+
enabled = confidential_nodes.value
1165+
}
1166+
}
1167+
11521168
}
11531169

11541170
lifecycle {

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

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,8 @@ locals {
595595
"enable_confidential_storage",
596596
"consume_reservation_type",
597597
"reservation_affinity_key",
598-
"reservation_affinity_values"
598+
"reservation_affinity_values",
599+
"enable_confidential_nodes",
599600
]
600601
}
601602

@@ -930,6 +931,14 @@ resource "google_container_node_pool" "pools" {
930931
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
931932
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
932933
}
934+
935+
dynamic "confidential_nodes" {
936+
for_each = lookup(each.value, "enable_confidential_nodes", false) ? [true] : []
937+
content {
938+
enabled = confidential_nodes.value
939+
}
940+
}
941+
933942
}
934943

935944
lifecycle {
@@ -1211,6 +1220,14 @@ resource "google_container_node_pool" "windows_pools" {
12111220
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
12121221
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
12131222
}
1223+
1224+
dynamic "confidential_nodes" {
1225+
for_each = lookup(each.value, "enable_confidential_nodes", false) ? [true] : []
1226+
content {
1227+
enabled = confidential_nodes.value
1228+
}
1229+
}
1230+
12141231
}
12151232

12161233
lifecycle {

modules/beta-public-cluster/cluster.tf

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -848,6 +848,14 @@ resource "google_container_node_pool" "pools" {
848848
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
849849
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
850850
}
851+
852+
dynamic "confidential_nodes" {
853+
for_each = lookup(each.value, "enable_confidential_nodes", false) ? [true] : []
854+
content {
855+
enabled = confidential_nodes.value
856+
}
857+
}
858+
851859
}
852860

853861
lifecycle {
@@ -1128,6 +1136,14 @@ resource "google_container_node_pool" "windows_pools" {
11281136
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
11291137
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
11301138
}
1139+
1140+
dynamic "confidential_nodes" {
1141+
for_each = lookup(each.value, "enable_confidential_nodes", false) ? [true] : []
1142+
content {
1143+
enabled = confidential_nodes.value
1144+
}
1145+
}
1146+
11311147
}
11321148

11331149
lifecycle {

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

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,8 @@ locals {
552552
"enable_confidential_storage",
553553
"consume_reservation_type",
554554
"reservation_affinity_key",
555-
"reservation_affinity_values"
555+
"reservation_affinity_values",
556+
"enable_confidential_nodes",
556557
]
557558
}
558559

@@ -874,6 +875,14 @@ resource "google_container_node_pool" "pools" {
874875
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
875876
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
876877
}
878+
879+
dynamic "confidential_nodes" {
880+
for_each = lookup(each.value, "enable_confidential_nodes", false) ? [true] : []
881+
content {
882+
enabled = confidential_nodes.value
883+
}
884+
}
885+
877886
}
878887

879888
lifecycle {
@@ -1142,6 +1151,14 @@ resource "google_container_node_pool" "windows_pools" {
11421151
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
11431152
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
11441153
}
1154+
1155+
dynamic "confidential_nodes" {
1156+
for_each = lookup(each.value, "enable_confidential_nodes", false) ? [true] : []
1157+
content {
1158+
enabled = confidential_nodes.value
1159+
}
1160+
}
1161+
11451162
}
11461163

11471164
lifecycle {

modules/private-cluster/cluster.tf

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -792,6 +792,14 @@ resource "google_container_node_pool" "pools" {
792792
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
793793
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
794794
}
795+
796+
dynamic "confidential_nodes" {
797+
for_each = lookup(each.value, "enable_confidential_nodes", false) ? [true] : []
798+
content {
799+
enabled = confidential_nodes.value
800+
}
801+
}
802+
795803
}
796804

797805
lifecycle {
@@ -1059,6 +1067,14 @@ resource "google_container_node_pool" "windows_pools" {
10591067
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
10601068
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
10611069
}
1070+
1071+
dynamic "confidential_nodes" {
1072+
for_each = lookup(each.value, "enable_confidential_nodes", false) ? [true] : []
1073+
content {
1074+
enabled = confidential_nodes.value
1075+
}
1076+
}
1077+
10621078
}
10631079

10641080
lifecycle {

0 commit comments

Comments
 (0)