Skip to content

Commit 607a23d

Browse files
[CI] Rename premerge cluster in preparation for HA
This makes things a bit more consistent in preparation for setting up another cluster. Reviewers: Keenuts, cmtice, lnihlen, dschuff, gburgessiv Reviewed By: lnihlen Pull Request: #443
1 parent a5166ff commit 607a23d

File tree

1 file changed

+24
-14
lines changed

1 file changed

+24
-14
lines changed

premerge/main.tf

+24-14
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,31 @@ resource "local_file" "terraform_state" {
4343

4444
data "google_client_config" "current" {}
4545

46-
module "premerge_cluster" {
46+
# TODO(boomanaiden154): Rename this to llvm-premerge-cluster-us-central when
47+
# commit traffic is low.
48+
module "premerge_cluster_us_central" {
4749
source = "./gke_cluster"
4850
cluster_name = "llvm-premerge-prototype"
4951
region = "us-central1-a"
5052
}
5153

54+
# TODO(boomanaiden154): Remove these statements after the changes have been
55+
# applied.
56+
57+
moved {
58+
from = module.premerge_cluster
59+
to = module.premerge_cluster_us_central
60+
}
61+
5262
provider "helm" {
5363
kubernetes {
54-
host = module.premerge_cluster.endpoint
64+
host = module.premerge_cluster_us_central.endpoint
5565
token = data.google_client_config.current.access_token
56-
client_certificate = base64decode(module.premerge_cluster.client_certificate)
57-
client_key = base64decode(module.premerge_cluster.client_key)
58-
cluster_ca_certificate = base64decode(module.premerge_cluster.cluster_ca_certificate)
66+
client_certificate = base64decode(module.premerge_cluster_us_central.client_certificate)
67+
client_key = base64decode(module.premerge_cluster_us_central.client_key)
68+
cluster_ca_certificate = base64decode(module.premerge_cluster_us_central.cluster_ca_certificate)
5969
}
60-
alias = "llvm-premerge-prototype"
70+
alias = "llvm-premerge-us-central"
6171
}
6272

6373
data "google_secret_manager_secret_version" "github_app_id" {
@@ -77,12 +87,12 @@ data "google_secret_manager_secret_version" "grafana_token" {
7787
}
7888

7989
provider "kubernetes" {
80-
host = "https://${module.premerge_cluster.endpoint}"
90+
host = "https://${module.premerge_cluster_us_central.endpoint}"
8191
token = data.google_client_config.current.access_token
8292
cluster_ca_certificate = base64decode(
83-
module.premerge_cluster.cluster_ca_certificate
93+
module.premerge_cluster_us_central.cluster_ca_certificate
8494
)
85-
alias = "llvm-premerge-prototype"
95+
alias = "llvm-premerge-us-central"
8696
}
8797

8898
module "premerge_cluster_resources" {
@@ -93,8 +103,8 @@ module "premerge_cluster_resources" {
93103
cluster_name = "llvm-premerge-prototype"
94104
grafana_token = data.google_secret_manager_secret_version.grafana_token.secret_data
95105
providers = {
96-
kubernetes = kubernetes.llvm-premerge-prototype
97-
helm = helm.llvm-premerge-prototype
106+
kubernetes = kubernetes.llvm-premerge-us-central
107+
helm = helm.llvm-premerge-us-central
98108
}
99109
}
100110

@@ -118,7 +128,7 @@ resource "kubernetes_namespace" "metrics" {
118128
metadata {
119129
name = "metrics"
120130
}
121-
provider = kubernetes.llvm-premerge-prototype
131+
provider = kubernetes.llvm-premerge-us-central
122132
}
123133

124134
resource "kubernetes_secret" "metrics_secrets" {
@@ -135,10 +145,10 @@ resource "kubernetes_secret" "metrics_secrets" {
135145
}
136146

137147
type = "Opaque"
138-
provider = kubernetes.llvm-premerge-prototype
148+
provider = kubernetes.llvm-premerge-us-central
139149
}
140150

141151
resource "kubernetes_manifest" "metrics_deployment" {
142152
manifest = yamldecode(file("metrics_deployment.yaml"))
143-
provider = kubernetes.llvm-premerge-prototype
153+
provider = kubernetes.llvm-premerge-us-central
144154
}

0 commit comments

Comments
 (0)