Skip to content

Commit fcfdb5e

Browse files
committed
Address review comments:
- Increase max node count for libcxx clusters to 32. - Update the CPU & Memor for libcxx_runners request & limits to suggested values: requests: cpu:55, memory: 200Gi; limits: cpu:32, memory: 128Gi - Create kubernetes_secrets for the 3 libcxx runners and add them to the appropriate namespaces.
1 parent 0b3de9f commit fcfdb5e

File tree

3 files changed

+60
-9
lines changed

3 files changed

+60
-9
lines changed

premerge/gke_cluster/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ resource "google_container_node_pool" "llvm_premerge_libcxx" {
7373

7474
autoscaling {
7575
total_min_node_count = 0
76-
total_max_node_count = 8
76+
total_max_node_count = 32
7777
}
7878

7979
node_config {

premerge/libcxx_runners_values.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ githubConfigUrl: "https://github.com/llvm"
22
githubConfigSecret: "github-token"
33

44
minRunners: 0
5-
maxRunners: 8
5+
maxRunners: 32
66

77
runnerGroup: ${ runner_group_name }
88

@@ -39,9 +39,9 @@ template:
3939
#
4040
# We also need to request sufficient memory to not get OOM killed.
4141
requests:
42-
cpu: 55
43-
memory: "200Gi"
42+
cpu: 28
43+
memory: "100Gi"
4444
limits:
45-
cpu: 64
46-
memory: "256Gi"
45+
cpu: 32
46+
memory: "128Gi"
4747

premerge/premerge_resources/main.tf

Lines changed: 54 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,57 @@ 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+
67118
resource "kubernetes_secret" "windows_github_pat" {
68119
metadata {
69120
name = "github-token"
@@ -143,7 +194,7 @@ resource "helm_release" "github_actions_runner_set_libcxx" {
143194
depends_on = [
144195
kubernetes_namespace.llvm_premerge_libcxx_runners,
145196
helm_release.github_actions_runner_controller,
146-
kubernetes_secret.linux_github_pat,
197+
kubernetes_secret.libcxx_github_pat,
147198
]
148199
}
149200

@@ -161,7 +212,7 @@ resource "helm_release" "github_actions_runner_set_libcxx_release" {
161212
depends_on = [
162213
kubernetes_namespace.llvm_premerge_libcxx_release_runners,
163214
helm_release.github_actions_runner_controller,
164-
kubernetes_secret.linux_github_pat,
215+
kubernetes_secret.libcxx_release_github_pat,
165216
]
166217
}
167218

@@ -179,7 +230,7 @@ resource "helm_release" "github_actions_runner_set_libcxx_next" {
179230
depends_on = [
180231
kubernetes_namespace.llvm_premerge_libcxx_next_runners,
181232
helm_release.github_actions_runner_controller,
182-
kubernetes_secret.linux_github_pat,
233+
kubernetes_secret.libcxx_next_github_pat,
183234
]
184235
}
185236

0 commit comments

Comments
 (0)