push template

f0ssel · f0ssel · commit 49936330f5df · 2024-12-17T23:45:06.000Z
diff --git a/scaletest/terraform/action/coder_proxies.tf b/scaletest/terraform/action/coder_proxies.tf
@@ -20,11 +20,8 @@ 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,11 +98,7 @@ resource "kubernetes_config_map" "template" {
   }
 }
 
-<<<<<<< HEAD
 resource "kubernetes_job" "push_template" {
-=======
-resource "kubernetes_pod" "push_template" {
->>>>>>> 46f631c0c (back to curl)
   provider = kubernetes.primary
 
   metadata {
@@ -113,7 +109,6 @@ resource "kubernetes_pod" "push_template" {
     }
   }
   spec {
-<<<<<<< HEAD
     completions = 1
     template {
       metadata {}
@@ -162,50 +157,4 @@ resource "kubernetes_pod" "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/workspace_traffic.tf b/scaletest/terraform/action/workspace_traffic.tf
@@ -25,7 +25,19 @@
 #     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)} exp scaletest create-workspaces --count ${var.workspace_count} --template=kubernetes --concurrency ${var.workspace_create_concurrency} --no-cleanup"]
+#       command = [
+#         "/opt/coder",
+#         "--verbose",
+#         "--url=${local.deployments.primary.url}",
+#         "--token=${trimspace(data.local_file.api_key.content)}",
+#         "exp",
+#         "scaletest",
+#         "create-workspaces",
+#         "--count=${var.workspace_count}",
+#         "--template=kubernetes",
+#         "--concurrency=${var.workspace_create_concurrency}",
+#         "--no-cleanup"
+#       ]
 #     }
 #     restart_policy = "Never"
 #   }
