From c042721650f935209bca30a06f6cb6eb601197ac Mon Sep 17 00:00:00 2001 From: colbynh Date: Tue, 19 Sep 2023 14:12:38 -0400 Subject: [PATCH 1/5] Update philips-labs component version --- main.tf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main.tf b/main.tf index 87870a2..abfea48 100755 --- a/main.tf +++ b/main.tf @@ -38,7 +38,7 @@ resource "random_string" "github_runner_random_suffix" { module "github_runner" { source = "philips-labs/github-runner/aws" - version = "v3.6.1" + version = "v4.2.3" prefix = module.github_runner_label.id enable_ephemeral_runners = var.runner_ephemeral_mode_enabled @@ -60,6 +60,7 @@ module "github_runner" { instance_target_capacity_type = lower(var.instance_lifecycle_type) instance_types = var.instance_types instance_allocation_strategy = "capacity-optimized" + key_name = var.key_pair_name logging_retention_in_days = var.log_retention subnet_ids = var.vpc_subnet_ids vpc_id = var.vpc_id From 17db2941fdd2f95ca379e5b236889ad2b9e35c69 Mon Sep 17 00:00:00 2001 From: colbynh Date: Tue, 19 Sep 2023 14:14:02 -0400 Subject: [PATCH 2/5] feat: Add ability to add a key pair to the runner --- variables.tf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/variables.tf b/variables.tf index f480192..011ac61 100755 --- a/variables.tf +++ b/variables.tf @@ -25,6 +25,12 @@ variable "github_organization_runner_enabled" { default = true } +variable "key_pair_name" { + description = "Key pair name" + type = string + default = null +} + variable "runner_ephemeral_mode_enabled" { type = bool description = "Toggle to activate ephemeral runners." From a111118d941a4ea7c286cfa410188be042be241f Mon Sep 17 00:00:00 2001 From: colbynh Date: Tue, 19 Sep 2023 14:55:41 -0400 Subject: [PATCH 3/5] Update readme for key_pair_name --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fea963a..af65284 100755 --- a/README.md +++ b/README.md @@ -47,6 +47,7 @@ other optional variables (e.g., `name`, `tags`, etc.) provided by the | `github_organization` | Name of the GitHub organization. | `string` | n/a | yes | | `github_app_webhook_password` | Password for the GitHub app webhook. An empty string implies a randomly generated password. | `string` | `""` | no | | `github_organization_runner_enabled` | Toggle to activate runners for all projects in the organization. | `bool` | `true` | no | +| `key_pair_name` | Name of the key pair to associate with the runner | `string` | n/a | no | | `runner_ephemeral_mode_enabled` | Toggle to activate ephemeral runners. | `bool` | `false` | no | | `runner_version` | Version of the GitHub Action runner. | `string` | n/a | yes | | `runner_os` | Operating system for the GitHub Action runner. | `string` | `"linux"` | no | From ed971159bf3d62e8ceebae0952db6a4365d100a6 Mon Sep 17 00:00:00 2001 From: colbynh Date: Tue, 19 Sep 2023 14:56:59 -0400 Subject: [PATCH 4/5] Fix formatting --- README.md | 2 +- variables.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index af65284..3d4457f 100755 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ other optional variables (e.g., `name`, `tags`, etc.) provided by the | `github_organization` | Name of the GitHub organization. | `string` | n/a | yes | | `github_app_webhook_password` | Password for the GitHub app webhook. An empty string implies a randomly generated password. | `string` | `""` | no | | `github_organization_runner_enabled` | Toggle to activate runners for all projects in the organization. | `bool` | `true` | no | -| `key_pair_name` | Name of the key pair to associate with the runner | `string` | n/a | no | +| `key_pair_name` | Name of the key pair to associate with the runner | `string` | n/a | no | | `runner_ephemeral_mode_enabled` | Toggle to activate ephemeral runners. | `bool` | `false` | no | | `runner_version` | Version of the GitHub Action runner. | `string` | n/a | yes | | `runner_os` | Operating system for the GitHub Action runner. | `string` | `"linux"` | no | diff --git a/variables.tf b/variables.tf index 011ac61..bf95325 100755 --- a/variables.tf +++ b/variables.tf @@ -26,7 +26,7 @@ variable "github_organization_runner_enabled" { } variable "key_pair_name" { - description = "Key pair name" + description = "Name of the key pair to associate with the runner" type = string default = null } From 89dcd3c6f9436d4bee7ce59240299d6095fd013a Mon Sep 17 00:00:00 2001 From: colbynh Date: Thu, 21 Sep 2023 17:16:02 -0400 Subject: [PATCH 5/5] bug: fix rpm lock --- assets/instance/userdata.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/assets/instance/userdata.sh b/assets/instance/userdata.sh index 47da83a..d6b2777 100644 --- a/assets/instance/userdata.sh +++ b/assets/instance/userdata.sh @@ -60,10 +60,16 @@ export -f provision_instance_stores # --- install: core ----------------------------- + + yum upgrade -y dnf install -y docker +dnf upgrade --refresh rpm glibc +rm /var/lib/rpm/.rpm.lock +dnf -y update + yum install --allowerasing -y \ amazon-cloudwatch-agent \ curl \