Skip to content

Commit fffa3c0

Browse files
authored
Remove Ubuntu 20.04 runner pools (#38335)
1 parent 73985e5 commit fffa3c0

2 files changed

Lines changed: 7 additions & 59 deletions

File tree

.github/gh-actions-self-hosted-runners/arc/environments/beam.env

Lines changed: 3 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ subnetwork_cidr_range = "10.119.0.0/20"
3434
service_account_id = "beam-github-actions@apache-beam-testing.iam.gserviceaccount.com"
3535
runner_group = "beam"
3636
main_runner = {
37-
name = "main-runner"
38-
runner_image = "us-central1-docker.pkg.dev/apache-beam-testing/beam-github-actions/beam-arc-runner:d7cd81a1649bc665581951d2330c4b8acd19ed72"
37+
name = "main-runner-2404"
3938
machine_type = "e2-standard-16"
39+
runner_image = "us-central1-docker.pkg.dev/apache-beam-testing/beam-github-actions/beam-arc-runner:latest"
4040
min_node_count = "1"
4141
max_node_count = "30"
4242
min_replicas = "1"
@@ -47,43 +47,9 @@ main_runner = {
4747
cpu = "2"
4848
memory = "3Gi"
4949
}
50-
labels = ["self-hosted", "ubuntu-20.04", "main"]
50+
labels = ["self-hosted", "ubuntu-24.04", "main"]
5151
}
5252
additional_runner_pools = [{
53-
name = "small-runner"
54-
machine_type = "e2-standard-2"
55-
runner_image = "us-central1-docker.pkg.dev/apache-beam-testing/beam-github-actions/beam-arc-runner:d7cd81a1649bc665581951d2330c4b8acd19ed72"
56-
min_node_count = "1"
57-
max_node_count = "15"
58-
min_replicas = "1"
59-
max_replicas = "15"
60-
webhook_scaling = false
61-
requests = {
62-
cpu = "1500m"
63-
memory = "5Gi"
64-
}
65-
labels = ["self-hosted", "ubuntu-20.04", "small"]
66-
enable_selector = true
67-
enable_taint = true
68-
},
69-
{
70-
name = "highmem-runner"
71-
machine_type = "c3-highmem-8"
72-
runner_image = "us-central1-docker.pkg.dev/apache-beam-testing/beam-github-actions/beam-arc-runner:d7cd81a1649bc665581951d2330c4b8acd19ed72"
73-
min_node_count = "1"
74-
max_node_count = "15"
75-
min_replicas = "1"
76-
max_replicas = "15"
77-
webhook_scaling = false
78-
requests = {
79-
cpu = "7.5"
80-
memory = "5Gi"
81-
}
82-
labels = ["self-hosted", "ubuntu-20.04", "highmem"]
83-
enable_selector = true
84-
enable_taint = true
85-
},
86-
{
8753
name = "highmem-runner-22"
8854
machine_type = "c3-highmem-22"
8955
runner_image = "us-central1-docker.pkg.dev/apache-beam-testing/beam-github-actions/beam-arc-runner:latest"
@@ -100,24 +66,6 @@ additional_runner_pools = [{
10066
enable_selector = true
10167
enable_taint = true
10268
},
103-
{
104-
name = "main-runner-2404"
105-
machine_type = "e2-standard-16"
106-
runner_image = "us-central1-docker.pkg.dev/apache-beam-testing/beam-github-actions/beam-arc-runner:latest"
107-
min_node_count = "1"
108-
max_node_count = "30"
109-
min_replicas = "1"
110-
max_replicas = "240"
111-
webhook_scaling = false
112-
disk_size_gb = 200
113-
requests = {
114-
cpu = "2"
115-
memory = "3Gi"
116-
}
117-
labels = ["self-hosted", "ubuntu-24.04", "main"]
118-
enable_selector = true
119-
enable_taint = true
120-
},
12169
{
12270
name = "small-runner-2404"
12371
machine_type = "e2-standard-2"

.github/gh-actions-self-hosted-runners/arc/variables.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ variable "main_runner" {
9090
max_replicas = optional(number, 1)
9191
disk_size_gb = optional(number, 100)
9292
webhook_scaling = optional(bool, false)
93-
runner_image = optional(string, "summerwind/actions-runner:v2.304.0-ubuntu-20.04-30355f7")
94-
labels = optional(list(string), ["self-hosted", "ubuntu-20.04","main"])
93+
runner_image = optional(string, "summerwind/actions-runner:v2.334.0-ubuntu-24.04-012f1a5")
94+
labels = optional(list(string), ["self-hosted", "ubuntu-24.04","main"])
9595
enable_selector = optional(bool, false)
9696
enable_taint = optional(bool, false)
9797
requests = optional(object({
@@ -119,8 +119,8 @@ variable "additional_runner_pools" {
119119
max_replicas = optional(number, 1)
120120
disk_size_gb = optional(number, 100)
121121
webhook_scaling = optional(bool, false)
122-
runner_image = optional(string, "summerwind/actions-runner:v2.304.0-ubuntu-20.04-30355f7")
123-
labels = optional(list(string), ["self-hosted", "ubuntu-20.04","changeme"])
122+
runner_image = optional(string, "summerwind/actions-runner:v2.334.0-ubuntu-24.04-012f1a5")
123+
labels = optional(list(string), ["self-hosted", "ubuntu-24.04","changeme"])
124124
enable_selector = optional(bool, true)
125125
enable_taint = optional(bool, true)
126126
requests = optional(object({

0 commit comments

Comments
 (0)