Skip to content

Commit 8260d6a

Browse files
Format all terraform files
Run terraform fmt -recursive . across the whole repository. A couple buildbot/google files get formatted during this process. Reviewers: lnihlen, Keenuts, cmtice Reviewed By: cmtice Pull Request: #502
1 parent aa5c02d commit 8260d6a

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

buildbot/google/terraform/main.tf

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
# ~/.config/gcloud/legacy_credentials/<your email>/adc.json
66
terraform {
77
backend "gcs" {
8-
bucket = "buildbot_cluster_terraform_backend"
9-
prefix = "terraform/state"
8+
bucket = "buildbot_cluster_terraform_backend"
9+
prefix = "terraform/state"
1010
}
1111
}
1212

1313
# configure Google Cloud project
1414
provider "google" {
15-
project = var.gcp_config.project
16-
region = var.gcp_config.region
15+
project = var.gcp_config.project
16+
region = var.gcp_config.region
1717
}
1818

1919

@@ -25,10 +25,10 @@ resource "google_compute_network" "vpc_network" {
2525

2626
# Create the cluster runningn all Kubernetes services
2727
resource "google_container_cluster" "primary" {
28-
name = "buildbot-cluster"
28+
name = "buildbot-cluster"
2929
# maybe have a regional cluster for Kubernetes, as we depend on this...
3030
location = var.gcp_config.zone_a
31-
31+
3232
# configure local network, required for Kubernetes on Windows
3333
network = google_compute_network.vpc_network.name
3434
# enable alias IP addresses, required for Kubernetes for Windows
@@ -51,24 +51,24 @@ resource "google_container_cluster" "primary" {
5151
}
5252

5353
resource "google_container_node_pool" "linux_16_core_pool" {
54-
name = "linux-16-core-pool"
54+
name = "linux-16-core-pool"
5555
# specify a zone here (e.g. "-a") to avoid a redundant deployment
56-
location = var.gcp_config.zone_a
57-
cluster = google_container_cluster.primary.name
58-
56+
location = var.gcp_config.zone_a
57+
cluster = google_container_cluster.primary.name
58+
5959
# use autoscaling to only create a machine when there is a deployment
6060
autoscaling {
6161
min_node_count = 0
6262
max_node_count = 2
6363
}
64-
64+
6565
node_config {
6666
# use preemptible, as this saves costs
67-
preemptible = true
67+
preemptible = true
6868
#custom machine type: 16 core, 48 GB as tsan needs more RAM
6969
machine_type = "n2d-custom-16-49152"
7070
disk_size_gb = 100
71-
disk_type = "pd-ssd"
71+
disk_type = "pd-ssd"
7272

7373
# set the premissions required for the deployment later
7474
oauth_scopes = [
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# configuration parameter for Google Cloud
22
variable "gcp_config" {
33
type = object({
4-
project = string
5-
region = string
6-
zone_a = string
7-
gcr_prefix = string
8-
})
4+
project = string
5+
region = string
6+
zone_a = string
7+
gcr_prefix = string
8+
})
99
default = {
10-
project = "sanitizer-bots"
11-
region = "us-central1"
12-
zone_a = "us-central1-a"
13-
gcr_prefix = "gcr.io/sanitizer-bots"
10+
project = "sanitizer-bots"
11+
region = "us-central1"
12+
zone_a = "us-central1-a"
13+
gcr_prefix = "gcr.io/sanitizer-bots"
1414
}
1515
}

0 commit comments

Comments
 (0)