feat: Add support for gVisor per node pool

LukaszCzarnotaSabre · LukaszCzarnotaSabre · commit 4d1f5ba3018a · 2021-09-21T16:52:37.000+02:00
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -577,9 +577,9 @@ resource "google_container_node_pool" "pools" {
     }
     {% if beta_cluster %}
     dynamic "sandbox_config" {
-      for_each = local.cluster_sandbox_enabled
-
+      for_each = tobool((lookup(each.value, "sandbox_enabled", var.sandbox_enabled))) ? ["gvisor"] : []
       content {
+
         sandbox_type = sandbox_config.value
       }
     }
diff --git a/autogen/main/main.tf.tmpl b/autogen/main/main.tf.tmpl
@@ -105,8 +105,6 @@ locals {
 
   cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
 
-  cluster_sandbox_enabled = var.sandbox_enabled ? ["gvisor"] : []
-
 {% endif %}
 
   cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -523,9 +523,9 @@ resource "google_container_node_pool" "pools" {
       }
     }
     dynamic "sandbox_config" {
-      for_each = local.cluster_sandbox_enabled
-
+      for_each = tobool((lookup(each.value, "sandbox_enabled", var.sandbox_enabled))) ? ["gvisor"] : []
       content {
+
         sandbox_type = sandbox_config.value
       }
     }
diff --git a/modules/beta-private-cluster-update-variant/main.tf b/modules/beta-private-cluster-update-variant/main.tf
@@ -96,8 +96,6 @@ locals {
 
   cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
 
-  cluster_sandbox_enabled = var.sandbox_enabled ? ["gvisor"] : []
-
 
   cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{
     security_group = var.authenticator_security_group
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -439,9 +439,9 @@ resource "google_container_node_pool" "pools" {
       }
     }
     dynamic "sandbox_config" {
-      for_each = local.cluster_sandbox_enabled
-
+      for_each = tobool((lookup(each.value, "sandbox_enabled", var.sandbox_enabled))) ? ["gvisor"] : []
       content {
+
         sandbox_type = sandbox_config.value
       }
     }
diff --git a/modules/beta-private-cluster/main.tf b/modules/beta-private-cluster/main.tf
@@ -96,8 +96,6 @@ locals {
 
   cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
 
-  cluster_sandbox_enabled = var.sandbox_enabled ? ["gvisor"] : []
-
 
   cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{
     security_group = var.authenticator_security_group
diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -504,9 +504,9 @@ resource "google_container_node_pool" "pools" {
       }
     }
     dynamic "sandbox_config" {
-      for_each = local.cluster_sandbox_enabled
-
+      for_each = tobool((lookup(each.value, "sandbox_enabled", var.sandbox_enabled))) ? ["gvisor"] : []
       content {
+
         sandbox_type = sandbox_config.value
       }
     }
diff --git a/modules/beta-public-cluster-update-variant/main.tf b/modules/beta-public-cluster-update-variant/main.tf
@@ -96,8 +96,6 @@ locals {
 
   cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
 
-  cluster_sandbox_enabled = var.sandbox_enabled ? ["gvisor"] : []
-
 
   cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{
     security_group = var.authenticator_security_group
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -420,9 +420,9 @@ resource "google_container_node_pool" "pools" {
       }
     }
     dynamic "sandbox_config" {
-      for_each = local.cluster_sandbox_enabled
-
+      for_each = tobool((lookup(each.value, "sandbox_enabled", var.sandbox_enabled))) ? ["gvisor"] : []
       content {
+
         sandbox_type = sandbox_config.value
       }
     }
diff --git a/modules/beta-public-cluster/main.tf b/modules/beta-public-cluster/main.tf
@@ -96,8 +96,6 @@ locals {
 
   cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
 
-  cluster_sandbox_enabled = var.sandbox_enabled ? ["gvisor"] : []
-
 
   cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{
     security_group = var.authenticator_security_group

Original file line number	Diff line number	Diff line change
`@@ -577,9 +577,9 @@ resource "google_container_node_pool" "pools" {`
`577`	`577`	`}`
`578`	`578`	`{% if beta_cluster %}`
`579`	`579`	`dynamic "sandbox_config" {`
`580`		`- for_each = local.cluster_sandbox_enabled`
`581`		`-`
	`580`	`+ for_each = tobool((lookup(each.value, "sandbox_enabled", var.sandbox_enabled))) ? ["gvisor"] : []`
`582`	`581`	`content {`
	`582`	`+`
`583`	`583`	`sandbox_type = sandbox_config.value`
`584`	`584`	`}`
`585`	`585`	`}`
Original file line number	Diff line number	Diff line change
`@@ -523,9 +523,9 @@ resource "google_container_node_pool" "pools" {`
`523`	`523`	`}`
`524`	`524`	`}`
`525`	`525`	`dynamic "sandbox_config" {`
`526`		`- for_each = local.cluster_sandbox_enabled`
`527`		`-`
	`526`	`+ for_each = tobool((lookup(each.value, "sandbox_enabled", var.sandbox_enabled))) ? ["gvisor"] : []`
`528`	`527`	`content {`
	`528`	`+`
`529`	`529`	`sandbox_type = sandbox_config.value`
`530`	`530`	`}`
`531`	`531`	`}`
Original file line number	Diff line number	Diff line change
`@@ -439,9 +439,9 @@ resource "google_container_node_pool" "pools" {`
`439`	`439`	`}`
`440`	`440`	`}`
`441`	`441`	`dynamic "sandbox_config" {`
`442`		`- for_each = local.cluster_sandbox_enabled`
`443`		`-`
	`442`	`+ for_each = tobool((lookup(each.value, "sandbox_enabled", var.sandbox_enabled))) ? ["gvisor"] : []`
`444`	`443`	`content {`
	`444`	`+`
`445`	`445`	`sandbox_type = sandbox_config.value`
`446`	`446`	`}`
`447`	`447`	`}`
Original file line number	Diff line number	Diff line change
`@@ -504,9 +504,9 @@ resource "google_container_node_pool" "pools" {`
`504`	`504`	`}`
`505`	`505`	`}`
`506`	`506`	`dynamic "sandbox_config" {`
`507`		`- for_each = local.cluster_sandbox_enabled`
`508`		`-`
	`507`	`+ for_each = tobool((lookup(each.value, "sandbox_enabled", var.sandbox_enabled))) ? ["gvisor"] : []`
`509`	`508`	`content {`
	`509`	`+`
`510`	`510`	`sandbox_type = sandbox_config.value`
`511`	`511`	`}`
`512`	`512`	`}`
Original file line number	Diff line number	Diff line change
`@@ -420,9 +420,9 @@ resource "google_container_node_pool" "pools" {`
`420`	`420`	`}`
`421`	`421`	`}`
`422`	`422`	`dynamic "sandbox_config" {`
`423`		`- for_each = local.cluster_sandbox_enabled`
`424`		`-`
	`423`	`+ for_each = tobool((lookup(each.value, "sandbox_enabled", var.sandbox_enabled))) ? ["gvisor"] : []`
`425`	`424`	`content {`
	`425`	`+`
`426`	`426`	`sandbox_type = sandbox_config.value`
`427`	`427`	`}`
`428`	`428`	`}`