From 891bdc0e2455a0e0a1e4abc2f5e9eda842be66e0 Mon Sep 17 00:00:00 2001 From: Zachary Winnerman <98712682+zwinnerman-fleetdm@users.noreply.github.com> Date: Thu, 29 Sep 2022 11:15:33 -0400 Subject: [PATCH] Some quick fixes that I noticed deploying sandbox dev (#7948) --- infrastructure/sandbox/PreProvisioner/main.tf | 2 +- infrastructure/sandbox/SharedInfrastructure/eks.tf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/infrastructure/sandbox/PreProvisioner/main.tf b/infrastructure/sandbox/PreProvisioner/main.tf index aea093a05b..44c5505810 100644 --- a/infrastructure/sandbox/PreProvisioner/main.tf +++ b/infrastructure/sandbox/PreProvisioner/main.tf @@ -257,7 +257,7 @@ resource "aws_ecs_task_definition" "main" { }, { name = "QUEUED_INSTANCES" - value = data.aws_caller_identity.current.account_id == 411315989055 ? "20" : "5" + value = "20" }, { name = "TF_VAR_redis_address" diff --git a/infrastructure/sandbox/SharedInfrastructure/eks.tf b/infrastructure/sandbox/SharedInfrastructure/eks.tf index 04db20a465..936560a4d6 100644 --- a/infrastructure/sandbox/SharedInfrastructure/eks.tf +++ b/infrastructure/sandbox/SharedInfrastructure/eks.tf @@ -27,8 +27,8 @@ locals { cluster_version = "1.21" account_role_mapping = { # Add nonprod or other deployed accounts here - 411315989055 = "AWSReservedSSO_SandboxDevAdmins_6cfa1b6052653825" - 968703308407 = "AWSReservedSSO_SandboxProdAdmins_9ccaa4f25c2eada0" + 411315989055 = "AWSReservedSSO_SandboxProdAdmins_9ccaa4f25c2eada0" + 968703308407 = "AWSReservedSSO_SandboxDevAdmins_6cfa1b6052653825" } # Role Generated by SSO but needs admin to EKS # This hack is needed because "aws_iam_role" returns an unsusable ARN for EKS on SSO roles.