review

ethanndickson · ethanndickson · commit 96d81be01c3f · 2025-08-21T03:50:48.000Z
diff --git a/scaletest/terraform/action/cf_dns.tf b/scaletest/terraform/action/cf_dns.tf
@@ -1,7 +1,7 @@
 resource "cloudflare_record" "coder" {
   for_each = local.deployments
   zone_id  = var.cloudflare_zone_id
-  name     = each.value.subdomain
+  name     = "${each.value.subdomain}.${var.cloudflare_domain}"
   content  = google_compute_address.coder[each.key].address
   type     = "A"
   ttl      = 3600
@@ -11,7 +11,7 @@ resource "cloudflare_record" "coder_wildcard" {
   for_each = local.deployments
   zone_id  = var.cloudflare_zone_id
   name     = each.value.wildcard_subdomain
-  content  = "${each.value.subdomain}.${var.cloudflare_domain}"
+  content  = cloudflare_record.coder[each.key].name
   type     = "CNAME"
   ttl      = 3600
 }
diff --git a/scaletest/terraform/action/main.tf b/scaletest/terraform/action/main.tf
@@ -47,13 +47,14 @@ provider "google" {
 }
 
 data "google_container_cluster" "observability" {
-  name     = "observability"
-  location = "us-east1-b"
+  name     = var.observability_cluster_name
+  location = var.observability_cluster_location
   project  = var.project_id
 }
 
+# This is managed manually
 data "google_secret_manager_secret_version" "cloudflare_api_token_dns" {
-  secret  = "cloudflare-api-token-dns"
+  secret  = var.cloudflare_api_token_secret
   project = var.project_id
 }
 
diff --git a/scaletest/terraform/action/tls.tf b/scaletest/terraform/action/tls.tf
@@ -1,9 +1,13 @@
+locals {
+  coder_certs_namespace = "coder-certs"
+}
+
 # These certificates are managed by flux and cert-manager.
 data "kubernetes_secret" "coder_tls" {
   for_each = local.deployments
   provider = kubernetes.observability
   metadata {
     name      = "coder-${var.name}-${each.key}-tls"
-    namespace = "coder-certs"
+    namespace = local.coder_certs_namespace
   }
 }
diff --git a/scaletest/terraform/action/vars.tf b/scaletest/terraform/action/vars.tf
@@ -79,6 +79,21 @@ variable "provisionerd_image_tag" {
   default     = "latest"
 }
 
+variable "observability_cluster_name" {
+  description = "Name of the observability GKE cluster."
+  default     = "observability"
+}
+
+variable "observability_cluster_location" {
+  description = "Location of the observability GKE cluster."
+  default     = "us-east1-b"
+}
+
+variable "cloudflare_api_token_secret" {
+  description = "Name of the Google Secret Manager secret containing the Cloudflare API token."
+  default     = "cloudflare-api-token-dns"
+}
+
 // Prometheus
 variable "prometheus_remote_write_url" {
   description = "URL to push prometheus metrics to."

Original file line number	Diff line number	Diff line change
`@@ -47,13 +47,14 @@ provider "google" {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`data "google_container_cluster" "observability" {`
`50`		`- name = "observability"`
`51`		`- location = "us-east1-b"`
	`50`	`+ name = var.observability_cluster_name`
	`51`	`+ location = var.observability_cluster_location`
`52`	`52`	`project = var.project_id`
`53`	`53`	`}`
`54`	`54`
	`55`	`+# This is managed manually`
`55`	`56`	`data "google_secret_manager_secret_version" "cloudflare_api_token_dns" {`
`56`		`- secret = "cloudflare-api-token-dns"`
	`57`	`+ secret = var.cloudflare_api_token_secret`
`57`	`58`	`project = var.project_id`
`58`	`59`	`}`
`59`	`60`