Skip to content

Commit caa3da0

Browse files
Revert "[CI] Rename premerge_resources modules"
This reverts commit 600a714. This was causing issues with a partial terraform apply.
1 parent 600a714 commit caa3da0

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

premerge/main.tf

Lines changed: 2 additions & 14 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_us_central" {
131+
module "premerge_cluster_resources" {
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,13 +141,7 @@ module "premerge_cluster_resources_us_central" {
141141
}
142142
}
143143

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" {
144+
module "premerge_cluster_resources2" {
151145
source = "./premerge_resources"
152146
github_app_id = data.google_secret_manager_secret_version.github_app_id.secret_data
153147
github_app_installation_id = data.google_secret_manager_secret_version.github_app_installation_id.secret_data
@@ -160,12 +154,6 @@ module "premerge_cluster_resources_us_west" {
160154
}
161155
}
162156

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-
169157
data "google_secret_manager_secret_version" "metrics_github_pat" {
170158
secret = "llvm-premerge-metrics-github-pat"
171159
}

0 commit comments

Comments
 (0)