@@ -49,28 +49,6 @@ module "premerge_cluster" {
49
49
region = " us-central1-a"
50
50
}
51
51
52
- # TODO(boomanaiden154): Remove these moved blocks once we have finished
53
- # updating everything to use the new module.
54
- moved {
55
- from = google_container_cluster. llvm_premerge
56
- to = module. premerge_cluster . google_container_cluster . llvm_premerge
57
- }
58
-
59
- moved {
60
- from = google_container_node_pool. llvm_premerge_linux
61
- to = module. premerge_cluster . google_container_node_pool . llvm_premerge_linux
62
- }
63
-
64
- moved {
65
- from = google_container_node_pool. llvm_premerge_linux_service
66
- to = module. premerge_cluster . google_container_node_pool . llvm_premerge_linux_service
67
- }
68
-
69
- moved {
70
- from = google_container_node_pool. llvm_premerge_windows
71
- to = module. premerge_cluster . google_container_node_pool . llvm_premerge_windows
72
- }
73
-
74
52
provider "helm" {
75
53
kubernetes {
76
54
host = module. premerge_cluster . endpoint
@@ -120,58 +98,6 @@ module "premerge_cluster_resources" {
120
98
}
121
99
}
122
100
123
- # TODO(boomanaiden154): Remove these moved blocks once we have finished
124
- # updating everything to use the new module.
125
- moved {
126
- from = kubernetes_namespace. llvm_premerge_controller
127
- to = module. premerge_cluster_resources . kubernetes_namespace . llvm_premerge_controller
128
- }
129
-
130
- moved {
131
- from = kubernetes_namespace. llvm_premerge_linux_runners
132
- to = module. premerge_cluster_resources . kubernetes_namespace . llvm_premerge_linux_runners
133
- }
134
-
135
- moved {
136
- from = kubernetes_secret. linux_github_pat
137
- to = module. premerge_cluster_resources . kubernetes_secret . linux_github_pat
138
- }
139
-
140
- moved {
141
- from = kubernetes_namespace. llvm_premerge_windows_runners
142
- to = module. premerge_cluster_resources . kubernetes_namespace . llvm_premerge_windows_runners
143
- }
144
-
145
- moved {
146
- from = kubernetes_secret. windows_github_pat
147
- to = module. premerge_cluster_resources . kubernetes_secret . windows_github_pat
148
- }
149
-
150
- moved {
151
- from = helm_release. github_actions_runner_controller
152
- to = module. premerge_cluster_resources . helm_release . github_actions_runner_controller
153
- }
154
-
155
- moved {
156
- from = helm_release. github_actions_runner_set_linux
157
- to = module. premerge_cluster_resources . helm_release . github_actions_runner_set_linux
158
- }
159
-
160
- moved {
161
- from = helm_release. github_actions_runner_set_windows
162
- to = module. premerge_cluster_resources . helm_release . github_actions_runner_set_windows
163
- }
164
-
165
- moved {
166
- from = kubernetes_namespace. grafana
167
- to = module. premerge_cluster_resources . kubernetes_namespace . grafana
168
- }
169
-
170
- moved {
171
- from = helm_release. grafana-k8s-monitoring
172
- to = module. premerge_cluster_resources . helm_release . grafana-k8s-monitoring
173
- }
174
-
175
101
data "google_secret_manager_secret_version" "metrics_github_pat" {
176
102
secret = " llvm-premerge-metrics-github-pat"
177
103
}
0 commit comments