diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl index 6f9f52209d..0f4df4c4c4 100644 --- a/autogen/main/cluster.tf.tmpl +++ b/autogen/main/cluster.tf.tmpl @@ -263,6 +263,22 @@ resource "google_container_cluster" "primary" { } metadata = local.node_pools_metadata["all"] + + {% if beta_cluster %} + dynamic "sandbox_config" { + for_each = tobool((lookup(var.node_pools[0], "sandbox_enabled", var.sandbox_enabled))) ? ["gvisor"] : [] + content { + sandbox_type = sandbox_config.value + } + } + + boot_disk_kms_key = lookup(var.node_pools[0], "boot_disk_kms_key", "") + {% endif %} + + shielded_instance_config { + enable_secure_boot = lookup(var.node_pools[0], "enable_secure_boot", false) + enable_integrity_monitoring = lookup(var.node_pools[0], "enable_integrity_monitoring", true) + } } } @@ -635,4 +651,3 @@ resource "google_container_node_pool" "pools" { delete = "45m" } } - diff --git a/cluster.tf b/cluster.tf index 3b829768fa..a0182f42fb 100644 --- a/cluster.tf +++ b/cluster.tf @@ -149,6 +149,12 @@ resource "google_container_cluster" "primary" { } metadata = local.node_pools_metadata["all"] + + + shielded_instance_config { + enable_secure_boot = lookup(var.node_pools[0], "enable_secure_boot", false) + enable_integrity_monitoring = lookup(var.node_pools[0], "enable_integrity_monitoring", true) + } } } @@ -330,4 +336,3 @@ resource "google_container_node_pool" "pools" { delete = "45m" } } - diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf index 970b4568c3..7c4f286884 100644 --- a/modules/beta-private-cluster-update-variant/cluster.tf +++ b/modules/beta-private-cluster-update-variant/cluster.tf @@ -236,6 +236,20 @@ resource "google_container_cluster" "primary" { } metadata = local.node_pools_metadata["all"] + + dynamic "sandbox_config" { + for_each = tobool((lookup(var.node_pools[0], "sandbox_enabled", var.sandbox_enabled))) ? ["gvisor"] : [] + content { + sandbox_type = sandbox_config.value + } + } + + boot_disk_kms_key = lookup(var.node_pools[0], "boot_disk_kms_key", "") + + shielded_instance_config { + enable_secure_boot = lookup(var.node_pools[0], "enable_secure_boot", false) + enable_integrity_monitoring = lookup(var.node_pools[0], "enable_integrity_monitoring", true) + } } } @@ -578,4 +592,3 @@ resource "google_container_node_pool" "pools" { delete = "45m" } } - diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf index 04aa845abf..e3da470065 100644 --- a/modules/beta-private-cluster/cluster.tf +++ b/modules/beta-private-cluster/cluster.tf @@ -236,6 +236,20 @@ resource "google_container_cluster" "primary" { } metadata = local.node_pools_metadata["all"] + + dynamic "sandbox_config" { + for_each = tobool((lookup(var.node_pools[0], "sandbox_enabled", var.sandbox_enabled))) ? ["gvisor"] : [] + content { + sandbox_type = sandbox_config.value + } + } + + boot_disk_kms_key = lookup(var.node_pools[0], "boot_disk_kms_key", "") + + shielded_instance_config { + enable_secure_boot = lookup(var.node_pools[0], "enable_secure_boot", false) + enable_integrity_monitoring = lookup(var.node_pools[0], "enable_integrity_monitoring", true) + } } } @@ -493,4 +507,3 @@ resource "google_container_node_pool" "pools" { delete = "45m" } } - diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf index fbde380f5d..2a8bddc9e1 100644 --- a/modules/beta-public-cluster-update-variant/cluster.tf +++ b/modules/beta-public-cluster-update-variant/cluster.tf @@ -236,6 +236,20 @@ resource "google_container_cluster" "primary" { } metadata = local.node_pools_metadata["all"] + + dynamic "sandbox_config" { + for_each = tobool((lookup(var.node_pools[0], "sandbox_enabled", var.sandbox_enabled))) ? ["gvisor"] : [] + content { + sandbox_type = sandbox_config.value + } + } + + boot_disk_kms_key = lookup(var.node_pools[0], "boot_disk_kms_key", "") + + shielded_instance_config { + enable_secure_boot = lookup(var.node_pools[0], "enable_secure_boot", false) + enable_integrity_monitoring = lookup(var.node_pools[0], "enable_integrity_monitoring", true) + } } } @@ -559,4 +573,3 @@ resource "google_container_node_pool" "pools" { delete = "45m" } } - diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf index 1268d04d4c..f8b0e98b2d 100644 --- a/modules/beta-public-cluster/cluster.tf +++ b/modules/beta-public-cluster/cluster.tf @@ -236,6 +236,20 @@ resource "google_container_cluster" "primary" { } metadata = local.node_pools_metadata["all"] + + dynamic "sandbox_config" { + for_each = tobool((lookup(var.node_pools[0], "sandbox_enabled", var.sandbox_enabled))) ? ["gvisor"] : [] + content { + sandbox_type = sandbox_config.value + } + } + + boot_disk_kms_key = lookup(var.node_pools[0], "boot_disk_kms_key", "") + + shielded_instance_config { + enable_secure_boot = lookup(var.node_pools[0], "enable_secure_boot", false) + enable_integrity_monitoring = lookup(var.node_pools[0], "enable_integrity_monitoring", true) + } } } @@ -474,4 +488,3 @@ resource "google_container_node_pool" "pools" { delete = "45m" } } - diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf index ce1342b05e..8f27c6fcf5 100644 --- a/modules/private-cluster-update-variant/cluster.tf +++ b/modules/private-cluster-update-variant/cluster.tf @@ -149,6 +149,12 @@ resource "google_container_cluster" "primary" { } metadata = local.node_pools_metadata["all"] + + + shielded_instance_config { + enable_secure_boot = lookup(var.node_pools[0], "enable_secure_boot", false) + enable_integrity_monitoring = lookup(var.node_pools[0], "enable_integrity_monitoring", true) + } } } @@ -428,4 +434,3 @@ resource "google_container_node_pool" "pools" { delete = "45m" } } - diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf index 1ec65d0ce8..ddd72f27d0 100644 --- a/modules/private-cluster/cluster.tf +++ b/modules/private-cluster/cluster.tf @@ -149,6 +149,12 @@ resource "google_container_cluster" "primary" { } metadata = local.node_pools_metadata["all"] + + + shielded_instance_config { + enable_secure_boot = lookup(var.node_pools[0], "enable_secure_boot", false) + enable_integrity_monitoring = lookup(var.node_pools[0], "enable_integrity_monitoring", true) + } } } @@ -343,4 +349,3 @@ resource "google_container_node_pool" "pools" { delete = "45m" } } -