Skip to content

Commit 35f611e

Browse files
committed
Address some review comments:
- Create new var, libcxx_machine_type (currently identical to linux_machine_type) and use it where appropriate. - Remove new kubernetes secrets "libcxx_github_pat", "libcxx_release_github_pat", and "libcxx_next_github_pat"; replace uses of them with "linux_github_pat".
1 parent bfc133c commit 35f611e

File tree

4 files changed

+11
-55
lines changed

4 files changed

+11
-55
lines changed

premerge/gke_cluster/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ resource "google_container_node_pool" "llvm_premerge_libcxx" {
7777
}
7878

7979
node_config {
80-
machine_type = var.linux_machine_type
80+
machine_type = var.libcxx_machine_type
8181
taint {
8282
key = "premerge-platform"
8383
value = "linux"

premerge/gke_cluster/variables.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ variable "windows_machine_type" {
1818
type = string
1919
}
2020

21+
variable "libcxx_machine_type" {
22+
description = "The type of machine to use for libcxx instances (linux)"
23+
type = string
24+
}
25+
2126
variable "service_node_pool_locations" {
2227
description = "The location to run the service node pool in"
2328
type = list(any)

premerge/main.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ module "premerge_cluster_us_central" {
4747
source = "./gke_cluster"
4848
cluster_name = "llvm-premerge-cluster-us-central"
4949
region = "us-central1-a"
50+
libcxx_machine_type = "n2-standard-64"
5051
linux_machine_type = "n2-standard-64"
5152
windows_machine_type = "n2-standard-32"
5253
}
@@ -59,6 +60,7 @@ module "premerge_cluster_us_west" {
5960
source = "./gke_cluster"
6061
cluster_name = "llvm-premerge-cluster-us-west"
6162
region = "us-west1"
63+
libcxx_machine_type = "n2d-standard-64"
6264
linux_machine_type = "n2d-standard-64"
6365
windows_machine_type = "n2d-standard-32"
6466
service_node_pool_locations = ["us-west1-a"]

premerge/premerge_resources/main.tf

Lines changed: 3 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -64,57 +64,6 @@ resource "kubernetes_secret" "linux_github_pat" {
6464
depends_on = [kubernetes_namespace.llvm_premerge_linux_runners]
6565
}
6666

67-
resource "kubernetes_secret" "libcxx_github_pat" {
68-
metadata {
69-
name = "github-token"
70-
namespace = "llvm-premerge-libcxx-runners"
71-
}
72-
73-
data = {
74-
"github_app_id" = var.github_app_id
75-
"github_app_installation_id" = var.github_app_installation_id
76-
"github_app_private_key" = var.github_app_private_key
77-
}
78-
79-
type = "Opaque"
80-
81-
depends_on = [kubernetes_namespace.llvm_premerge_libcxx_runners]
82-
}
83-
84-
resource "kubernetes_secret" "libcxx_release_github_pat" {
85-
metadata {
86-
name = "github-token"
87-
namespace = "llvm-premerge-libcxx-release-runners"
88-
}
89-
90-
data = {
91-
"github_app_id" = var.github_app_id
92-
"github_app_installation_id" = var.github_app_installation_id
93-
"github_app_private_key" = var.github_app_private_key
94-
}
95-
96-
type = "Opaque"
97-
98-
depends_on = [kubernetes_namespace.llvm_premerge_libcxx_release_runners]
99-
}
100-
101-
resource "kubernetes_secret" "libcxx_next_github_pat" {
102-
metadata {
103-
name = "github-token"
104-
namespace = "llvm-premerge-libcxx-next-runners"
105-
}
106-
107-
data = {
108-
"github_app_id" = var.github_app_id
109-
"github_app_installation_id" = var.github_app_installation_id
110-
"github_app_private_key" = var.github_app_private_key
111-
}
112-
113-
type = "Opaque"
114-
115-
depends_on = [kubernetes_namespace.llvm_premerge_libcxx_next_runners]
116-
}
117-
11867
resource "kubernetes_secret" "windows_github_pat" {
11968
metadata {
12069
name = "github-token"
@@ -194,7 +143,7 @@ resource "helm_release" "github_actions_runner_set_libcxx" {
194143
depends_on = [
195144
kubernetes_namespace.llvm_premerge_libcxx_runners,
196145
helm_release.github_actions_runner_controller,
197-
kubernetes_secret.libcxx_github_pat,
146+
kubernetes_secret.linux_github_pat,
198147
]
199148
}
200149

@@ -212,7 +161,7 @@ resource "helm_release" "github_actions_runner_set_libcxx_release" {
212161
depends_on = [
213162
kubernetes_namespace.llvm_premerge_libcxx_release_runners,
214163
helm_release.github_actions_runner_controller,
215-
kubernetes_secret.libcxx_release_github_pat,
164+
kubernetes_secret.linux_github_pat,
216165
]
217166
}
218167

@@ -230,7 +179,7 @@ resource "helm_release" "github_actions_runner_set_libcxx_next" {
230179
depends_on = [
231180
kubernetes_namespace.llvm_premerge_libcxx_next_runners,
232181
helm_release.github_actions_runner_controller,
233-
kubernetes_secret.libcxx_next_github_pat,
182+
kubernetes_secret.linux_github_pat,
234183
]
235184
}
236185

0 commit comments

Comments
 (0)