Skip to content

Commit 93ac4ec

Browse files
authored
Fix scaleUpChron environment variables (#6479)
`scaleUpChron` lambda requires the same environment variables as `scaleUp` lambda. But by mistake that wasn't the case. This PR simply make sure that all relevant environment variables are correctly set.
1 parent 38d53d7 commit 93ac4ec

File tree

2 files changed

+36
-22
lines changed

2 files changed

+36
-22
lines changed

terraform-aws-github-runner/modules/runners/scale-up-chron.tf

+35-22
Original file line numberDiff line numberDiff line change
@@ -27,30 +27,43 @@ resource "aws_lambda_function" "scale_up_chron" {
2727
tags = local.tags
2828
memory_size = 2048
2929

30+
# changes should reflect the changes in scale-up.tf
3031
environment {
3132
variables = {
32-
AWS_REGION_INSTANCES = join(",", var.aws_region_instances)
33-
DATETIME_DEPLOY = local.datetime_deploy
34-
ENABLE_ORGANIZATION_RUNNERS = var.enable_organization_runners
35-
ENVIRONMENT = var.environment
36-
GHES_URL = var.ghes_url
37-
GITHUB_APP_CLIENT_ID = var.github_app.client_id
38-
GITHUB_APP_CLIENT_SECRET = var.github_app_client_secret
39-
GITHUB_APP_ID = var.github_app.id
40-
GITHUB_APP_KEY_BASE64 = var.github_app_key_base64
41-
KMS_KEY_ID = var.encryption.kms_key_id
42-
LAMBDA_TIMEOUT = var.lambda_timeout_scale_up_chron
43-
MIN_AVAILABLE_RUNNERS = var.min_available_runners
44-
MINIMUM_RUNNING_TIME_IN_MINUTES = var.minimum_running_time_in_minutes
45-
REDIS_ENDPOINT = var.redis_endpoint
46-
REDIS_LOGIN = var.redis_login
47-
SCALE_CONFIG_ORG = var.scale_config_org
48-
SCALE_CONFIG_REPO = var.scale_config_repo
49-
SCALE_CONFIG_REPO_PATH = var.scale_config_repo_path
50-
SCALE_UP_MIN_QUEUE_TIME_MINUTES = 30
51-
SCALE_UP_CHRON_HUD_QUERY_URL = var.retry_scale_up_chron_hud_query_url
52-
scale_up_chron_CONFIG = jsonencode(var.idle_config)
53-
SECRETSMANAGER_SECRETS_ID = var.secretsmanager_secrets_id
33+
CANT_HAVE_ISSUES_LABELS = join(",", var.cant_have_issues_labels)
34+
DATETIME_DEPLOY = local.datetime_deploy
35+
ENABLE_ORGANIZATION_RUNNERS = var.enable_organization_runners
36+
ENVIRONMENT = var.environment
37+
GITHUB_APP_CLIENT_ID = var.github_app.client_id
38+
GITHUB_APP_CLIENT_SECRET = var.github_app_client_secret
39+
GITHUB_APP_ID = var.github_app.id
40+
GITHUB_APP_KEY_BASE64 = var.github_app_key_base64
41+
KMS_KEY_ID = var.encryption.kms_key_id
42+
LAMBDA_TIMEOUT = var.lambda_timeout_scale_up
43+
LAUNCH_TEMPLATE_NAME_LINUX = var.launch_template_name_linux
44+
LAUNCH_TEMPLATE_NAME_LINUX_ARM64 = var.launch_template_name_linux_arm64
45+
LAUNCH_TEMPLATE_NAME_LINUX_NVIDIA = var.launch_template_name_linux_nvidia
46+
LAUNCH_TEMPLATE_NAME_WINDOWS = var.launch_template_name_windows
47+
LAUNCH_TEMPLATE_VERSION_LINUX = var.launch_template_version_linux
48+
LAUNCH_TEMPLATE_VERSION_LINUX_ARM64 = var.launch_template_version_linux_arm64
49+
LAUNCH_TEMPLATE_VERSION_LINUX_NVIDIA = var.launch_template_version_linux_nvidia
50+
LAUNCH_TEMPLATE_VERSION_WINDOWS = var.launch_template_version_windows
51+
MAX_RETRY_SCALEUP_RECORD = "10"
52+
MIN_AVAILABLE_RUNNERS = var.min_available_runners
53+
MUST_HAVE_ISSUES_LABELS = join(",", var.must_have_issues_labels)
54+
REDIS_ENDPOINT = var.redis_endpoint
55+
REDIS_LOGIN = var.redis_login
56+
RETRY_SCALE_UP_RECORD_DELAY_S = "60"
57+
RETRY_SCALE_UP_RECORD_JITTER_PCT = "0.5"
58+
RETRY_SCALE_UP_CHRON_RECORD_QUEUE_URL = var.sqs_build_queue_retry.url
59+
RUNNER_EXTRA_LABELS = var.runner_extra_labels
60+
SCALE_CONFIG_ORG = var.scale_config_org
61+
SCALE_CONFIG_REPO = var.scale_config_repo
62+
SCALE_CONFIG_REPO_PATH = var.scale_config_repo_path
63+
SECRETSMANAGER_SECRETS_ID = var.secretsmanager_secrets_id
64+
SCALE_UP_CHRON_HUD_QUERY_URL = var.retry_scale_up_chron_hud_query_url
65+
SCALE_UP_MIN_QUEUE_TIME_MINUTES = 30
66+
5467
AWS_REGIONS_TO_VPC_IDS = join(
5568
",",
5669
sort(distinct([

terraform-aws-github-runner/modules/runners/scale-up.tf

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ resource "aws_lambda_function" "scale_up" {
3939
}
4040

4141
environment {
42+
# changes should reflect the changes in scale-up-chron.tf
4243
variables = {
4344
CANT_HAVE_ISSUES_LABELS = join(",", var.cant_have_issues_labels)
4445
DATETIME_DEPLOY = local.datetime_deploy

0 commit comments

Comments
 (0)