Merge pull request #344 from kbst/remove-duplicate-variables

Fix duplicate variables from previous PRs, defaults for maintenance exclusions
kbst · Dec 9, 2024 · 278e2f4 · 278e2f4
2 parents f5280ec + 0c77b85
commit 278e2f4
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 39 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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."