fmt

f0ssel · f0ssel · commit bbad08e0d433 · 2024-12-09T18:19:52.000Z
diff --git a/scaletest/terraform/action/deployments.tf b/scaletest/terraform/action/deployments.tf
@@ -27,34 +27,34 @@ locals {
     small = {
       coder = {
         nodepool_size = 1
-        machine_type = "t2d-standard-4"
-        replicas = 1
-        cpu_request = "1000m"
-        mem_request = "6Gi"
-        cpu_limit = "2000m"
-        mem_limit = "12Gi"
+        machine_type  = "t2d-standard-4"
+        replicas      = 1
+        cpu_request   = "1000m"
+        mem_request   = "6Gi"
+        cpu_limit     = "2000m"
+        mem_limit     = "12Gi"
       }
       provisionerd = {
-        replicas = 1
+        replicas    = 1
         cpu_request = "100m"
         mem_request = "1Gi"
-        cpu_limit = "1000m"
-        mem_limit = "1Gi"
+        cpu_limit   = "1000m"
+        mem_limit   = "1Gi"
       }
       workspaces = {
         nodepool_size = 1
-        machine_type = "t2d-standard-4"
-        cpu_request = "100m"
-        mem_request = "128Mi"
-        cpu_limit = "100m"
-        mem_limit = "128Mi"
+        machine_type  = "t2d-standard-4"
+        cpu_request   = "100m"
+        mem_request   = "128Mi"
+        cpu_limit     = "100m"
+        mem_limit     = "128Mi"
       }
       misc = {
         nodepool_size = 1
-        machine_type = "t2d-standard-4"
+        machine_type  = "t2d-standard-4"
       }
       cloudsql = {
-        tier = "db-f1-micro"
+        tier            = "db-f1-micro"
         max_connections = 500
       }
     }
diff --git a/scaletest/terraform/action/gcp_clusters.tf b/scaletest/terraform/action/gcp_clusters.tf
@@ -90,11 +90,11 @@ resource "google_container_cluster" "cluster" {
 }
 
 resource "google_container_node_pool" "node_pool" {
-  for_each = local.node_pools
-  name     = each.value.name
-  location = local.deployments[each.value.cluster].zone
-  project  = var.project_id
-  cluster  = google_container_cluster.cluster[each.value.cluster].name
+  for_each   = local.node_pools
+  name       = each.value.name
+  location   = local.deployments[each.value.cluster].zone
+  project    = var.project_id
+  cluster    = google_container_cluster.cluster[each.value.cluster].name
   node_count = local.scenarios[var.scenario][each.value.name].nodepool_size
   node_config {
     oauth_scopes = [
diff --git a/scaletest/terraform/action/k8s_coder_asia.tf b/scaletest/terraform/action/k8s_coder_asia.tf
@@ -7,6 +7,8 @@ resource "kubernetes_namespace" "coder_asia" {
   lifecycle {
     ignore_changes = [timeouts, wait_for_default_service_account]
   }
+
+  depends_on = [google_container_node_pool.node_pool["asia_misc"]]
 }
 
 resource "kubernetes_secret" "provisionerd_psk_asia" {
diff --git a/scaletest/terraform/action/k8s_coder_europe.tf b/scaletest/terraform/action/k8s_coder_europe.tf
@@ -7,6 +7,8 @@ resource "kubernetes_namespace" "coder_europe" {
   lifecycle {
     ignore_changes = [timeouts, wait_for_default_service_account]
   }
+
+  depends_on = [google_container_node_pool.node_pool["europe_misc"]]
 }
 
 resource "kubernetes_secret" "provisionerd_psk_europe" {
diff --git a/scaletest/terraform/action/k8s_coder_primary.tf b/scaletest/terraform/action/k8s_coder_primary.tf
@@ -27,6 +27,8 @@ resource "kubernetes_namespace" "coder_primary" {
   lifecycle {
     ignore_changes = [timeouts, wait_for_default_service_account]
   }
+
+  depends_on = [google_container_node_pool.node_pool["primary_misc"]]
 }
 
 resource "kubernetes_secret" "coder_db" {
diff --git a/scaletest/terraform/action/vars.tf b/scaletest/terraform/action/vars.tf
@@ -5,7 +5,7 @@ variable "name" {
 variable "scenario" {
   description = "The scenario to deploy"
   validation {
-    condition = contains(["small", "medium", "large"], var.scenario)
+    condition     = contains(["small", "medium", "large"], var.scenario)
     error_message = "Scenario must be one of small, medium, or large"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ resource "kubernetes_namespace" "coder_asia" {`
`7`	`7`	`lifecycle {`
`8`	`8`	`ignore_changes = [timeouts, wait_for_default_service_account]`
`9`	`9`	`}`
	`10`	`+`
	`11`	`+ depends_on = [google_container_node_pool.node_pool["asia_misc"]]`
`10`	`12`	`}`
`11`	`13`
`12`	`14`	`resource "kubernetes_secret" "provisionerd_psk_asia" {`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@ resource "kubernetes_namespace" "coder_primary" {`
`27`	`27`	`lifecycle {`
`28`	`28`	`ignore_changes = [timeouts, wait_for_default_service_account]`
`29`	`29`	`}`
	`30`	`+`
	`31`	`+ depends_on = [google_container_node_pool.node_pool["primary_misc"]]`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`resource "kubernetes_secret" "coder_db" {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ variable "name" {`
`5`	`5`	`variable "scenario" {`
`6`	`6`	`description = "The scenario to deploy"`
`7`	`7`	`validation {`
`8`		`- condition = contains(["small", "medium", "large"], var.scenario)`
	`8`	`+ condition = contains(["small", "medium", "large"], var.scenario)`
`9`	`9`	`error_message = "Scenario must be one of small, medium, or large"`
`10`	`10`	`}`
`11`	`11`	`}`