chore: Update versions in amplify-app and eks modules

nanlabs · Sep 24, 2024 · 9fcb8b8 · 9fcb8b8
1 parent eb5cd1e
commit 9fcb8b8
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 5 deletions.
diff --git a/modules/amplify-app/main.tf b/modules/amplify-app/main.tf
@@ -5,7 +5,7 @@ data "aws_ssm_parameter" "github_pat" {
 
 module "amplify_app" {
   source  = "cloudposse/amplify-app/aws"
-  version = "1.0.0"
+  version = "1.1.0"
 
   name = var.name
 

diff --git a/modules/bastion/scripts/connect.sh b/modules/bastion/scripts/connect.sh
@@ -70,7 +70,7 @@ fi
 # Retrieve Bastion instance ID if not provided
 if [[ -z "$instance_id" ]]; then
     echo "Retrieving Bastion instance ID..."
-    instance_id=$(aws ec2 describe-instances --filters "Name=tag:Name,Values=$tag" --query "Reservations[*].Instances[*].InstanceId" --output text)
+    instance_id=$(aws ec2 describe-instances --filters "Name=tag:Name,Values=$tag" "Name=instance-state-name,Values=running" --query "Reservations[*].Instances[*].InstanceId" --output text | head -n 1)
     if [[ -z "$instance_id" ]]; then
         echo "No Bastion host found with tag: $tag"
         exit 1

diff --git a/modules/eks/docs/MODULE.md b/modules/eks/docs/MODULE.md
@@ -73,4 +73,5 @@
 | <a name="output_eks_cluster_id"></a> [eks\_cluster\_id](#output\_eks\_cluster\_id) | The ID of the EKS cluster |
 | <a name="output_eks_cluster_managed_security_group_id"></a> [eks\_cluster\_managed\_security\_group\_id](#output\_eks\_cluster\_managed\_security\_group\_id) | n/a |
 | <a name="output_eks_cluster_node_group_roles_arns"></a> [eks\_cluster\_node\_group\_roles\_arns](#output\_eks\_cluster\_node\_group\_roles\_arns) | The ARNs of the IAM roles associated with the EKS cluster node groups |
+| <a name="output_eks_cluster_node_group_roles_names"></a> [eks\_cluster\_node\_group\_roles\_names](#output\_eks\_cluster\_node\_group\_roles\_names) | The names of the IAM roles associated with the EKS cluster node groups |
 <!-- END_TF_DOCS -->
diff --git a/modules/eks/main.tf b/modules/eks/main.tf
@@ -78,7 +78,7 @@ module "eks_node_groups" {
   for_each = { for idx, node_group in var.node_groups : idx => node_group }
 
   cluster_name      = module.eks_cluster.eks_cluster_id
-  subnet_ids        = var.private_subnets
+  subnet_ids        = [var.private_subnets[0]]
   instance_types    = each.value.instance_types
   desired_size      = each.value.desired_size
   min_size          = each.value.min_size

diff --git a/modules/eks/outputs.tf b/modules/eks/outputs.tf
@@ -21,3 +21,8 @@ output "eks_cluster_node_group_roles_arns" {
   description = "The ARNs of the IAM roles associated with the EKS cluster node groups"
   value       = tolist([for ng in module.eks_node_groups : ng.eks_node_group_role_arn])
 }
+
+output "eks_cluster_node_group_roles_names" {
+  description = "The names of the IAM roles associated with the EKS cluster node groups"
+  value       = tolist([for ng in module.eks_node_groups : ng.eks_node_group_role_name])
+}
diff --git a/modules/msk/docs/MODULE.md b/modules/msk/docs/MODULE.md
@@ -14,7 +14,7 @@ No providers.
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_kafka"></a> [kafka](#module\_kafka) | cloudposse/msk-apache-kafka-cluster/aws | v2.4.0 |
+| <a name="module_kafka"></a> [kafka](#module\_kafka) | cloudposse/msk-apache-kafka-cluster/aws | 2.4.0 |
 
 ## Resources
 

diff --git a/modules/msk/main.tf b/modules/msk/main.tf
@@ -1,6 +1,6 @@
 module "kafka" {
   source  = "cloudposse/msk-apache-kafka-cluster/aws"
-  version = "v2.4.0"
+  version = "2.4.0"
   name    = var.name
 
   zone_id                  = var.zone_id