From f7537a8c4cad7c53af9e8e09cc9f273953111999 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Fri, 16 Feb 2024 16:25:16 -0500 Subject: [PATCH 1/2] Add worker_feature_flags input variable. --- asg.tf | 1 + templates/worker_user_data.sh | 4 ++++ worker_variables.tf | 8 +++++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/asg.tf b/asg.tf index 58e18f4..cfdd828 100644 --- a/asg.tf +++ b/asg.tf @@ -24,6 +24,7 @@ locals { "tsa_host" = aws_elb.concourse_lb.dns_name "storage_driver" = var.worker_container_storage_driver "dns_servers" = var.worker_dns_servers + "feature_flags" = var.worker_feature_flags } } diff --git a/templates/worker_user_data.sh b/templates/worker_user_data.sh index 3dde742..ed992b5 100644 --- a/templates/worker_user_data.sh +++ b/templates/worker_user_data.sh @@ -47,6 +47,10 @@ Environment=\"CONCOURSE_TSA_HOST=${tsa_host}:2222\" Environment=\"CONCOURSE_TSA_PUBLIC_KEY=/etc/concourse/keys/worker/tsa_host_key.pub\" Environment=\"CONCOURSE_TSA_WORKER_PRIVATE_KEY=/etc/concourse/keys/worker/worker_key\" +%{ for item in feature_flags ~} +Environment=\"${item}\" +%{ endfor ~} + KillMode=none ExecStart=/bin/true ExecStop=/etc/concourse/bin/concourse retire-worker --name $(hostname) diff --git a/worker_variables.tf b/worker_variables.tf index b2c3d12..3085640 100644 --- a/worker_variables.tf +++ b/worker_variables.tf @@ -48,4 +48,10 @@ variable "worker_patch_schedule" { variable "worker_dns_servers" { default = ["8.8.8.8", "8.8.4.4"] description = "Optional DNS servers. Defaults to google." -} \ No newline at end of file +} + +variable "worker_feature_flags" { + type = list(string) + default = [] + description = "Pass feature flag options here as a list of key value environment variables. Defaults to nothing." +} From 13e6254f17e8a914b3e77aebca297d5f8723d195 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Fri, 16 Feb 2024 17:15:28 -0500 Subject: [PATCH 2/2] Move feature flags to correct location of user data. --- templates/worker_user_data.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/worker_user_data.sh b/templates/worker_user_data.sh index ed992b5..2e364be 100644 --- a/templates/worker_user_data.sh +++ b/templates/worker_user_data.sh @@ -24,6 +24,10 @@ Environment=\"CONCOURSE_TSA_WORKER_PRIVATE_KEY=/etc/concourse/keys/worker/worker Environment=\"CONCOURSE_WORK_DIR=/opt/concourse-workdir\" Environment=\"CONCOURSE_GARDEN_DNS_SERVER=${join(",", dns_servers)}\" +%{ for item in feature_flags ~} +Environment=\"${item}\" +%{ endfor ~} + Type=simple Restart=always RestartSec=1 @@ -47,10 +51,6 @@ Environment=\"CONCOURSE_TSA_HOST=${tsa_host}:2222\" Environment=\"CONCOURSE_TSA_PUBLIC_KEY=/etc/concourse/keys/worker/tsa_host_key.pub\" Environment=\"CONCOURSE_TSA_WORKER_PRIVATE_KEY=/etc/concourse/keys/worker/worker_key\" -%{ for item in feature_flags ~} -Environment=\"${item}\" -%{ endfor ~} - KillMode=none ExecStart=/bin/true ExecStop=/etc/concourse/bin/concourse retire-worker --name $(hostname)