Skip to content

[CI] Add namespace names as parameters to premerge_resources #507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boomanaiden154 merged 10 commits into from
Jul 20, 2025
Merged

[CI] Add namespace names as parameters to premerge_resources #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e1dca0a
[𝘀𝗽𝗿] changes to main this commit is based on
boomanaiden154 Jul 18, 2025
5f72dd7
[𝘀𝗽𝗿] initial version
boomanaiden154 Jul 18, 2025
2583870
[𝘀𝗽𝗿] changes introduced through rebase
boomanaiden154 Jul 18, 2025
35bc2ca
rebase
boomanaiden154 Jul 18, 2025
913cf2e
[𝘀𝗽𝗿] changes introduced through rebase
boomanaiden154 Jul 20, 2025
13fb28e
rebase
boomanaiden154 Jul 20, 2025
bc8dbec
[𝘀𝗽𝗿] changes introduced through rebase
boomanaiden154 Jul 20, 2025
883a9e1
rebase
boomanaiden154 Jul 20, 2025
7592a0f
[𝘀𝗽𝗿] changes introduced through rebase
boomanaiden154 Jul 20, 2025
5c62bbe
rebase
boomanaiden154 Jul 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 18 additions & 14 deletions premerge/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,27 +123,31 @@ provider "kubernetes" {
}

module "premerge_cluster_us_central_resources" {
source = "./premerge_resources"
github_app_id = data.google_secret_manager_secret_version.github_app_id.secret_data
github_app_installation_id = data.google_secret_manager_secret_version.github_app_installation_id.secret_data
github_app_private_key = data.google_secret_manager_secret_version.github_app_private_key.secret_data
cluster_name = "llvm-premerge-cluster-us-central"
grafana_token = data.google_secret_manager_secret_version.grafana_token.secret_data
runner_group_name = "llvm-premerge-cluster-us-central"
source = "./premerge_resources"
github_app_id = data.google_secret_manager_secret_version.github_app_id.secret_data
github_app_installation_id = data.google_secret_manager_secret_version.github_app_installation_id.secret_data
github_app_private_key = data.google_secret_manager_secret_version.github_app_private_key.secret_data
cluster_name = "llvm-premerge-cluster-us-central"
grafana_token = data.google_secret_manager_secret_version.grafana_token.secret_data
runner_group_name = "llvm-premerge-cluster-us-central"
linux_runners_namespace_name = "llvm-premerge-linux-runners"
windows_2022_runners_namespace_name = "llvm-premerge-windows-2022-runners"
providers = {
kubernetes = kubernetes.llvm-premerge-us-central
helm = helm.llvm-premerge-us-central
}
}

module "premerge_cluster_us_west_resources" {
source = "./premerge_resources"
github_app_id = data.google_secret_manager_secret_version.github_app_id.secret_data
github_app_installation_id = data.google_secret_manager_secret_version.github_app_installation_id.secret_data
github_app_private_key = data.google_secret_manager_secret_version.github_app_private_key.secret_data
cluster_name = "llvm-premerge-cluster-us-west"
grafana_token = data.google_secret_manager_secret_version.grafana_token.secret_data
runner_group_name = "llvm-premerge-cluster-us-west"
source = "./premerge_resources"
github_app_id = data.google_secret_manager_secret_version.github_app_id.secret_data
github_app_installation_id = data.google_secret_manager_secret_version.github_app_installation_id.secret_data
github_app_private_key = data.google_secret_manager_secret_version.github_app_private_key.secret_data
cluster_name = "llvm-premerge-cluster-us-west"
grafana_token = data.google_secret_manager_secret_version.grafana_token.secret_data
runner_group_name = "llvm-premerge-cluster-us-west"
linux_runners_namespace_name = "llvm-premerge-linux-runners"
windows_2022_runners_namespace_name = "llvm-premerge-windows-2022-runners"
providers = {
kubernetes = kubernetes.llvm-premerge-us-west
helm = helm.llvm-premerge-us-west
Expand Down
10 changes: 5 additions & 5 deletions premerge/premerge_resources/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ resource "kubernetes_namespace" "llvm_premerge_controller" {

resource "kubernetes_namespace" "llvm_premerge_linux_runners" {
metadata {
name = "llvm-premerge-linux-runners"
name = var.linux_runners_namespace_name
}
}

Expand All @@ -43,14 +43,14 @@ resource "kubernetes_namespace" "llvm_premerge_libcxx_next_runners" {

resource "kubernetes_namespace" "llvm_premerge_windows_2022_runners" {
metadata {
name = "llvm-premerge-windows-2022-runners"
name = var.windows_2022_runners_namespace_name
}
}

resource "kubernetes_secret" "linux_github_pat" {
metadata {
name = "github-token"
namespace = "llvm-premerge-linux-runners"
namespace = var.linux_runners_namespace_name
}

data = {
Expand Down Expand Up @@ -146,7 +146,7 @@ resource "helm_release" "github_actions_runner_controller" {

resource "helm_release" "github_actions_runner_set_linux" {
name = "llvm-premerge-linux-runners"
namespace = "llvm-premerge-linux-runners"
namespace = var.linux_runners_namespace_name
repository = "oci://ghcr.io/actions/actions-runner-controller-charts"
version = "0.11.0"
chart = "gha-runner-scale-set"
Expand All @@ -164,7 +164,7 @@ resource "helm_release" "github_actions_runner_set_linux" {

resource "helm_release" "github_actions_runner_set_windows_2022" {
name = "llvm-premerge-windows-2022-runners"
namespace = "llvm-premerge-windows-2022-runners"
namespace = var.windows_2022_runners_namespace_name
repository = "oci://ghcr.io/actions/actions-runner-controller-charts"
version = "0.11.0"
chart = "gha-runner-scale-set"
Expand Down
10 changes: 10 additions & 0 deletions premerge/premerge_resources/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,13 @@ variable "libcxx_next_runner_image" {
type = string
default = "ghcr.io/llvm/libcxx-linux-builder:16f046281bf1a11d344eac1bc44d11f3e50e3b5d"
}

variable "linux_runners_namespace_name" {
description = "The name of the namespace containing the Linux runners"
type = string
}

variable "windows_2022_runners_namespace_name" {
description = "The name of the namespace containing the Windows runners"
type = string
}