Rename windows-ci runner

To avoid confusion between "runner" and "runner manager", name the
runner control node "runners-manager-controller", since the "runner" in
this case isn't actually running the GitLab runner software. Just
Ansible.
Signed-off-by: Ben Kochie's avatarBen Kochie <[email protected]>
parent ad7ddbd6
......@@ -205,7 +205,7 @@ module "bastion" {
##################################
#
# Runner
# Runner Mangers Controller
#
##################################
......@@ -216,13 +216,13 @@ module "runner" {
dns_zone_name = var.dns_zone_name
environment = var.environment
health_check = "tcp"
ip_cidr_range = var.subnetworks["runner"]
machine_type = var.machine_types["runner"]
ip_cidr_range = var.subnetworks["runner-manager-controller"]
machine_type = var.machine_types["runner-manager-controller"]
name = "runner"
node_count = var.node_count["runner"]
node_count = var.node_count["runner-manager-controller"]
os_disk_size = 500
project = var.project
public_ports = var.public_ports["runner"]
public_ports = var.public_ports["runner-manager-controller"]
region = var.region
service_account_email = google_service_account.packer-runner.email
service_port = 22
......@@ -348,7 +348,7 @@ resource "google_kms_key_ring_iam_binding" "secrets" {
##################################
#
# Windows Managers
# Windows Runner Managers
#
##################################
......@@ -368,7 +368,7 @@ module "runner-manager" {
service_account_email = var.service_account_email
use_external_ip = true
assign_public_ip = true
node_count = 2
node_count = var.node_count["runner-manager"]
tags = ["windows-manager"]
labels = var.manager_labels
}
......@@ -171,9 +171,8 @@ variable "subnetworks" {
type = map(string)
default = {
"runner" = "10.3.0.0/24"
"bastion" = "10.3.1.0/24"
"bastion" = "10.3.1.0/24"
"runner-manager-controller" = "10.3.0.0/24"
}
}
......@@ -181,8 +180,8 @@ variable "public_ports" {
type = map(list(string))
default = {
"bastion" = [22]
"runner" = []
"bastion" = [22]
"runner-manager-controller" = []
}
}
......@@ -190,8 +189,9 @@ variable "node_count" {
type = map(string)
default = {
"bastion" = 1
"runner" = 1
"bastion" = 1
"runner-manager" = 2
"runner-manager-controller" = 1
}
}
......@@ -199,8 +199,8 @@ variable "machine_types" {
type = map(string)
default = {
"bastion" = "n1-standard-1"
"runner" = "n1-standard-2"
"bastion" = "n1-standard-1"
"runner-manager-controller" = "n1-standard-2"
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment