add sole tenant node

apeabody · apeabody · commit 24573179ee49 · 2025-02-27T22:32:21.000Z
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -572,9 +572,9 @@ resource "google_container_cluster" "primary" {
           dynamic "node_affinity" {
             for_each = lookup(var.node_pools[0], "node_affinity", null) != null ? [lookup(var.node_pools[0], "node_affinity", null)] : []
             content {
-              key = jsondecode(node_affinity.value)["key"]
-              operator = jsondecode(node_affinity.value)["operator"]
-              values = jsondecode(node_affinity.value)["values"]
+              key = lookup(jsondecode(node_affinity.value), "key", null)
+              operator = lookup(jsondecode(node_affinity.value), "operator", null)
+              values = lookup(jsondecode(node_affinity.value), "values", [])
             }
           }
         }
@@ -1117,9 +1117,9 @@ resource "google_container_node_pool" "windows_pools" {
         dynamic "node_affinity" {
           for_each = lookup(each.value, "node_affinity", null) != null ? [lookup(each.value, "node_affinity", null)] : []
           content {
-            key = jsondecode(node_affinity.value)["key"]
-            operator = jsondecode(node_affinity.value)["operator"]
-            values = jsondecode(node_affinity.value)["values"]
+            key = lookup(jsondecode(node_affinity.value), "key", null)
+            operator = lookup(jsondecode(node_affinity.value), "operator", null)
+            values = lookup(jsondecode(node_affinity.value), "values", [])
           }
         }
       }
diff --git a/cluster.tf b/cluster.tf
@@ -448,9 +448,9 @@ resource "google_container_cluster" "primary" {
           dynamic "node_affinity" {
             for_each = lookup(var.node_pools[0], "node_affinity", null) != null ? [lookup(var.node_pools[0], "node_affinity", null)] : []
             content {
-              key      = jsondecode(node_affinity.value)["key"]
-              operator = jsondecode(node_affinity.value)["operator"]
-              values   = jsondecode(node_affinity.value)["values"]
+              key      = lookup(jsondecode(node_affinity.value), "key", null)
+              operator = lookup(jsondecode(node_affinity.value), "operator", null)
+              values   = lookup(jsondecode(node_affinity.value), "values", [])
             }
           }
         }
@@ -824,9 +824,9 @@ resource "google_container_node_pool" "pools" {
         dynamic "node_affinity" {
           for_each = lookup(each.value, "node_affinity", null) != null ? [lookup(each.value, "node_affinity", null)] : []
           content {
-            key      = jsondecode(node_affinity.value)["key"]
-            operator = jsondecode(node_affinity.value)["operator"]
-            values   = jsondecode(node_affinity.value)["values"]
+            key      = lookup(jsondecode(node_affinity.value), "key", null)
+            operator = lookup(jsondecode(node_affinity.value), "operator", null)
+            values   = lookup(jsondecode(node_affinity.value), "values", [])
           }
         }
       }
@@ -1140,9 +1140,9 @@ resource "google_container_node_pool" "windows_pools" {
         dynamic "node_affinity" {
           for_each = lookup(each.value, "node_affinity", null) != null ? [lookup(each.value, "node_affinity", null)] : []
           content {
-            key      = jsondecode(node_affinity.value)["key"]
-            operator = jsondecode(node_affinity.value)["operator"]
-            values   = jsondecode(node_affinity.value)["values"]
+            key      = lookup(jsondecode(node_affinity.value), "key", null)
+            operator = lookup(jsondecode(node_affinity.value), "operator", null)
+            values   = lookup(jsondecode(node_affinity.value), "values", [])
           }
         }
       }
diff --git a/examples/node_pool/main.tf b/examples/node_pool/main.tf
@@ -101,7 +101,8 @@ module "gke" {
     {
       name          = "pool-06"
       node_count    = 1
-      node_affinity = "{\"key\": \"compute.googleapis.com/node-group-name\", \"operator\": \"IN\", \"values\": [\"node-group-name\"]}"
+      machine_type  = "n1-highmem-96"
+      node_affinity = "{\"key\": \"compute.googleapis.com/node-group-name\", \"operator\": \"IN\", \"values\": [\"${google_compute_node_group.soletenant-nodes.name}\"]}"
     },
   ]
 
@@ -163,3 +164,18 @@ module "gke" {
     pool-01 = "CGROUP_MODE_V2"
   }
 }
+
+resource "google_compute_node_template" "soletenant-tmpl" {
+  name   = "soletenant-tmpl-${var.cluster_name_suffix}"
+  region = var.region
+
+  node_type = "n1-node-96-624"
+}
+
+resource "google_compute_node_group" "soletenant-nodes" {
+  name = "soletenant-node-group-${var.cluster_name_suffix}"
+  zone = var.zones[0]
+
+  initial_size  = 1
+  node_template = google_compute_node_template.soletenant-tmpl.id
+}
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -485,9 +485,9 @@ resource "google_container_cluster" "primary" {
           dynamic "node_affinity" {
             for_each = lookup(var.node_pools[0], "node_affinity", null) != null ? [lookup(var.node_pools[0], "node_affinity", null)] : []
             content {
-              key      = jsondecode(node_affinity.value)["key"]
-              operator = jsondecode(node_affinity.value)["operator"]
-              values   = jsondecode(node_affinity.value)["values"]
+              key      = lookup(jsondecode(node_affinity.value), "key", null)
+              operator = lookup(jsondecode(node_affinity.value), "operator", null)
+              values   = lookup(jsondecode(node_affinity.value), "values", [])
             }
           }
         }
@@ -987,9 +987,9 @@ resource "google_container_node_pool" "pools" {
         dynamic "node_affinity" {
           for_each = lookup(each.value, "node_affinity", null) != null ? [lookup(each.value, "node_affinity", null)] : []
           content {
-            key      = jsondecode(node_affinity.value)["key"]
-            operator = jsondecode(node_affinity.value)["operator"]
-            values   = jsondecode(node_affinity.value)["values"]
+            key      = lookup(jsondecode(node_affinity.value), "key", null)
+            operator = lookup(jsondecode(node_affinity.value), "operator", null)
+            values   = lookup(jsondecode(node_affinity.value), "values", [])
           }
         }
       }
@@ -1317,9 +1317,9 @@ resource "google_container_node_pool" "windows_pools" {
         dynamic "node_affinity" {
           for_each = lookup(each.value, "node_affinity", null) != null ? [lookup(each.value, "node_affinity", null)] : []
           content {
-            key      = jsondecode(node_affinity.value)["key"]
-            operator = jsondecode(node_affinity.value)["operator"]
-            values   = jsondecode(node_affinity.value)["values"]
+            key      = lookup(jsondecode(node_affinity.value), "key", null)
+            operator = lookup(jsondecode(node_affinity.value), "operator", null)
+            values   = lookup(jsondecode(node_affinity.value), "values", [])
           }
         }
       }
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -485,9 +485,9 @@ resource "google_container_cluster" "primary" {
           dynamic "node_affinity" {
             for_each = lookup(var.node_pools[0], "node_affinity", null) != null ? [lookup(var.node_pools[0], "node_affinity", null)] : []
             content {
-              key      = jsondecode(node_affinity.value)["key"]
-              operator = jsondecode(node_affinity.value)["operator"]
-              values   = jsondecode(node_affinity.value)["values"]
+              key      = lookup(jsondecode(node_affinity.value), "key", null)
+              operator = lookup(jsondecode(node_affinity.value), "operator", null)
+              values   = lookup(jsondecode(node_affinity.value), "values", [])
             }
           }
         }
@@ -906,9 +906,9 @@ resource "google_container_node_pool" "pools" {
         dynamic "node_affinity" {
           for_each = lookup(each.value, "node_affinity", null) != null ? [lookup(each.value, "node_affinity", null)] : []
           content {
-            key      = jsondecode(node_affinity.value)["key"]
-            operator = jsondecode(node_affinity.value)["operator"]
-            values   = jsondecode(node_affinity.value)["values"]
+            key      = lookup(jsondecode(node_affinity.value), "key", null)
+            operator = lookup(jsondecode(node_affinity.value), "operator", null)
+            values   = lookup(jsondecode(node_affinity.value), "values", [])
           }
         }
       }
@@ -1235,9 +1235,9 @@ resource "google_container_node_pool" "windows_pools" {
         dynamic "node_affinity" {
           for_each = lookup(each.value, "node_affinity", null) != null ? [lookup(each.value, "node_affinity", null)] : []
           content {
-            key      = jsondecode(node_affinity.value)["key"]
-            operator = jsondecode(node_affinity.value)["operator"]
-            values   = jsondecode(node_affinity.value)["values"]
+            key      = lookup(jsondecode(node_affinity.value), "key", null)
+            operator = lookup(jsondecode(node_affinity.value), "operator", null)
+            values   = lookup(jsondecode(node_affinity.value), "values", [])
           }
         }
       }
diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -485,9 +485,9 @@ resource "google_container_cluster" "primary" {
           dynamic "node_affinity" {
             for_each = lookup(var.node_pools[0], "node_affinity", null) != null ? [lookup(var.node_pools[0], "node_affinity", null)] : []
             content {
-              key      = jsondecode(node_affinity.value)["key"]
-              operator = jsondecode(node_affinity.value)["operator"]
-              values   = jsondecode(node_affinity.value)["values"]
+              key      = lookup(jsondecode(node_affinity.value), "key", null)
+              operator = lookup(jsondecode(node_affinity.value), "operator", null)
+              values   = lookup(jsondecode(node_affinity.value), "values", [])
             }
           }
         }
@@ -957,9 +957,9 @@ resource "google_container_node_pool" "pools" {
         dynamic "node_affinity" {
           for_each = lookup(each.value, "node_affinity", null) != null ? [lookup(each.value, "node_affinity", null)] : []
           content {
-            key      = jsondecode(node_affinity.value)["key"]
-            operator = jsondecode(node_affinity.value)["operator"]
-            values   = jsondecode(node_affinity.value)["values"]
+            key      = lookup(jsondecode(node_affinity.value), "key", null)
+            operator = lookup(jsondecode(node_affinity.value), "operator", null)
+            values   = lookup(jsondecode(node_affinity.value), "values", [])
           }
         }
       }
@@ -1287,9 +1287,9 @@ resource "google_container_node_pool" "windows_pools" {
         dynamic "node_affinity" {
           for_each = lookup(each.value, "node_affinity", null) != null ? [lookup(each.value, "node_affinity", null)] : []
           content {
-            key      = jsondecode(node_affinity.value)["key"]
-            operator = jsondecode(node_affinity.value)["operator"]
-            values   = jsondecode(node_affinity.value)["values"]
+            key      = lookup(jsondecode(node_affinity.value), "key", null)
+            operator = lookup(jsondecode(node_affinity.value), "operator", null)
+            values   = lookup(jsondecode(node_affinity.value), "values", [])
           }
         }
       }
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -485,9 +485,9 @@ resource "google_container_cluster" "primary" {
           dynamic "node_affinity" {
             for_each = lookup(var.node_pools[0], "node_affinity", null) != null ? [lookup(var.node_pools[0], "node_affinity", null)] : []
             content {
-              key      = jsondecode(node_affinity.value)["key"]
-              operator = jsondecode(node_affinity.value)["operator"]
-              values   = jsondecode(node_affinity.value)["values"]
+              key      = lookup(jsondecode(node_affinity.value), "key", null)
+              operator = lookup(jsondecode(node_affinity.value), "operator", null)
+              values   = lookup(jsondecode(node_affinity.value), "values", [])
             }
           }
         }
@@ -876,9 +876,9 @@ resource "google_container_node_pool" "pools" {
         dynamic "node_affinity" {
           for_each = lookup(each.value, "node_affinity", null) != null ? [lookup(each.value, "node_affinity", null)] : []
           content {
-            key      = jsondecode(node_affinity.value)["key"]
-            operator = jsondecode(node_affinity.value)["operator"]
-            values   = jsondecode(node_affinity.value)["values"]
+            key      = lookup(jsondecode(node_affinity.value), "key", null)
+            operator = lookup(jsondecode(node_affinity.value), "operator", null)
+            values   = lookup(jsondecode(node_affinity.value), "values", [])
           }
         }
       }
@@ -1205,9 +1205,9 @@ resource "google_container_node_pool" "windows_pools" {
         dynamic "node_affinity" {
           for_each = lookup(each.value, "node_affinity", null) != null ? [lookup(each.value, "node_affinity", null)] : []
           content {
-            key      = jsondecode(node_affinity.value)["key"]
-            operator = jsondecode(node_affinity.value)["operator"]
-            values   = jsondecode(node_affinity.value)["values"]
+            key      = lookup(jsondecode(node_affinity.value), "key", null)
+            operator = lookup(jsondecode(node_affinity.value), "operator", null)
+            values   = lookup(jsondecode(node_affinity.value), "values", [])
           }
         }
       }
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -448,9 +448,9 @@ resource "google_container_cluster" "primary" {
           dynamic "node_affinity" {
             for_each = lookup(var.node_pools[0], "node_affinity", null) != null ? [lookup(var.node_pools[0], "node_affinity", null)] : []
             content {
-              key      = jsondecode(node_affinity.value)["key"]
-              operator = jsondecode(node_affinity.value)["operator"]
-              values   = jsondecode(node_affinity.value)["values"]
+              key      = lookup(jsondecode(node_affinity.value), "key", null)
+              operator = lookup(jsondecode(node_affinity.value), "operator", null)
+              values   = lookup(jsondecode(node_affinity.value), "values", [])
             }
           }
         }
@@ -934,9 +934,9 @@ resource "google_container_node_pool" "pools" {
         dynamic "node_affinity" {
           for_each = lookup(each.value, "node_affinity", null) != null ? [lookup(each.value, "node_affinity", null)] : []
           content {
-            key      = jsondecode(node_affinity.value)["key"]
-            operator = jsondecode(node_affinity.value)["operator"]
-            values   = jsondecode(node_affinity.value)["values"]
+            key      = lookup(jsondecode(node_affinity.value), "key", null)
+            operator = lookup(jsondecode(node_affinity.value), "operator", null)
+            values   = lookup(jsondecode(node_affinity.value), "values", [])
           }
         }
       }
@@ -1251,9 +1251,9 @@ resource "google_container_node_pool" "windows_pools" {
         dynamic "node_affinity" {
           for_each = lookup(each.value, "node_affinity", null) != null ? [lookup(each.value, "node_affinity", null)] : []
           content {
-            key      = jsondecode(node_affinity.value)["key"]
-            operator = jsondecode(node_affinity.value)["operator"]
-            values   = jsondecode(node_affinity.value)["values"]
+            key      = lookup(jsondecode(node_affinity.value), "key", null)
+            operator = lookup(jsondecode(node_affinity.value), "operator", null)
+            values   = lookup(jsondecode(node_affinity.value), "values", [])
           }
         }
       }
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -448,9 +448,9 @@ resource "google_container_cluster" "primary" {
           dynamic "node_affinity" {
             for_each = lookup(var.node_pools[0], "node_affinity", null) != null ? [lookup(var.node_pools[0], "node_affinity", null)] : []
             content {
-              key      = jsondecode(node_affinity.value)["key"]
-              operator = jsondecode(node_affinity.value)["operator"]
-              values   = jsondecode(node_affinity.value)["values"]
+              key      = lookup(jsondecode(node_affinity.value), "key", null)
+              operator = lookup(jsondecode(node_affinity.value), "operator", null)
+              values   = lookup(jsondecode(node_affinity.value), "values", [])
             }
           }
         }
@@ -854,9 +854,9 @@ resource "google_container_node_pool" "pools" {
         dynamic "node_affinity" {
           for_each = lookup(each.value, "node_affinity", null) != null ? [lookup(each.value, "node_affinity", null)] : []
           content {
-            key      = jsondecode(node_affinity.value)["key"]
-            operator = jsondecode(node_affinity.value)["operator"]
-            values   = jsondecode(node_affinity.value)["values"]
+            key      = lookup(jsondecode(node_affinity.value), "key", null)
+            operator = lookup(jsondecode(node_affinity.value), "operator", null)
+            values   = lookup(jsondecode(node_affinity.value), "values", [])
           }
         }
       }
@@ -1170,9 +1170,9 @@ resource "google_container_node_pool" "windows_pools" {
         dynamic "node_affinity" {
           for_each = lookup(each.value, "node_affinity", null) != null ? [lookup(each.value, "node_affinity", null)] : []
           content {
-            key      = jsondecode(node_affinity.value)["key"]
-            operator = jsondecode(node_affinity.value)["operator"]
-            values   = jsondecode(node_affinity.value)["values"]
+            key      = lookup(jsondecode(node_affinity.value), "key", null)
+            operator = lookup(jsondecode(node_affinity.value), "operator", null)
+            values   = lookup(jsondecode(node_affinity.value), "values", [])
           }
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -572,9 +572,9 @@ resource "google_container_cluster" "primary" {`
`572`	`572`	`dynamic "node_affinity" {`
`573`	`573`	`for_each = lookup(var.node_pools[0], "node_affinity", null) != null ? [lookup(var.node_pools[0], "node_affinity", null)] : []`
`574`	`574`	`content {`
`575`		`- key = jsondecode(node_affinity.value)["key"]`
`576`		`- operator = jsondecode(node_affinity.value)["operator"]`
`577`		`- values = jsondecode(node_affinity.value)["values"]`
	`575`	`+ key = lookup(jsondecode(node_affinity.value), "key", null)`
	`576`	`+ operator = lookup(jsondecode(node_affinity.value), "operator", null)`
	`577`	`+ values = lookup(jsondecode(node_affinity.value), "values", [])`
`578`	`578`	`}`
`579`	`579`	`}`
`580`	`580`	`}`
`@@ -1117,9 +1117,9 @@ resource "google_container_node_pool" "windows_pools" {`
`1117`	`1117`	`dynamic "node_affinity" {`
`1118`	`1118`	`for_each = lookup(each.value, "node_affinity", null) != null ? [lookup(each.value, "node_affinity", null)] : []`
`1119`	`1119`	`content {`
`1120`		`- key = jsondecode(node_affinity.value)["key"]`
`1121`		`- operator = jsondecode(node_affinity.value)["operator"]`
`1122`		`- values = jsondecode(node_affinity.value)["values"]`
	`1120`	`+ key = lookup(jsondecode(node_affinity.value), "key", null)`
	`1121`	`+ operator = lookup(jsondecode(node_affinity.value), "operator", null)`
	`1122`	`+ values = lookup(jsondecode(node_affinity.value), "values", [])`
`1123`	`1123`	`}`
`1124`	`1124`	`}`
`1125`	`1125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -448,9 +448,9 @@ resource "google_container_cluster" "primary" {`
`448`	`448`	`dynamic "node_affinity" {`
`449`	`449`	`for_each = lookup(var.node_pools[0], "node_affinity", null) != null ? [lookup(var.node_pools[0], "node_affinity", null)] : []`
`450`	`450`	`content {`
`451`		`- key = jsondecode(node_affinity.value)["key"]`
`452`		`- operator = jsondecode(node_affinity.value)["operator"]`
`453`		`- values = jsondecode(node_affinity.value)["values"]`
	`451`	`+ key = lookup(jsondecode(node_affinity.value), "key", null)`
	`452`	`+ operator = lookup(jsondecode(node_affinity.value), "operator", null)`
	`453`	`+ values = lookup(jsondecode(node_affinity.value), "values", [])`
`454`	`454`	`}`
`455`	`455`	`}`
`456`	`456`	`}`
`@@ -824,9 +824,9 @@ resource "google_container_node_pool" "pools" {`
`824`	`824`	`dynamic "node_affinity" {`
`825`	`825`	`for_each = lookup(each.value, "node_affinity", null) != null ? [lookup(each.value, "node_affinity", null)] : []`
`826`	`826`	`content {`
`827`		`- key = jsondecode(node_affinity.value)["key"]`
`828`		`- operator = jsondecode(node_affinity.value)["operator"]`
`829`		`- values = jsondecode(node_affinity.value)["values"]`
	`827`	`+ key = lookup(jsondecode(node_affinity.value), "key", null)`
	`828`	`+ operator = lookup(jsondecode(node_affinity.value), "operator", null)`
	`829`	`+ values = lookup(jsondecode(node_affinity.value), "values", [])`
`830`	`830`	`}`
`831`	`831`	`}`
`832`	`832`	`}`
`@@ -1140,9 +1140,9 @@ resource "google_container_node_pool" "windows_pools" {`
`1140`	`1140`	`dynamic "node_affinity" {`
`1141`	`1141`	`for_each = lookup(each.value, "node_affinity", null) != null ? [lookup(each.value, "node_affinity", null)] : []`
`1142`	`1142`	`content {`
`1143`		`- key = jsondecode(node_affinity.value)["key"]`
`1144`		`- operator = jsondecode(node_affinity.value)["operator"]`
`1145`		`- values = jsondecode(node_affinity.value)["values"]`
	`1143`	`+ key = lookup(jsondecode(node_affinity.value), "key", null)`
	`1144`	`+ operator = lookup(jsondecode(node_affinity.value), "operator", null)`
	`1145`	`+ values = lookup(jsondecode(node_affinity.value), "values", [])`
`1146`	`1146`	`}`
`1147`	`1147`	`}`
`1148`	`1148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -485,9 +485,9 @@ resource "google_container_cluster" "primary" {`
`485`	`485`	`dynamic "node_affinity" {`
`486`	`486`	`for_each = lookup(var.node_pools[0], "node_affinity", null) != null ? [lookup(var.node_pools[0], "node_affinity", null)] : []`
`487`	`487`	`content {`
`488`		`- key = jsondecode(node_affinity.value)["key"]`
`489`		`- operator = jsondecode(node_affinity.value)["operator"]`
`490`		`- values = jsondecode(node_affinity.value)["values"]`
	`488`	`+ key = lookup(jsondecode(node_affinity.value), "key", null)`
	`489`	`+ operator = lookup(jsondecode(node_affinity.value), "operator", null)`
	`490`	`+ values = lookup(jsondecode(node_affinity.value), "values", [])`
`491`	`491`	`}`
`492`	`492`	`}`
`493`	`493`	`}`
`@@ -987,9 +987,9 @@ resource "google_container_node_pool" "pools" {`
`987`	`987`	`dynamic "node_affinity" {`
`988`	`988`	`for_each = lookup(each.value, "node_affinity", null) != null ? [lookup(each.value, "node_affinity", null)] : []`
`989`	`989`	`content {`
`990`		`- key = jsondecode(node_affinity.value)["key"]`
`991`		`- operator = jsondecode(node_affinity.value)["operator"]`
`992`		`- values = jsondecode(node_affinity.value)["values"]`
	`990`	`+ key = lookup(jsondecode(node_affinity.value), "key", null)`
	`991`	`+ operator = lookup(jsondecode(node_affinity.value), "operator", null)`
	`992`	`+ values = lookup(jsondecode(node_affinity.value), "values", [])`
`993`	`993`	`}`
`994`	`994`	`}`
`995`	`995`	`}`
`@@ -1317,9 +1317,9 @@ resource "google_container_node_pool" "windows_pools" {`
`1317`	`1317`	`dynamic "node_affinity" {`
`1318`	`1318`	`for_each = lookup(each.value, "node_affinity", null) != null ? [lookup(each.value, "node_affinity", null)] : []`
`1319`	`1319`	`content {`
`1320`		`- key = jsondecode(node_affinity.value)["key"]`
`1321`		`- operator = jsondecode(node_affinity.value)["operator"]`
`1322`		`- values = jsondecode(node_affinity.value)["values"]`
	`1320`	`+ key = lookup(jsondecode(node_affinity.value), "key", null)`
	`1321`	`+ operator = lookup(jsondecode(node_affinity.value), "operator", null)`
	`1322`	`+ values = lookup(jsondecode(node_affinity.value), "values", [])`
`1323`	`1323`	`}`
`1324`	`1324`	`}`
`1325`	`1325`	`}`