Merge pull request #1847 from Gilfar/fix-optional-gpu-driver

Fix validation and dynamic block for optional gpu_driver in gke-nodepool
GoogleCloudPlatform · Nov 8, 2023 · 39edc43 · 39edc43
2 parents c7bef58 + fca89b5
commit 39edc43
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/modules/gke-nodepool/main.tf b/modules/gke-nodepool/main.tf
@@ -168,10 +168,7 @@ resource "google_container_node_pool" "nodepool" {
         gpu_partition_size = var.node_config.guest_accelerator.gpu_driver == null ? null : var.node_config.guest_accelerator.gpu_driver.partition_size
 
         dynamic "gpu_sharing_config" {
-          for_each = lookup(
-            lookup(var.node_config.guest_accelerator, "gpu_driver", {}),
-            "max_shared_clients_per_gpu"
-          ) != null ? [""] : []
+          for_each = try(var.node_config.guest_accelerator.gpu_driver.max_shared_clients_per_gpu, null) != null ? [""] : []
           content {
             gpu_sharing_strategy       = var.node_config.guest_accelerator.gpu_driver.max_shared_clients_per_gpu != null ? "TIME_SHARING" : null
             max_shared_clients_per_gpu = var.node_config.guest_accelerator.gpu_driver.max_shared_clients_per_gpu

diff --git a/modules/gke-nodepool/variables.tf b/modules/gke-nodepool/variables.tf
@@ -100,7 +100,7 @@ variable "node_config" {
   validation {
     condition = (
       alltrue([
-        for k, v in var.node_config.guest_accelerator[*].gpu_driver : contains([
+        for k, v in try(var.node_config.guest_accelerator[0].gpu_driver, {}) : contains([
           "GPU_DRIVER_VERSION_UNSPECIFIED", "INSTALLATION_DISABLED",
           "DEFAULT", "LATEST"
         ], v.version)