multiple fixes

coder · johnstcn · May 15, 2023 · May 5, 2023 · May 8, 2023 · May 8, 2023
commit 2b5a15b64277b4b90788cfdddb68cebbfdb0cf30
diff --git a/scaletest/terraform/coder.tf b/scaletest/terraform/coder.tf
@@ -5,6 +5,8 @@ locals {
   coder_helm_chart   = "coder"
   coder_release_name = "coder-${var.name}"
   coder_namespace    = "coder-${var.name}"
+  coder_admin_email  = "admin@coder.com"
+  coder_admin_user   = "coder"
 }
 
 provider "kubernetes" {
@@ -45,7 +47,7 @@ resource "kubernetes_secret" "coder-db" {
     namespace = kubernetes_namespace.coder_namespace.metadata.0.name
   }
   data = {
-    url = "postgres://coder:${urlencode(random_password.coder-postgres-password.result)}@${google_sql_database_instance.db.private_ip_address}/${google_sql_database.coder.name}?sslmode=disable"
+    url = "postgres://${google_sql_user.coder.name}:${urlencode(random_password.coder-postgres-password.result)}@${google_sql_database_instance.db.private_ip_address}/${google_sql_database.coder.name}?sslmode=disable"
   }
 }
 
@@ -71,6 +73,10 @@ resource "tls_self_signed_cert" "coder" {
     "${local.coder_release_name}.${local.coder_namespace}",
     "${local.coder_release_name}",
   ]
+
+  ip_addresses = [
+    google_compute_address.coder.address
+  ]
 }
 
 resource "kubernetes_secret" "coder-tls" {
@@ -108,9 +114,29 @@ resource "helm_release" "coder-chart" {
   ]
   values = [<<EOF
 coder:
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: "cloud.google.com/gke-nodepool"
+            operator: "In"
+            values: ["${google_container_node_pool.workspaces.name}"]
+    podAntiAffinity:
+      preferredDuringSchedulingIgnoredDuringExecution:
+      - weight: 1
+        podAffinityTerm:
+          topologyKey: "kubernetes.io/hostname"
+          labelSelector:
+            matchExpressions:
+            - key:      "app.kubernetes.io/instance"
+              operator: "In"
+              values:   ["${local.coder_release_name}"]
   env:
     - name: "CODER_CACHE_DIRECTORY"
       value: "/tmp/coder"
+    - name: "CODER_ENABLE_TELEMETRY"
+      value: "false"
     - name: "CODER_LOGGING_HUMAN"
       value: "/dev/null"
     - name: "CODER_LOGGING_STACKDRIVER"
@@ -122,6 +148,8 @@ coder:
           key: url
     - name: "CODER_PROMETHEUS_ENABLE"
       value: "true"
+    - name: "CODER_TLS_REDIRECT_HTTP_TO_HTTPS"
+      value: "true"
     - name: "CODER_VERBOSE"
       value: "true"
   image:
@@ -139,6 +167,7 @@ coder:
     readOnlyRootFilesystem: true
   service:
     enable: true
+    loadBalancerIP: "${google_compute_address.coder.address}"
   tls:
     secretNames:
     - "${kubernetes_secret.coder-tls.metadata.0.name}"
@@ -169,6 +198,11 @@ EOF
   ]
 }
 
+resource "local_file" "url" {
+  filename = "${path.module}/coder_url"
+  content = "https://${google_compute_address.coder.address}"
+}
+
 resource "local_file" "kubernetes_template" {
   filename = "${path.module}/.coderv2/templates/kubernetes/main.tf"
   content = <<EOF
@@ -242,10 +276,10 @@ resource "local_file" "kubernetes_template" {
         affinity {
           node_affinity {
             required_during_scheduling_ignored_during_execution {
-              node_selector_terms {
+              node_selector_term {
                 match_expressions {
                   key = "cloud.google.com/gke-nodepool"
-                  operator = "in"
+                  operator = "In"
                   values = ["${google_container_node_pool.workspaces.name}"]
                 }
               }

diff --git a/scaletest/terraform/coder_init.sh b/scaletest/terraform/coder_init.sh
@@ -13,11 +13,14 @@ fi
 CODER_URL=$1
 CONFIG_DIR="${PWD}/.coderv2"
 ARCH="$(arch)"
+if [[ "$ARCH" == "x86_64" ]]; then
+	ARCH="amd64"
+fi
 PLATFORM="$(uname | tr '[:upper:]' '[:lower:]')"
 
 mkdir -p "${CONFIG_DIR}"
 echo "Fetching Coder CLI for first-time setup!"
-curl -fsSL "${CODER_URL}/bin/coder-${PLATFORM}-${ARCH}" -o "${CONFIG_DIR}/coder"
+curl -fsSLk "${CODER_URL}/bin/coder-${PLATFORM}-${ARCH}" -o "${CONFIG_DIR}/coder"
 chmod +x "${CONFIG_DIR}/coder"
 
 set +o pipefail

diff --git a/scaletest/terraform/gcp_db.tf b/scaletest/terraform/gcp_db.tf
@@ -54,7 +54,7 @@ resource "google_sql_database" "coder" {
 resource "google_sql_user" "coder" {
   project = var.project_id
   instance = google_sql_database_instance.db.id
-  name = "coder"
+  name = "${var.name}-coder"
   type = "BUILT_IN"
   password = random_password.coder-postgres-password.result
   # required for postgres, otherwise user fails to delete

diff --git a/scaletest/terraform/gcp_vpc.tf b/scaletest/terraform/gcp_vpc.tf
@@ -24,6 +24,14 @@ resource "google_compute_global_address" "sql_peering" {
   network       = google_compute_network.vpc.id
 }
 
+resource "google_compute_address" "coder" {
+  project       = var.project_id
+  region        = var.region
+  name          = "${var.name}-coder"
+  address_type  = "EXTERNAL"
+  network_tier  = "PREMIUM"
+}
+
 resource "google_service_networking_connection" "private_vpc_connection" {
   network = google_compute_network.vpc.id
   service = "servicenetworking.googleapis.com"