From bcdfe92b1de47a2604be5012b4d02bfd030703df Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Fri, 15 Sep 2023 15:51:02 +0200 Subject: [PATCH 1/2] increase ASG timeout Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> --- .../terraform/terraform/aws/modules/instance_group/main.tf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cli/internal/terraform/terraform/aws/modules/instance_group/main.tf b/cli/internal/terraform/terraform/aws/modules/instance_group/main.tf index 6655b1f4e5..7cbad5d605 100644 --- a/cli/internal/terraform/terraform/aws/modules/instance_group/main.tf +++ b/cli/internal/terraform/terraform/aws/modules/instance_group/main.tf @@ -84,6 +84,11 @@ resource "aws_autoscaling_group" "autoscaling_group" { vpc_zone_identifier = [var.subnetwork] target_group_arns = var.target_group_arns + # TODO(msanft): Remove this (to have the 10m default) once AWS SEV-SNP boot problems are resolved. + # Set a higher timeout for the ASG to fulfill the desired healthy capcity. Temporary workaround to + # long boot times on SEV-SNP machines on AWS. + wait_for_capacity_timeout = "20m" + dynamic "tag" { for_each = var.tags content { From 2c20b33e30a03f8ff7f698682730cb4075061c16 Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Fri, 15 Sep 2023 16:00:14 +0200 Subject: [PATCH 2/2] make timeout dependent on SEV-SNP option Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> --- .../terraform/terraform/aws/modules/instance_group/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/internal/terraform/terraform/aws/modules/instance_group/main.tf b/cli/internal/terraform/terraform/aws/modules/instance_group/main.tf index 7cbad5d605..bc491389e5 100644 --- a/cli/internal/terraform/terraform/aws/modules/instance_group/main.tf +++ b/cli/internal/terraform/terraform/aws/modules/instance_group/main.tf @@ -87,7 +87,7 @@ resource "aws_autoscaling_group" "autoscaling_group" { # TODO(msanft): Remove this (to have the 10m default) once AWS SEV-SNP boot problems are resolved. # Set a higher timeout for the ASG to fulfill the desired healthy capcity. Temporary workaround to # long boot times on SEV-SNP machines on AWS. - wait_for_capacity_timeout = "20m" + wait_for_capacity_timeout = var.enable_snp ? "20m" : "10m" dynamic "tag" { for_each = var.tags