back to curl

f0ssel · f0ssel · commit 2fc62a4ce851 · 2024-12-17T23:42:59.000Z
diff --git a/scaletest/terraform/action/coder_proxies.tf b/scaletest/terraform/action/coder_proxies.tf
@@ -20,8 +20,11 @@ resource "null_resource" "api_key" {
   provisioner "local-exec" {
     interpreter = ["/bin/bash", "-c"]
     command     = <<EOF
+<<<<<<< HEAD
 set -e
 
+=======
+>>>>>>> 46f631c0c (back to curl)
 curl '${local.deployments.primary.url}/api/v2/users/first' \
   --data-raw $'{"email":"${local.coder_admin_email}","password":"${local.coder_admin_password}","username":"${local.coder_admin_user}","name":"${local.coder_admin_full_name}","trial":false}' \
   --insecure --silent --output /dev/null
diff --git a/scaletest/terraform/action/coder_templates.tf b/scaletest/terraform/action/coder_templates.tf
@@ -98,7 +98,11 @@ resource "kubernetes_config_map" "template" {
   }
 }
 
+<<<<<<< HEAD
 resource "kubernetes_job" "push_template" {
+=======
+resource "kubernetes_pod" "push_template" {
+>>>>>>> 46f631c0c (back to curl)
   provider = kubernetes.primary
 
   metadata {
@@ -109,6 +113,7 @@ resource "kubernetes_job" "push_template" {
     }
   }
   spec {
+<<<<<<< HEAD
     completions = 1
     template {
       metadata {}
@@ -157,4 +162,50 @@ resource "kubernetes_job" "push_template" {
     }
   }
   wait_for_completion = true
+=======
+    affinity {
+      node_affinity {
+        required_during_scheduling_ignored_during_execution {
+          node_selector_term {
+            match_expressions {
+              key      = "cloud.google.com/gke-nodepool"
+              operator = "In"
+              values   = ["${google_container_node_pool.node_pool["primary_misc"].name}"]
+            }
+          }
+        }
+      }
+    }
+    container {
+      name  = "cli"
+      image = "${var.coder_image_repo}:${var.coder_image_tag}"
+      command = [
+        "/opt/coder",
+        "--verbose",
+        "--url=${local.deployments.primary.url}",
+        "--token=${trimspace(data.local_file.api_key.content)}",
+        "templates",
+        "push",
+        "--directory=/template",
+        "--yes",
+        "kubernetes"
+      ]
+      volume_mount {
+        name       = "coder-template"
+        mount_path = "/template"
+      }
+    }
+    volume {
+      name = "coder-template"
+      config_map {
+        name = kubernetes_config_map.template.metadata.0.name
+        items {
+          key  = "main.tf"
+          path = "main.tf"
+        }
+      }
+    }
+    restart_policy = "Never"
+  }
+>>>>>>> 46f631c0c (back to curl)
 }
diff --git a/scaletest/terraform/action/coderd.tf b/scaletest/terraform/action/coderd.tf
diff --git a/scaletest/terraform/action/k8s_coder_asia.tf b/scaletest/terraform/action/k8s_coder_asia.tf
@@ -36,7 +36,7 @@ resource "kubernetes_secret" "proxy_token_asia" {
     namespace = kubernetes_namespace.coder_asia.metadata.0.name
   }
   data = {
-    token = coderd_workspace_proxy.asia.session_token
+    token = trimspace(data.local_file.asia_proxy_token.content)
   }
   lifecycle {
     ignore_changes = [timeouts, wait_for_service_account_token]
diff --git a/scaletest/terraform/action/k8s_coder_europe.tf b/scaletest/terraform/action/k8s_coder_europe.tf
@@ -36,7 +36,7 @@ resource "kubernetes_secret" "proxy_token_europe" {
     namespace = kubernetes_namespace.coder_europe.metadata.0.name
   }
   data = {
-    token = coderd_workspace_proxy.europe.session_token
+    token = trimspace(data.local_file.europe_proxy_token.content)
   }
   lifecycle {
     ignore_changes = [timeouts, wait_for_service_account_token]
diff --git a/scaletest/terraform/action/vars.tf b/scaletest/terraform/action/vars.tf
@@ -87,15 +87,15 @@ variable "provisionerd_image_tag" {
 }
 
 // Traffic
-variable "traffic_bytes_per_tick" {
-  description = "Number of bytes to send per tick."
-  default     = 1024
-}
+# variable "traffic_bytes_per_tick" {
+#   description = "Number of bytes to send per tick."
+#   default     = 1024
+# }
 
-variable "traffic_tick_interval" {
-  description = "Interval between ticks."
-  default     = "1s"
-}
+# variable "traffic_tick_interval" {
+#   description = "Interval between ticks."
+#   default     = "10s"
+# }
 
 variable "workspace_count" {
   description = "Number of workspaces to create."
@@ -104,5 +104,5 @@ variable "workspace_count" {
 
 variable "workspace_create_concurrency" {
   description = "Number of workspaces to create concurrently."
-  default     = 1
+  default     = 10
 }
diff --git a/scaletest/terraform/action/workspace_traffic.tf b/scaletest/terraform/action/workspace_traffic.tf

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ resource "kubernetes_secret" "proxy_token_asia" {`
`36`	`36`	`namespace = kubernetes_namespace.coder_asia.metadata.0.name`
`37`	`37`	`}`
`38`	`38`	`data = {`
`39`		`- token = coderd_workspace_proxy.asia.session_token`
	`39`	`+ token = trimspace(data.local_file.asia_proxy_token.content)`
`40`	`40`	`}`
`41`	`41`	`lifecycle {`
`42`	`42`	`ignore_changes = [timeouts, wait_for_service_account_token]`