This is an automated email from the ASF dual-hosted git repository. shahar1 pushed a commit to branch gha-arc-rebase in repository https://gitbox.apache.org/repos/asf/airflow-ci-infra.git
commit b773a3791f9ad713be3d9661ece32795eb8cff52 Author: Hussein Awala <[email protected]> AuthorDate: Tue Oct 24 01:25:28 2023 +0200 Fix labels and bump docker image versions --- helm/runners-config/values.yaml | 18 +++++++++--------- helm/values/actions-runner-controller.yaml | 2 +- runner/Dockerfile | 4 ++-- terraform/eks/eks.tf | 26 +++++++++++++------------- terraform/eks/variables.tf | 6 +++--- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/helm/runners-config/values.yaml b/helm/runners-config/values.yaml index 404cab7..e22ed43 100644 --- a/helm/runners-config/values.yaml +++ b/helm/runners-config/values.yaml @@ -70,46 +70,46 @@ runners: operator: Equal value: gha-runners effect: NoSchedule - - name: small-x86 + - name: small-x64 minReplicas: 0 maxReplicas: 30 labels: - small - - x86 + - X64 nodeSelector: node-type: gha-runners size: small - arch: x86 + arch: x64 tolerations: - key: node-type operator: Equal value: gha-runners effect: NoSchedule - - name: medium-x86 + - name: medium-x64 minReplicas: 0 maxReplicas: 30 labels: - medium - - x86 + - X64 nodeSelector: node-type: gha-runners size: medium - arch: x86 + arch: x64 tolerations: - key: node-type operator: Equal value: gha-runners effect: NoSchedule - - name: large-x86 + - name: large-x64 minReplicas: 0 maxReplicas: 30 labels: - large - - x86 + - X64 nodeSelector: node-type: gha-runners size: large - arch: x86 + arch: x64 tolerations: - key: node-type operator: Equal diff --git a/helm/values/actions-runner-controller.yaml b/helm/values/actions-runner-controller.yaml index a131154..78e609e 100644 --- a/helm/values/actions-runner-controller.yaml +++ b/helm/values/actions-runner-controller.yaml @@ -27,5 +27,5 @@ nodeSelector: node-type: default image: - actionsRunnerRepositoryAndTag: public.ecr.aws/u9s5q9f7/airflow-gha-runner:2.304.0-airflow8 + actionsRunnerRepositoryAndTag: public.ecr.aws/u9s5q9f7/airflow-gha-runner:2.309.0-airflow11 dindSidecarRepositoryAndTag: public.ecr.aws/u9s5q9f7/docker:dind diff --git a/runner/Dockerfile b/runner/Dockerfile index c752696..d1ee441 100644 --- a/runner/Dockerfile +++ b/runner/Dockerfile @@ -1,10 +1,10 @@ -ARG ACTIONS_RUNNER_VERSION=v2.307.1-ubuntu-22.04-dcb64f0 +ARG ACTIONS_RUNNER_VERSION=v2.309.0-ubuntu-22.04-ead26ab FROM summerwind/actions-runner:${ACTIONS_RUNNER_VERSION} USER root -ARG AIRFLOW_RUNNER_VERSION +ARG AIRFLOW_RUNNER_VERSION=2.309.0-airflow11 RUN rm -rf $RUNNER_ASSETS_DIR/* \ && export ARCH=$(arch) \ diff --git a/terraform/eks/eks.tf b/terraform/eks/eks.tf index 2776204..772903d 100644 --- a/terraform/eks/eks.tf +++ b/terraform/eks/eks.tf @@ -138,13 +138,13 @@ module "eks" { ] } - # GHA x86 runners' nodes - x86_GHA_runners_small = { - name = "gha-x86-runners-small" + # GHA x64 runners' nodes + x64_GHA_runners_small = { + name = "gha-x64-runners-small" ami_type = "AL2_x86_64" - instance_types = [for node_type in var.x86_runners_node_types: "${node_type}.${var.small_runners_x86_node_size}"] + instance_types = [for node_type in var.x64_runners_node_types: "${node_type}.${var.small_runners_x64_node_size}"] min_size = 0 max_size = 30 @@ -156,7 +156,7 @@ module "eks" { labels = { "node-type" = "gha-runners" "size" = "small" - "arch" = "x86" + "arch" = "x64" } taints = [ @@ -168,12 +168,12 @@ module "eks" { ] } - x86_GHA_runners_medium = { - name = "gha-x86-runners-medium" + x64_GHA_runners_medium = { + name = "gha-x64-runners-medium" ami_type = "AL2_x86_64" - instance_types = [for node_type in var.x86_runners_node_types: "${node_type}.${var.medium_runners_node_size}"] + instance_types = [for node_type in var.x64_runners_node_types: "${node_type}.${var.medium_runners_node_size}"] min_size = 0 max_size = 30 @@ -185,7 +185,7 @@ module "eks" { labels = { "node-type" = "gha-runners" "size" = "medium" - "arch" = "x86" + "arch" = "x64" } taints = [ @@ -197,12 +197,12 @@ module "eks" { ] } - x86_GHA_runners_large = { - name = "gha-x86-runners-large" + x64_GHA_runners_large = { + name = "gha-x64-runners-large" ami_type = "AL2_x86_64" - instance_types = [for node_type in var.x86_runners_node_types: "${node_type}.${var.large_runners_node_size}"] + instance_types = [for node_type in var.x64_runners_node_types: "${node_type}.${var.large_runners_node_size}"] min_size = 0 max_size = 30 @@ -212,7 +212,7 @@ module "eks" { labels = { "node-type" = "gha-runners" "size" = "large" - "arch" = "x86" + "arch" = "x64" } taints = [ diff --git a/terraform/eks/variables.tf b/terraform/eks/variables.tf index 52f0e67..7d9b4ad 100644 --- a/terraform/eks/variables.tf +++ b/terraform/eks/variables.tf @@ -33,8 +33,8 @@ variable "runners_node_types" { default = ["t4g"] } -variable "x86_runners_node_types" { - description = "X86 node type for the runners" +variable "x64_runners_node_types" { + description = "X64 node type for the runners" type = list(string) default = [ "r6a", @@ -53,7 +53,7 @@ variable "small_runners_node_size" { default = "medium" } -variable "small_runners_x86_node_size" { +variable "small_runners_x64_node_size" { # This is a separate variable because the r series doesn't have a medium size description = "Node size for the small runners" type = string
