Skip to content

Commit 21a79a2

Browse files
[CI] Remove Windows Server 2019 Runnerset (#499)
This patch removes the windows server 2019 runnerset and the node pool associated with it now that we have migrated to server 2022. Planning on landing this after we have given the new runner set a bit of soak time and the existing runner pods have drained from the node pool.
1 parent c05da6c commit 21a79a2

File tree

3 files changed

+0
-133
lines changed

3 files changed

+0
-133
lines changed

premerge/gke_cluster/main.tf

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -97,50 +97,6 @@ resource "google_container_node_pool" "llvm_premerge_libcxx" {
9797
}
9898
}
9999

100-
# TODO(boomanaiden154): Make sure to delete this node pool after we have
101-
# switched over to server 2022.
102-
resource "google_container_node_pool" "llvm_premerge_windows" {
103-
name = "llvm-premerge-windows"
104-
location = var.region
105-
cluster = google_container_cluster.llvm_premerge.name
106-
initial_node_count = 0
107-
108-
autoscaling {
109-
total_min_node_count = 0
110-
total_max_node_count = 16
111-
}
112-
113-
# We do not set a taint for the windows nodes as kubernetes by default sets
114-
# a node.kubernetes.io/os taint for windows nodes.
115-
node_config {
116-
machine_type = var.windows_machine_type
117-
labels = {
118-
"premerge-platform" : "windows"
119-
}
120-
image_type = "WINDOWS_LTSC_CONTAINERD"
121-
# Add a script that runs on the initial boot to disable Windows Defender.
122-
# Windows Defender causes an increase in test times by approximately an
123-
# order of magnitude.
124-
metadata = {
125-
"sysprep-specialize-script-ps1" = "Set-MpPreference -DisableRealtimeMonitoring $true"
126-
# Terraform wants to recreate the node pool everytime whe running
127-
# terraform apply unless we explicitly set this.
128-
# TODO(boomanaiden154): Look into why terraform is doing this so we do
129-
# not need this hack.
130-
"disable-legacy-endpoints" = "true"
131-
}
132-
disk_size_gb = 200
133-
disk_type = "pd-ssd"
134-
# Terraform wants to recreate the node pool everytime whe running
135-
# terraform apply unless we explicitly set this.
136-
# TODO(boomanaiden154): Look into why terraform is doing this so we do
137-
# not need this hack.
138-
resource_labels = {
139-
"goog-gke-node-pool-provisioning-model" = "on-demand"
140-
}
141-
}
142-
}
143-
144100
resource "google_container_node_pool" "llvm_premerge_windows_2022" {
145101
name = "llvm-premerge-windows-2022"
146102
location = var.region

premerge/premerge_resources/main.tf

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,6 @@ resource "kubernetes_namespace" "llvm_premerge_libcxx_next_runners" {
4141
}
4242
}
4343

44-
resource "kubernetes_namespace" "llvm_premerge_windows_runners" {
45-
metadata {
46-
name = "llvm-premerge-windows-runners"
47-
}
48-
}
49-
5044
resource "kubernetes_namespace" "llvm_premerge_windows_2022_runners" {
5145
metadata {
5246
name = "llvm-premerge-windows-2022-runners"
@@ -121,23 +115,6 @@ resource "kubernetes_secret" "libcxx_next_github_pat" {
121115
depends_on = [kubernetes_namespace.llvm_premerge_libcxx_next_runners]
122116
}
123117

124-
resource "kubernetes_secret" "windows_github_pat" {
125-
metadata {
126-
name = "github-token"
127-
namespace = "llvm-premerge-windows-runners"
128-
}
129-
130-
data = {
131-
"github_app_id" = var.github_app_id
132-
"github_app_installation_id" = var.github_app_installation_id
133-
"github_app_private_key" = var.github_app_private_key
134-
}
135-
136-
type = "Opaque"
137-
138-
depends_on = [kubernetes_namespace.llvm_premerge_windows_runners]
139-
}
140-
141118
resource "kubernetes_secret" "windows_2022_github_pat" {
142119
metadata {
143120
name = "github-token"
@@ -185,24 +162,6 @@ resource "helm_release" "github_actions_runner_set_linux" {
185162
]
186163
}
187164

188-
resource "helm_release" "github_actions_runner_set_windows" {
189-
name = "llvm-premerge-windows-runners"
190-
namespace = "llvm-premerge-windows-runners"
191-
repository = "oci://ghcr.io/actions/actions-runner-controller-charts"
192-
version = "0.11.0"
193-
chart = "gha-runner-scale-set"
194-
195-
values = [
196-
"${templatefile("windows_runner_values.yaml", { runner_group_name : var.runner_group_name })}"
197-
]
198-
199-
depends_on = [
200-
kubernetes_namespace.llvm_premerge_windows_runners,
201-
kubernetes_secret.windows_github_pat,
202-
helm_release.github_actions_runner_controller,
203-
]
204-
}
205-
206165
resource "helm_release" "github_actions_runner_set_windows_2022" {
207166
name = "llvm-premerge-windows-2022-runners"
208167
namespace = "llvm-premerge-windows-2022-runners"

premerge/windows_runner_values.yaml

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)