Skip to content

fix(aws): derive AMI name prefix from var.prefix #2115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sitole merged 2 commits into from
Mar 13, 2026
+12 −8
Merged

fix(aws): derive AMI name prefix from var.prefix #2115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d78835c
fix(aws): derive AMI name prefix from var.prefix
ya-luotao Mar 12, 2026
144fc39
fix: keep per-node-pool AMI prefix overridable
ya-luotao Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions iac/provider-aws/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ locals {
clickhouse_pool_name = "clickhouse"
clickhouse_jobs_prefix = "clickhouse"

# AMI name prefix must match what Packer produces: "${var.prefix}orch-<timestamp>"
ami_family_prefix = "${var.prefix}orch-"

redis_cluster_url = var.redis_managed ? "rediss://${module.redis[0].endpoint_address}:${local.redis_port}" : ""
redis_tls_ca_base64 = var.redis_managed ? module.redis[0].endpoint_ca_pem_base64 : ""
redis_url = local.redis_cluster_url == "" ? "redis.service.consul:${local.redis_port}" : ""
Expand Down Expand Up @@ -105,7 +108,7 @@ module "cluster" {
consul_gossip_encryption_key = module.init.cluster.consul_gossip_encryption_key

control_server_cluster_size = var.control_server_cluster_size
control_server_image_family_prefix = var.control_server_image_family_prefix
control_server_image_family_prefix = var.control_server_image_family_prefix != "" ? var.control_server_image_family_prefix : local.ami_family_prefix
control_server_machine_type = var.control_server_machine_type
control_server_target_group_arns = [aws_lb_target_group.nomad.arn]
control_server_security_group_ids = [aws_security_group.cluster_node.id]
Expand All @@ -126,7 +129,7 @@ module "cluster" {

api_node_pool_name = local.api_pool_name
api_cluster_size = var.api_cluster_size
api_image_family_prefix = var.api_image_family_prefix
api_image_family_prefix = var.api_image_family_prefix != "" ? var.api_image_family_prefix : local.ami_family_prefix
api_machine_type = var.api_server_machine_type
api_security_group_ids = [aws_security_group.cluster_node.id]
api_target_group_arns = [
Expand All @@ -136,22 +139,23 @@ module "cluster" {

build_node_pool_name = local.build_pool_name
build_cluster_size = var.build_cluster_size
build_image_family_prefix = local.ami_family_prefix
build_machine_type = var.build_server_machine_type
build_server_nested_virtualization = var.build_server_nested_virtualization
build_security_group_ids = [aws_security_group.cluster_node.id]
build_node_labels = var.build_node_labels

client_node_pool_name = local.client_pool_name
client_cluster_size = var.client_cluster_size
client_image_family_prefix = var.client_image_family_prefix
client_image_family_prefix = var.client_image_family_prefix != "" ? var.client_image_family_prefix : local.ami_family_prefix
client_machine_type = var.client_server_machine_type
client_security_group_ids = [aws_security_group.cluster_node.id]
client_server_nested_virtualization = var.client_server_nested_virtualization
client_node_labels = var.client_node_labels

clickhouse_az = "${data.aws_region.current.name}a"
clickhouse_cluster_size = var.clickhouse_cluster_size
clickhouse_image_family_prefix = var.clickhouse_image_family_prefix
clickhouse_image_family_prefix = var.clickhouse_image_family_prefix != "" ? var.clickhouse_image_family_prefix : local.ami_family_prefix
clickhouse_machine_type = var.clickhouse_server_machine_type
clickhouse_node_pool_name = local.clickhouse_pool_name
clickhouse_security_group_ids = [aws_security_group.cluster_node.id]
Expand Down
8 changes: 4 additions & 4 deletions iac/provider-aws/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ variable "api_server_machine_type" {

variable "api_image_family_prefix" {
type = string
default = "e2b-orch-"
default = ""
}

variable "ingress_count" {
Expand All @@ -71,7 +71,7 @@ variable "clickhouse_server_machine_type" {

variable "clickhouse_image_family_prefix" {
type = string
default = "e2b-orch-"
default = ""
}

variable "client_cluster_size" {
Expand All @@ -97,7 +97,7 @@ variable "client_node_labels" {

variable "client_image_family_prefix" {
type = string
default = "e2b-orch-"
default = ""
}

variable "control_server_machine_type" {
Expand All @@ -107,7 +107,7 @@ variable "control_server_machine_type" {

variable "control_server_image_family_prefix" {
type = string
default = "e2b-orch-"
default = ""
}

variable "orchestrator_port" {
Expand Down
Loading