gke location var support

GoogleCloudPlatform · Mar 1, 2024 · 13a0e3a · 13a0e3a
1 parent 26e6d07
commit 13a0e3a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/applications/rag/main.tf b/applications/rag/main.tf
@@ -31,7 +31,7 @@ module "infra" {
 
   project_id        = var.project_id
   cluster_name      = var.cluster_name
-  cluster_region    = var.cluster_location
+  cluster_location    = var.cluster_location
   autopilot_cluster = var.autopilot_cluster
   private_cluster   = var.private_cluster
   create_network    = false

diff --git a/applications/rag/metadata.yaml b/applications/rag/metadata.yaml
@@ -20,7 +20,7 @@ spec:
       - name: add_auth
         description: Enable iap authentication on jupyterhub
         varType: bool
-        defaultValue: true
+        defaultValue: false
       - name: autopilot_cluster
         varType: bool
         defaultValue: false

diff --git a/applications/rag/variables.tf b/applications/rag/variables.tf
@@ -267,7 +267,7 @@ variable "cpu_pools" {
   type = list(object({
     name                   = string
     machine_type           = string
-    node_locations         = string
+    node_locations         = optional(string, "")
     autoscaling            = optional(bool, false)
     min_count              = optional(number, 1)
     max_count              = optional(number, 3)
@@ -289,7 +289,6 @@ variable "cpu_pools" {
   default = [{
     name           = "cpu-pool"
     machine_type   = "n1-standard-16"
-    node_locations = "us-central1-b,us-central1-c"
     autoscaling    = true
     min_count      = 1
     max_count      = 3
@@ -302,7 +301,7 @@ variable "gpu_pools" {
   type = list(object({
     name                   = string
     machine_type           = string
-    node_locations         = string
+    node_locations         = optional(string, "")
     autoscaling            = optional(bool, false)
     min_count              = optional(number, 1)
     max_count              = optional(number, 3)
@@ -326,7 +325,6 @@ variable "gpu_pools" {
   default = [{
     name               = "gpu-pool"
     machine_type       = "n1-standard-16"
-    node_locations     = "us-central1-b,us-central1-c"
     autoscaling        = true
     min_count          = 1
     max_count          = 3
@@ -339,7 +337,6 @@ variable "gpu_pools" {
     {
       name               = "gpu-pool-l4"
       machine_type       = "g2-standard-24"
-      node_locations     = "us-central1-a,us-central1-b"
       autoscaling        = true
       min_count          = 1
       max_count          = 3