[CI] Add namespace names as parameters to premerge_resources

This enables a bit of simplification as we can remove some strings where they
really should be variables. This will also help in a future patch where we also
need to access the namespace name inside the gke_cluster module as it will
enable having a common definition to ensure that they do not differ.

Reviewers: Keenuts, dschuff, gburgessiv, cmtice, lnihlen

Reviewed By: cmtice

Pull Request: #507

Author: boomanaiden154

premerge/main.tf

@@ -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

premerge/premerge_resources/main.tf

@@ -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
   }
 }
 
@@ -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 = {
@@ -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"
@@ -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"

premerge/premerge_resources/variables.tf

@@ -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
+}