Skip to content

Commit 2f765f5

Browse files
committed
feat: pass mqtt_broker_type to infra module for IoT Core support
When mqtt_broker_type is set to "iotcore", the infra module now creates the aws_iot_topic_rule and associated IAM resources needed to route MQTT messages from spacelift/writeonly/# to the SQS queue. Without this, worker messages (heartbeats, worker_ready, run_complete) never reach the drain and runs get stuck after job assignment. Also bumps the infra module to v2.2.0 which includes the IoT Core topic rule support in its SQS submodule.
1 parent cd3d4b1 commit 2f765f5

3 files changed

Lines changed: 15 additions & 10 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,11 @@ provider "aws" {
104104
}
105105
106106
module "spacelift" {
107-
source = "github.com/spacelift-io/terraform-aws-eks-spacelift-selfhosted?ref=v3.1.0"
107+
source = "github.com/spacelift-io/terraform-aws-eks-spacelift-selfhosted?ref=v3.4.4"
108108
109109
aws_region = var.aws_region
110110
111-
eks_cluster_version = "1.34" # Optional: Kubernetes version. Omit to use latest available version.
111+
eks_cluster_version = "1.34" # Optional: Kubernetes version. Omit to use latest available version (recommended).
112112
rds_engine_version = "17.7" # Postgres version
113113
114114
# Optional: Set upgrade policy to STANDARD for more frequent upgrades and lower cost

examples/without-auto-mode/main.tf

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@ data "aws_rds_engine_version" "postgres" {
33
latest = true
44
}
55

6+
data "aws_eks_cluster_versions" "this" {
7+
default_only = true
8+
}
9+
610
module "spacelift_eks_selfhosted" {
711
source = "../../"
812

9-
aws_region = var.aws_region
10-
server_domain = "test.spacelift.example.com"
11-
rds_engine_version = data.aws_rds_engine_version.postgres.version_actual
12-
13-
eks_cluster_version = "1.32"
13+
aws_region = var.aws_region
14+
server_domain = "test.spacelift.example.com"
15+
rds_engine_version = data.aws_rds_engine_version.postgres.version_actual
16+
eks_cluster_version = data.aws_eks_cluster_versions.this.cluster_versions[0].cluster_version
1417

1518
eks_upgrade_policy = {
1619
support_type = "STANDARD"
@@ -23,9 +26,9 @@ module "spacelift_eks_selfhosted" {
2326
spacelift = {
2427
ami_type = "AL2023_x86_64_STANDARD"
2528
instance_types = ["m5.large"]
26-
min_size = 2
29+
min_size = 1
2730
max_size = 4
28-
desired_size = 2
31+
desired_size = 1
2932
}
3033
}
3134

main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,14 @@ locals {
3030
}
3131

3232
module "spacelift" {
33-
source = "github.com/spacelift-io/terraform-aws-spacelift-selfhosted?ref=v2.1.1"
33+
source = "github.com/spacelift-io/terraform-aws-spacelift-selfhosted?ref=v2.2.0"
3434

3535
unique_suffix = local.unique_suffix
3636
region = var.aws_region
3737
website_endpoint = "https://${var.server_domain}"
3838

39+
mqtt_broker_type = var.mqtt_broker_type
40+
3941
kms_arn = var.kms_arn
4042
kms_master_key_multi_regional = var.kms_master_key_multi_regional
4143
kms_jwt_key_multi_regional = var.kms_jwt_key_multi_regional

0 commit comments

Comments
 (0)