Skip to content

Commit 7af3b3d

Browse files
[CI] Add a second premerge cluster
We have quota in us-west8 that we want to use for an additional premerge cluster for a HA setup and to improve capacity. This patch makes the infra run a cluster on the new quota. Reviewers: gburgessiv, Keenuts, lnihlen, cmtice, dschuff Reviewed By: lnihlen Pull Request: #445
1 parent 54996d7 commit 7af3b3d

File tree

1 file changed

+42
-3
lines changed

1 file changed

+42
-3
lines changed

premerge/main.tf

Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ data "google_client_config" "current" {}
4646
# TODO(boomanaiden154): Rename this to llvm-premerge-cluster-us-central when
4747
# commit traffic is low.
4848
module "premerge_cluster_us_central" {
49-
source = "./gke_cluster"
50-
cluster_name = "llvm-premerge-prototype"
51-
region = "us-central1-a"
49+
source = "./gke_cluster"
50+
cluster_name = "llvm-premerge-prototype"
51+
region = "us-central1-a"
5252
linux_machine_type = "n2-standard-64"
5353
windows_machine_type = "n2-standard-32"
5454
}
@@ -61,6 +61,14 @@ moved {
6161
to = module.premerge_cluster_us_central
6262
}
6363

64+
module "premerge_cluster_us_west" {
65+
source = "./gke_cluster"
66+
cluster_name = "llvm-premerge-cluster-us-west"
67+
region = "us-west8"
68+
linux_machine_type = "n2d-standard-64"
69+
windows_machine_type = "n2d-standard-32"
70+
}
71+
6472
provider "helm" {
6573
kubernetes {
6674
host = module.premerge_cluster_us_central.endpoint
@@ -72,6 +80,17 @@ provider "helm" {
7280
alias = "llvm-premerge-us-central"
7381
}
7482

83+
provider "helm" {
84+
kubernetes {
85+
host = module.premerge_cluster_us_west.endpoint
86+
token = data.google_client_config.current.access_token
87+
client_certificate = base64decode(module.premerge_cluster_us_west.client_certificate)
88+
client_key = base64decode(module.premerge_cluster_us_west.client_key)
89+
cluster_ca_certificate = base64decode(module.premerge_cluster_us_west.cluster_ca_certificate)
90+
}
91+
alias = "llvm-premerge-us-west"
92+
}
93+
7594
data "google_secret_manager_secret_version" "github_app_id" {
7695
secret = "llvm-premerge-github-app-id"
7796
}
@@ -97,6 +116,13 @@ provider "kubernetes" {
97116
alias = "llvm-premerge-us-central"
98117
}
99118

119+
provider "kubernetes" {
120+
host = "https://${module.premerge_cluster_us_west.endpoint}"
121+
token = data.google_client_config.current.access_token
122+
cluster_ca_certificate = base64decode(module.premerge_cluster_us_west.cluster_ca_certificate)
123+
alias = "llvm-premerge-us-west"
124+
}
125+
100126
module "premerge_cluster_resources" {
101127
source = "./premerge_resources"
102128
github_app_id = data.google_secret_manager_secret_version.github_app_id.secret_data
@@ -110,6 +136,19 @@ module "premerge_cluster_resources" {
110136
}
111137
}
112138

139+
module "premerge_cluster_resources2" {
140+
source = "./premerge_resources"
141+
github_app_id = data.google_secret_manager_secret_version.github_app_id.secret_data
142+
github_app_installation_id = data.google_secret_manager_secret_version.github_app_installation_id.secret_data
143+
github_app_private_key = data.google_secret_manager_secret_version.github_app_private_key.secret_data
144+
cluster_name = "llvm-premerge-cluster-us-west"
145+
grafana_token = data.google_secret_manager_secret_version.grafana_token.secret_data
146+
providers = {
147+
kubernetes = kubernetes.llvm-premerge-us-west
148+
helm = helm.llvm-premerge-us-west
149+
}
150+
}
151+
113152
data "google_secret_manager_secret_version" "metrics_github_pat" {
114153
secret = "llvm-premerge-metrics-github-pat"
115154
}

0 commit comments

Comments
 (0)