Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: added confidential-nodes flag for node-pools #2110

Merged
merged 7 commits into from
Oct 2, 2024
+128 −4
Merged

feat: added confidential-nodes flag for node-pools #2110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2ce191b
Added confidential-node flag for node-pool config
t-indumathy Sep 23, 2024
0822108
Added confidential-node flag for node-pool config
t-indumathy Sep 23, 2024
1124f49
Refactored node-pool level confidential config
t-indumathy Sep 30, 2024
3864ce5
Merge branch 'feature/nodepool-confidential' of https://github.com/t-…
t-indumathy Sep 30, 2024
8a3dbd8
Merge branch 'master' into feature/nodepool-confidential
apeabody Oct 1, 2024
0f8baed
Merge branch 'master' into feature/nodepool-confidential
apeabody Oct 1, 2024
49f841f
Merge branch 'master' into feature/nodepool-confidential
apeabody Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion autogen/main/cluster.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,8 @@ locals {
"enable_confidential_storage",
"consume_reservation_type",
"reservation_affinity_key",
"reservation_affinity_values"
"reservation_affinity_values",
"enable_confidential_nodes",
]
}

Expand Down Expand Up @@ -1085,6 +1086,14 @@ resource "google_container_node_pool" "windows_pools" {
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
}

dynamic "confidential_nodes" {
for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
content {
enabled = confidential_nodes.value
}
}

}

lifecycle {
Expand Down
16 changes: 16 additions & 0 deletions cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,6 +772,14 @@ resource "google_container_node_pool" "pools" {
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
}

dynamic "confidential_nodes" {
for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
content {
enabled = confidential_nodes.value
}
}

}

lifecycle {
Expand Down Expand Up @@ -1039,6 +1047,14 @@ resource "google_container_node_pool" "windows_pools" {
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
}

dynamic "confidential_nodes" {
for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
content {
enabled = confidential_nodes.value
}
}

}

lifecycle {
Expand Down
19 changes: 18 additions & 1 deletion modules/beta-private-cluster-update-variant/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,8 @@ locals {
"enable_confidential_storage",
"consume_reservation_type",
"reservation_affinity_key",
"reservation_affinity_values"
"reservation_affinity_values",
"enable_confidential_nodes",
]
}

Expand Down Expand Up @@ -952,6 +953,14 @@ resource "google_container_node_pool" "pools" {
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
}

dynamic "confidential_nodes" {
for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
content {
enabled = confidential_nodes.value
}
}

}

lifecycle {
Expand Down Expand Up @@ -1233,6 +1242,14 @@ resource "google_container_node_pool" "windows_pools" {
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
}

dynamic "confidential_nodes" {
for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
content {
enabled = confidential_nodes.value
}
}

}

lifecycle {
Expand Down
16 changes: 16 additions & 0 deletions modules/beta-private-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,6 +870,14 @@ resource "google_container_node_pool" "pools" {
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
}

dynamic "confidential_nodes" {
for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
content {
enabled = confidential_nodes.value
}
}

}

lifecycle {
Expand Down Expand Up @@ -1150,6 +1158,14 @@ resource "google_container_node_pool" "windows_pools" {
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
}

dynamic "confidential_nodes" {
for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
content {
enabled = confidential_nodes.value
}
}

}

lifecycle {
Expand Down
19 changes: 18 additions & 1 deletion modules/beta-public-cluster-update-variant/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,8 @@ locals {
"enable_confidential_storage",
"consume_reservation_type",
"reservation_affinity_key",
"reservation_affinity_values"
"reservation_affinity_values",
"enable_confidential_nodes",
]
}

Expand Down Expand Up @@ -931,6 +932,14 @@ resource "google_container_node_pool" "pools" {
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
}

dynamic "confidential_nodes" {
for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
content {
enabled = confidential_nodes.value
}
}

}

lifecycle {
Expand Down Expand Up @@ -1212,6 +1221,14 @@ resource "google_container_node_pool" "windows_pools" {
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
}

dynamic "confidential_nodes" {
for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
content {
enabled = confidential_nodes.value
}
}

}

lifecycle {
Expand Down
16 changes: 16 additions & 0 deletions modules/beta-public-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,6 +849,14 @@ resource "google_container_node_pool" "pools" {
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
}

dynamic "confidential_nodes" {
for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
content {
enabled = confidential_nodes.value
}
}

}

lifecycle {
Expand Down Expand Up @@ -1129,6 +1137,14 @@ resource "google_container_node_pool" "windows_pools" {
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
}

dynamic "confidential_nodes" {
for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
content {
enabled = confidential_nodes.value
}
}

}

lifecycle {
Expand Down
19 changes: 18 additions & 1 deletion modules/private-cluster-update-variant/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,8 @@ locals {
"enable_confidential_storage",
"consume_reservation_type",
"reservation_affinity_key",
"reservation_affinity_values"
"reservation_affinity_values",
"enable_confidential_nodes",
]
}

Expand Down Expand Up @@ -875,6 +876,14 @@ resource "google_container_node_pool" "pools" {
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
}

dynamic "confidential_nodes" {
for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
content {
enabled = confidential_nodes.value
}
}

}

lifecycle {
Expand Down Expand Up @@ -1143,6 +1152,14 @@ resource "google_container_node_pool" "windows_pools" {
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
}

dynamic "confidential_nodes" {
for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
content {
enabled = confidential_nodes.value
}
}

}

lifecycle {
Expand Down
16 changes: 16 additions & 0 deletions modules/private-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,6 +793,14 @@ resource "google_container_node_pool" "pools" {
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
}

dynamic "confidential_nodes" {
for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
content {
enabled = confidential_nodes.value
}
}

}

lifecycle {
Expand Down Expand Up @@ -1060,6 +1068,14 @@ resource "google_container_node_pool" "windows_pools" {
enable_secure_boot = lookup(each.value, "enable_secure_boot", false)
enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
}

dynamic "confidential_nodes" {
for_each = lookup(each.value, "enable_confidential_nodes", null) != null ? [each.value.confidential_nodes] : []
content {
enabled = confidential_nodes.value
}
}

}

lifecycle {
Expand Down