Skip to content

Commit 600a714

Browse files
[CI] Rename premerge_resources modules
This patch renames the premerge_resources modules to be more consistent with the rest of the naming using the name of the cluster with a suffix of the cluster region.
1 parent 952012a commit 600a714

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

premerge/main.tf

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ provider "kubernetes" {
128128
alias = "llvm-premerge-us-west"
129129
}
130130

131-
module "premerge_cluster_resources" {
131+
module "premerge_cluster_resources_us_central" {
132132
source = "./premerge_resources"
133133
github_app_id = data.google_secret_manager_secret_version.github_app_id.secret_data
134134
github_app_installation_id = data.google_secret_manager_secret_version.github_app_installation_id.secret_data
@@ -141,7 +141,13 @@ module "premerge_cluster_resources" {
141141
}
142142
}
143143

144-
module "premerge_cluster_resources2" {
144+
# TODO(boomanaiden154): Remove this after moving.
145+
moved {
146+
from = module.premerge_cluster_resources
147+
to = module.premerge_cluster_resources_us_central
148+
}
149+
150+
module "premerge_cluster_resources_us_west" {
145151
source = "./premerge_resources"
146152
github_app_id = data.google_secret_manager_secret_version.github_app_id.secret_data
147153
github_app_installation_id = data.google_secret_manager_secret_version.github_app_installation_id.secret_data
@@ -154,6 +160,12 @@ module "premerge_cluster_resources2" {
154160
}
155161
}
156162

163+
# TODO(boomanaiden154): Remove this after moving.
164+
moved {
165+
from = module.premerge_cluster_resources2
166+
to = module.premerge_cluster_resources_us_west
167+
}
168+
157169
data "google_secret_manager_secret_version" "metrics_github_pat" {
158170
secret = "llvm-premerge-metrics-github-pat"
159171
}

0 commit comments

Comments
 (0)