Skip to content

Commit 31739f0

Browse files
[CI] Specify runner group per cluster
This patch specifies the runner group that a runner scale set is associated with specifically per cluster rather than just using the default runner group. This is a requirement for setting up a HA cluster. The runner scale sets need to be named the same but in different groups so that they do not conflict.
1 parent caa3da0 commit 31739f0

File tree

5 files changed

+12
-2
lines changed

5 files changed

+12
-2
lines changed

premerge/linux_runners_values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ githubConfigSecret: "github-token"
44
minRunners: 0
55
maxRunners: 8
66

7+
runnerGroup: ${ runner_group_name }
8+
79
template:
810
metadata:
911
annotations:

premerge/main.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ module "premerge_cluster_resources" {
135135
github_app_private_key = data.google_secret_manager_secret_version.github_app_private_key.secret_data
136136
cluster_name = "llvm-premerge-prototype"
137137
grafana_token = data.google_secret_manager_secret_version.grafana_token.secret_data
138+
runner_group_name = "llvm-premerge-cluster-us-central"
138139
providers = {
139140
kubernetes = kubernetes.llvm-premerge-us-central
140141
helm = helm.llvm-premerge-us-central
@@ -148,6 +149,7 @@ module "premerge_cluster_resources2" {
148149
github_app_private_key = data.google_secret_manager_secret_version.github_app_private_key.secret_data
149150
cluster_name = "llvm-premerge-cluster-us-west"
150151
grafana_token = data.google_secret_manager_secret_version.grafana_token.secret_data
152+
runner_group_name = "llvm-premerge-cluster-us-west"
151153
providers = {
152154
kubernetes = kubernetes.llvm-premerge-us-west
153155
helm = helm.llvm-premerge-us-west

premerge/premerge_resources/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ resource "helm_release" "github_actions_runner_set_linux" {
8383
chart = "gha-runner-scale-set"
8484

8585
values = [
86-
"${file("linux_runners_values.yaml")}"
86+
"${templatefile("linux_runners_values.yaml", { runner_group_name : var.runner_group_name })}"
8787
]
8888

8989
depends_on = [
@@ -101,7 +101,7 @@ resource "helm_release" "github_actions_runner_set_windows" {
101101
chart = "gha-runner-scale-set"
102102

103103
values = [
104-
"${file("windows_runner_values.yaml")}"
104+
"${templatefile("windows_runner_values.yaml", { runner_group_name : var.runner_group_name })}"
105105
]
106106

107107
depends_on = [

premerge/premerge_resources/variables.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,7 @@ variable "externalservices_tempo_basicauth_username" {
5050
type = number
5151
default = 952165
5252
}
53+
54+
variable "runner_group_name" {
55+
type = string
56+
}

premerge/windows_runner_values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ githubConfigSecret: "github-token"
44
minRunners: 0
55
maxRunners: 16
66

7+
runnerGroup: ${ runner_group_name }
8+
79
template:
810
metadata:
911
annotations:

0 commit comments

Comments
 (0)