address PR comments

coder · johnstcn · May 15, 2023 · May 5, 2023 · May 8, 2023 · May 8, 2023
commit 941970150c5cd7730dab1511abd65e0d90516d69
diff --git a/scaletest/terraform/coder.tf b/scaletest/terraform/coder.tf
@@ -3,7 +3,7 @@ data "google_client_config" "default" {}
 locals {
   coder_helm_repo    = "https://helm.coder.com/v2"
   coder_helm_chart   = "coder"
-  coder_release_name = "coder-${var.name}"
+  coder_release_name = var.name
   coder_namespace    = "coder-${var.name}"
   coder_admin_email  = "admin@coder.com"
   coder_admin_user   = "coder"
@@ -238,21 +238,6 @@ resource "local_file" "kubernetes_template" {
               }
             }
           }
-          pod_affinity {
-            preferred_during_scheduling_ignored_during_execution {
-              weight = 1
-              pod_affinity_term {
-                topology_key = "kubernetes.io/hostname"
-                label_selector {
-                  match_expressions {
-                    key      = "app.kubernetes.io/name"
-                    operator = "In"
-                    values   = ["coder-workspace"]
-                  }
-                }
-              }
-            }
-          }
         }
       }
     }

diff --git a/scaletest/terraform/gcp_cluster.tf b/scaletest/terraform/gcp_cluster.tf
@@ -3,7 +3,7 @@ data "google_compute_default_service_account" "default" {
 }
 
 resource "google_container_cluster" "primary" {
-  name            = "${var.name}-cluster"
+  name            = var.name
   location        = var.zone
   project         = var.project_id
   network         = google_compute_network.vpc.name
@@ -35,7 +35,7 @@ resource "google_container_cluster" "primary" {
 }
 
 resource "google_container_node_pool" "coder" {
-  name       = "${var.name}-node-pool-coder"
+  name       = "${var.name}-coder"
   location   = var.zone
   project    = var.project_id
   cluster    = google_container_cluster.primary.name
@@ -62,14 +62,10 @@ resource "google_container_node_pool" "coder" {
       disable-legacy-endpoints = "true"
     }
   }
-
-  depends_on = [
-    google_container_cluster.primary
-  ]
 }
 
 resource "google_container_node_pool" "workspaces" {
-  name       = "${var.name}-node-pool-workspaces"
+  name       = "${var.name}-workspaces"
   location   = var.zone
   project    = var.project_id
   cluster    = google_container_cluster.primary.name
@@ -96,14 +92,10 @@ resource "google_container_node_pool" "workspaces" {
       disable-legacy-endpoints = "true"
     }
   }
-
-  depends_on = [
-    google_container_cluster.primary
-  ]
 }
 
 resource "google_container_node_pool" "misc" {
-  name       = "${var.name}-node-pool-misc"
+  name       = "${var.name}-misc"
   location   = var.zone
   project    = var.project_id
   cluster    = google_container_cluster.primary.name
@@ -130,8 +122,4 @@ resource "google_container_node_pool" "misc" {
       disable-legacy-endpoints = "true"
     }
   }
-
-  depends_on = [
-    google_container_cluster.primary
-  ]
 }
diff --git a/scaletest/terraform/gcp_db.tf b/scaletest/terraform/gcp_db.tf
@@ -1,14 +1,5 @@
-data "google_compute_network" "default" {
-  project = var.project_id
-  name    = "default"
-}
-
-data "google_compute_global_address" "sql_peering" {
-  name = "sql-ip-address"
-}
-
 resource "google_sql_database_instance" "db" {
-  name                = "${var.name}-db"
+  name                = var.name
   region              = var.region
   database_version    = var.cloudsql_version
   deletion_protection = false
@@ -26,7 +17,7 @@ resource "google_sql_database_instance" "db" {
 
     database_flags {
       name  = "max_connections"
-      value = "500"
+      value = var.cloudsql_max_connections
     }
 
     ip_configuration {

diff --git a/scaletest/terraform/gcp_vpc.tf b/scaletest/terraform/gcp_vpc.tf
@@ -1,14 +1,14 @@
 resource "google_compute_network" "vpc" {
   project                 = var.project_id
-  name                    = "${var.name}-vpc"
+  name                    = var.name
   auto_create_subnetworks = "false"
   depends_on = [
     google_project_service.api["compute.googleapis.com"]
   ]
 }
 
 resource "google_compute_subnetwork" "subnet" {
-  name          = "${var.name}-subnet"
+  name          = var.name
   project       = var.project_id
   region        = var.region
   network       = google_compute_network.vpc.name

diff --git a/scaletest/terraform/vars.tf b/scaletest/terraform/vars.tf
@@ -87,6 +87,11 @@ variable "cloudsql_tier" {
   default     = "db-f1-micro"
 }
 
+variable "cloudsql_max_connections" {
+  description = "CloudSQL database max_connections"
+  default = 500
+}
+
 // These variables control the Coder deployment.
 variable "coder_replicas" {
   description = "Number of Coder replicas to provision"