Skip to content

Commit 152d700

Browse files
f0sself0ssel
committed
fmt
1 parent bb5c9a8 commit 152d700

File tree

8 files changed

+57
-57
lines changed

8 files changed

+57
-57
lines changed

‎scaletest/terraform/new/cf_dns.tf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
resource "cloudflare_record" "coder" {
22
for_each = local.deployments
3-
zone_id = var.cloudflare_zone_id
4-
name = each.value.subdomain
5-
content = google_compute_address.coder[each.key].address
6-
type = "A"
7-
ttl = 3600
3+
zone_id = var.cloudflare_zone_id
4+
name = each.value.subdomain
5+
content = google_compute_address.coder[each.key].address
6+
type = "A"
7+
ttl = 3600
88
}

‎scaletest/terraform/new/deployments.tf

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@ locals {
22
deployments = {
33
primary = {
44
subdomain = "${var.name}-scaletest"
5-
url = "http://${var.name}-scaletest.${var.cloudflare_domain}"
6-
region = "us-east1"
7-
zone = "us-east1-c"
8-
cidr = "10.200.0.0/24"
5+
url = "http://${var.name}-scaletest.${var.cloudflare_domain}"
6+
region = "us-east1"
7+
zone = "us-east1-c"
8+
cidr = "10.200.0.0/24"
99
}
1010
europe = {
1111
subdomain = "${var.name}-europe-scaletest"
12-
url = "http://${var.name}-europe-scaletest.${var.cloudflare_domain}"
13-
region = "europe-west1"
14-
zone = "europe-west1-b"
15-
cidr = "10.201.0.0/24"
12+
url = "http://${var.name}-europe-scaletest.${var.cloudflare_domain}"
13+
region = "europe-west1"
14+
zone = "europe-west1-b"
15+
cidr = "10.201.0.0/24"
1616
}
1717
asia = {
1818
subdomain = "${var.name}-asia-scaletest"
19-
url = "http://${var.name}-asia-scaletest.${var.cloudflare_domain}"
20-
region = "asia-southeast1"
21-
zone = "asia-southeast1-a"
22-
cidr = "10.202.0.0/24"
19+
url = "http://${var.name}-asia-scaletest.${var.cloudflare_domain}"
20+
region = "asia-southeast1"
21+
zone = "asia-southeast1-a"
22+
cidr = "10.202.0.0/24"
2323
}
2424
}
2525
}

‎scaletest/terraform/new/gcp_clusters.tf

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
11
data "google_compute_default_service_account" "default" {
2-
project = var.project_id
3-
depends_on = [ google_project_service.api["compute.googleapis.com"] ]
2+
project = var.project_id
3+
depends_on = [google_project_service.api["compute.googleapis.com"]]
44
}
55

66
locals {
77
node_pools = {
88
primary_coder = {
9-
name = "coder"
9+
name = "coder"
1010
cluster = "primary"
11-
size = 1
11+
size = 1
1212
}
1313
primary_workspaces = {
14-
name = "workspaces"
14+
name = "workspaces"
1515
cluster = "primary"
16-
size = 1
16+
size = 1
1717
}
1818
primary_misc = {
19-
name = "misc"
19+
name = "misc"
2020
cluster = "primary"
21-
size = 1
21+
size = 1
2222
}
2323
europe_coder = {
24-
name = "coder"
24+
name = "coder"
2525
cluster = "europe"
26-
size = 1
26+
size = 1
2727
}
2828
europe_workspaces = {
29-
name = "workspaces"
29+
name = "workspaces"
3030
cluster = "europe"
31-
size = 1
31+
size = 1
3232
}
3333
europe_misc = {
34-
name = "misc"
34+
name = "misc"
3535
cluster = "europe"
36-
size = 1
36+
size = 1
3737
}
3838
asia_coder = {
39-
name = "coder"
39+
name = "coder"
4040
cluster = "asia"
41-
size = 1
41+
size = 1
4242
}
4343
asia_workspaces = {
44-
name = "workspaces"
44+
name = "workspaces"
4545
cluster = "asia"
46-
size = 1
46+
size = 1
4747
}
4848
asia_misc = {
49-
name = "misc"
49+
name = "misc"
5050
cluster = "asia"
51-
size = 1
51+
size = 1
5252
}
5353
}
5454
}

‎scaletest/terraform/new/k8s_coder_asia.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ EOF
141141

142142
resource "helm_release" "provisionerd_asia" {
143143
provider = helm.asia
144-
144+
145145
repository = local.coder_helm_repo
146146
chart = local.provisionerd_helm_chart
147147
name = local.provisionerd_release_name

‎scaletest/terraform/new/k8s_coder_europe.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ EOF
141141

142142
resource "helm_release" "provisionerd_europe" {
143143
provider = helm.europe
144-
144+
145145
repository = local.coder_helm_repo
146146
chart = local.provisionerd_helm_chart
147147
name = local.provisionerd_release_name

‎scaletest/terraform/new/k8s_coder_primary.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ EOF
158158

159159
resource "helm_release" "provisionerd_chart" {
160160
provider = helm.primary
161-
161+
162162
repository = local.coder_helm_repo
163163
chart = local.provisionerd_helm_chart
164164
name = local.provisionerd_release_name

‎scaletest/terraform/new/k8s_coder_proxies.tf

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@ data "http" "coder_healthy" {
22
url = local.deployments.primary.url
33
// Wait up to 5 minutes for DNS to propogate
44
retry {
5-
attempts = 30
5+
attempts = 30
66
min_delay_ms = 10000
77
}
88

99
lifecycle {
1010
postcondition {
11-
condition = self.status_code == 200
12-
error_message = "${self.url} returned an unhealthy status code"
11+
condition = self.status_code == 200
12+
error_message = "${self.url} returned an unhealthy status code"
1313
}
1414
}
1515

16-
depends_on = [ helm_release.coder_primary, cloudflare_record.coder["primary"] ]
16+
depends_on = [helm_release.coder_primary, cloudflare_record.coder["primary"]]
1717
}
1818

1919
resource "null_resource" "proxy_tokens" {
2020
provisioner "local-exec" {
21-
interpreter = [ "/bin/bash", "-c" ]
22-
command = <<EOF
21+
interpreter = ["/bin/bash", "-c"]
22+
command = <<EOF
2323
curl '${local.deployments.primary.url}/api/v2/users/first' \
2424
--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}' \
2525
--insecure --silent --output /dev/null
@@ -49,15 +49,15 @@ echo -n $${asia_token} > ${path.module}/.coderv2/asia_proxy_token
4949
EOF
5050
}
5151

52-
depends_on = [ data.http.coder_healthy ]
52+
depends_on = [data.http.coder_healthy]
5353
}
5454

5555
data "local_file" "europe_proxy_token" {
56-
filename = "${path.module}/.coderv2/europe_proxy_token"
57-
depends_on = [ null_resource.proxy_tokens ]
56+
filename = "${path.module}/.coderv2/europe_proxy_token"
57+
depends_on = [null_resource.proxy_tokens]
5858
}
5959

6060
data "local_file" "asia_proxy_token" {
61-
filename = "${path.module}/.coderv2/asia_proxy_token"
62-
depends_on = [ null_resource.proxy_tokens ]
61+
filename = "${path.module}/.coderv2/asia_proxy_token"
62+
depends_on = [null_resource.proxy_tokens]
6363
}

‎scaletest/terraform/new/main.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,44 +51,44 @@ provider "cloudflare" {
5151
}
5252

5353
provider "kubernetes" {
54-
alias = "primary"
54+
alias = "primary"
5555
host = "https://${google_container_cluster.cluster["primary"].endpoint}"
5656
cluster_ca_certificate = base64decode(google_container_cluster.cluster["primary"].master_auth.0.cluster_ca_certificate)
5757
token = data.google_client_config.default.access_token
5858
}
5959

6060
provider "kubernetes" {
61-
alias = "europe"
61+
alias = "europe"
6262
host = "https://${google_container_cluster.cluster["europe"].endpoint}"
6363
cluster_ca_certificate = base64decode(google_container_cluster.cluster["europe"].master_auth.0.cluster_ca_certificate)
6464
token = data.google_client_config.default.access_token
6565
}
6666

6767
provider "kubernetes" {
68-
alias = "asia"
68+
alias = "asia"
6969
host = "https://${google_container_cluster.cluster["asia"].endpoint}"
7070
cluster_ca_certificate = base64decode(google_container_cluster.cluster["asia"].master_auth.0.cluster_ca_certificate)
7171
token = data.google_client_config.default.access_token
7272
}
7373

7474
provider "kubectl" {
75-
alias = "primary"
75+
alias = "primary"
7676
host = "https://${google_container_cluster.cluster["primary"].endpoint}"
7777
cluster_ca_certificate = base64decode(google_container_cluster.cluster["primary"].master_auth.0.cluster_ca_certificate)
7878
token = data.google_client_config.default.access_token
7979
load_config_file = false
8080
}
8181

8282
provider "kubectl" {
83-
alias = "europe"
83+
alias = "europe"
8484
host = "https://${google_container_cluster.cluster["europe"].endpoint}"
8585
cluster_ca_certificate = base64decode(google_container_cluster.cluster["europe"].master_auth.0.cluster_ca_certificate)
8686
token = data.google_client_config.default.access_token
8787
load_config_file = false
8888
}
8989

9090
provider "kubectl" {
91-
alias = "asia"
91+
alias = "asia"
9292
host = "https://${google_container_cluster.cluster["asia"].endpoint}"
9393
cluster_ca_certificate = base64decode(google_container_cluster.cluster["asia"].master_auth.0.cluster_ca_certificate)
9494
token = data.google_client_config.default.access_token

0 commit comments

Comments
 (0)