diff --git a/google/_modules/gke/cluster.tf b/google/_modules/gke/cluster.tf index 9bdfc2c..b0f445d 100644 --- a/google/_modules/gke/cluster.tf +++ b/google/_modules/gke/cluster.tf @@ -74,7 +74,7 @@ resource "google_container_cluster" "current" { } dynamic "maintenance_exclusion" { - for_each = var.maintenance_exclusion_start_time != null ? [1] : [] + for_each = var.maintenance_exclusion_start_time != "" ? [1] : [] content { start_time = var.maintenance_exclusion_start_time diff --git a/google/_modules/gke/node_pool/variables.tf b/google/_modules/gke/node_pool/variables.tf index bda8659..7eb53a4 100644 --- a/google/_modules/gke/node_pool/variables.tf +++ b/google/_modules/gke/node_pool/variables.tf @@ -165,19 +165,6 @@ variable "network_config" { create_pod_range = bool pod_ipv4_cidr_block = string }) - description = "Additional network configuration for the node pool." -} - -variable "ephemeral_storage_local_ssd_config" { - type = object({ - local_ssd_count = number - }) - description = "`ephemeral_storage_local_ssd_config` block, useful for node groups with local SSD. Defaults to `null`" + description = "Configure additional pod IP address range for the node pool. Defaults to `null`" default = null } - -variable "labels" { - type = map(string) - description = "Kubernetes labels to set on the nodes created by the node pool. Merged with Kubestack default labels." - default = {} -} diff --git a/google/cluster/node-pool/configuration.tf b/google/cluster/node-pool/configuration.tf index 523be54..2e7f6c3 100644 --- a/google/cluster/node-pool/configuration.tf +++ b/google/cluster/node-pool/configuration.tf @@ -46,8 +46,4 @@ locals { network_config = local.cfg["network_config"] instance_tags = local.cfg["instance_tags"] - - ephemeral_storage_local_ssd_config = local.cfg["ephemeral_storage_local_ssd_config"] - - guest_accelerator = local.cfg["guest_accelerator"] } diff --git a/google/cluster/node-pool/main.tf b/google/cluster/node-pool/main.tf index 923024e..c6cf026 100644 --- a/google/cluster/node-pool/main.tf +++ b/google/cluster/node-pool/main.tf @@ -43,8 +43,4 @@ module "node_pool" { guest_accelerator = local.guest_accelerator network_config = local.network_config - - ephemeral_storage_local_ssd_config = local.ephemeral_storage_local_ssd_config - - guest_accelerator = local.guest_accelerator } diff --git a/google/cluster/node-pool/variables.tf b/google/cluster/node-pool/variables.tf index 4172b2d..190be1f 100644 --- a/google/cluster/node-pool/variables.tf +++ b/google/cluster/node-pool/variables.tf @@ -29,8 +29,6 @@ variable "configuration" { labels = optional(map(string)) - labels = optional(map(string)) - extra_oauth_scopes = optional(list(string)) node_workload_metadata_config = optional(string) @@ -58,20 +56,6 @@ variable "configuration" { })) instance_tags = optional(list(string)) - - ephemeral_storage_local_ssd_config = optional(object({ - local_ssd_count = number - })) - - guest_accelerator = optional(object({ - type = string - count = number - gpu_partition_size = optional(string) - gpu_sharing_config = optional(object({ - gpu_sharing_strategy = optional(string) - max_shared_clients_per_gpu = optional(number) - })) - })) })) description = "Map with per workspace cluster configuration."