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

Fix validation and dynamic block for optional gpu_driver in gke-nodepool
This commit is contained in:
Artur Pacan 2023-11-08 14:49:55 +01:00 committed by GitHub
commit 39edc43ddc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions

View File

@ -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

View File

@ -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)