Skip to content

Commit b2a597b

Browse files
t-indumathyt-indumathy
authored
feat: added confidential-nodes flag for node-pools (#2110)
1 parent 08e58de commit b2a597b

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
@@ -721,7 +721,8 @@ locals {
721721
"enable_confidential_storage",
722722
"consume_reservation_type",
723723
"reservation_affinity_key",
724-
"reservation_affinity_values"
724+
"reservation_affinity_values",
725+
"enable_confidential_nodes",
725726
]
726727
}
727728

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

10901099
lifecycle {

‎cluster.tf

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

777785
lifecycle {
@@ -1039,6 +1047,14 @@ resource "google_container_node_pool" "windows_pools" {
10391047
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
10401048
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
10411049
}
1050+
1051+
dynamic "confidential_nodes" {
1052+
for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
1053+
content {
1054+
enabled = confidential_nodes.value
1055+
}
1056+
}
1057+
10421058
}
10431059

10441060
lifecycle {

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

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

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

957966
lifecycle {
@@ -1233,6 +1242,14 @@ resource "google_container_node_pool" "windows_pools" {
12331242
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
12341243
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
12351244
}
1245+
1246+
dynamic "confidential_nodes" {
1247+
for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
1248+
content {
1249+
enabled = confidential_nodes.value
1250+
}
1251+
}
1252+
12361253
}
12371254

12381255
lifecycle {

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

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

875883
lifecycle {
@@ -1150,6 +1158,14 @@ resource "google_container_node_pool" "windows_pools" {
11501158
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
11511159
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
11521160
}
1161+
1162+
dynamic "confidential_nodes" {
1163+
for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
1164+
content {
1165+
enabled = confidential_nodes.value
1166+
}
1167+
}
1168+
11531169
}
11541170

11551171
lifecycle {

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

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

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

936945
lifecycle {
@@ -1212,6 +1221,14 @@ resource "google_container_node_pool" "windows_pools" {
12121221
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
12131222
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
12141223
}
1224+
1225+
dynamic "confidential_nodes" {
1226+
for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
1227+
content {
1228+
enabled = confidential_nodes.value
1229+
}
1230+
}
1231+
12151232
}
12161233

12171234
lifecycle {

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

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

854862
lifecycle {
@@ -1129,6 +1137,14 @@ resource "google_container_node_pool" "windows_pools" {
11291137
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
11301138
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
11311139
}
1140+
1141+
dynamic "confidential_nodes" {
1142+
for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
1143+
content {
1144+
enabled = confidential_nodes.value
1145+
}
1146+
}
1147+
11321148
}
11331149

11341150
lifecycle {

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

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

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

880889
lifecycle {
@@ -1143,6 +1152,14 @@ resource "google_container_node_pool" "windows_pools" {
11431152
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
11441153
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
11451154
}
1155+
1156+
dynamic "confidential_nodes" {
1157+
for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
1158+
content {
1159+
enabled = confidential_nodes.value
1160+
}
1161+
}
1162+
11461163
}
11471164

11481165
lifecycle {

‎modules/private-cluster/cluster.tf

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

798806
lifecycle {
@@ -1060,6 +1068,14 @@ resource "google_container_node_pool" "windows_pools" {
10601068
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
10611069
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
10621070
}
1071+
1072+
dynamic "confidential_nodes" {
1073+
for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
1074+
content {
1075+
enabled = confidential_nodes.value
1076+
}
1077+
}
1078+
10631079
}
10641080

10651081
lifecycle {

0 commit comments

Comments
 (0)