feat: Add boot disk kms key variable (#516)

rebelthor · Daniel Patriche · web-flow · commit 9195f0fee88a · 2020-05-12T12:12:49.000-04:00
Co-authored-by: Daniel Patriche &lt;daniel@mambu.com&gt;
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -496,6 +496,8 @@ resource "google_container_node_pool" "pools" {
         sandbox_type = sandbox_config.value
       }
     }
+
+    boot_disk_kms_key = lookup(each.value, "boot_disk_kms_key", "")
     {% endif %}
 
     shielded_instance_config {
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -452,6 +452,8 @@ resource "google_container_node_pool" "pools" {
       }
     }
 
+    boot_disk_kms_key = lookup(each.value, "boot_disk_kms_key", "")
+
     shielded_instance_config {
       enable_secure_boot          = lookup(each.value, "enable_secure_boot", false)
       enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -380,6 +380,8 @@ resource "google_container_node_pool" "pools" {
       }
     }
 
+    boot_disk_kms_key = lookup(each.value, "boot_disk_kms_key", "")
+
     shielded_instance_config {
       enable_secure_boot          = lookup(each.value, "enable_secure_boot", false)
       enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -367,6 +367,8 @@ resource "google_container_node_pool" "pools" {
       }
     }
 
+    boot_disk_kms_key = lookup(each.value, "boot_disk_kms_key", "")
+
     shielded_instance_config {
       enable_secure_boot          = lookup(each.value, "enable_secure_boot", false)
       enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)

Original file line number	Diff line number	Diff line change
`@@ -496,6 +496,8 @@ resource "google_container_node_pool" "pools" {`
`496`	`496`	`sandbox_type = sandbox_config.value`
`497`	`497`	`}`
`498`	`498`	`}`
	`499`	`+`
	`500`	`+ boot_disk_kms_key = lookup(each.value, "boot_disk_kms_key", "")`
`499`	`501`	`{% endif %}`
`500`	`502`
`501`	`503`	`shielded_instance_config {`
Original file line number	Diff line number	Diff line change
`@@ -452,6 +452,8 @@ resource "google_container_node_pool" "pools" {`
`452`	`452`	`}`
`453`	`453`	`}`
`454`	`454`
	`455`	`+ boot_disk_kms_key = lookup(each.value, "boot_disk_kms_key", "")`
	`456`	`+`
`455`	`457`	`shielded_instance_config {`
`456`	`458`	`enable_secure_boot = lookup(each.value, "enable_secure_boot", false)`
`457`	`459`	`enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)`
Original file line number	Diff line number	Diff line change
`@@ -380,6 +380,8 @@ resource "google_container_node_pool" "pools" {`
`380`	`380`	`}`
`381`	`381`	`}`
`382`	`382`
	`383`	`+ boot_disk_kms_key = lookup(each.value, "boot_disk_kms_key", "")`
	`384`	`+`
`383`	`385`	`shielded_instance_config {`
`384`	`386`	`enable_secure_boot = lookup(each.value, "enable_secure_boot", false)`
`385`	`387`	`enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)`
Original file line number	Diff line number	Diff line change
`@@ -367,6 +367,8 @@ resource "google_container_node_pool" "pools" {`
`367`	`367`	`}`
`368`	`368`	`}`
`369`	`369`
	`370`	`+ boot_disk_kms_key = lookup(each.value, "boot_disk_kms_key", "")`
	`371`	`+`
`370`	`372`	`shielded_instance_config {`
`371`	`373`	`enable_secure_boot = lookup(each.value, "enable_secure_boot", false)`
`372`	`374`	`enable_integrity_monitoring = lookup(each.value, "enable_integrity_monitoring", true)`