Преглед изворни кода

Drops the bastion from t3a.xlarge to t3a.medium

Fred Damstra [afs macbook] пре 3 година
родитељ
комит
9d39923c57

+ 1 - 1
prod/aws-us-gov/mdr-prod-c2/070-instance-bastion/terragrunt.hcl

@@ -35,7 +35,7 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
   instance_name = "bastion"
-  instance_type = local.account_vars.locals.bastion_instance_type
+  instance_type = local.account_vars.locals.instance_types["bastion"]
   vpc_id = dependency.vpc-access.outputs.vpc_id
   azs = dependency.vpc-access.outputs.azs
   subnets = dependency.vpc-access.outputs.public_subnets

+ 1 - 3
prod/aws-us-gov/mdr-prod-c2/account.hcl

@@ -153,6 +153,7 @@ locals {
   instance_types = {
     #"alsi-master"    = "t3a.small",
     #"alsi-worker"    = "t3a.small",
+    "bastion" = "t3a.medium",
     "fm-shared-search" = "m5a.large", # Legacy: t2.small,  prod m4.large
     "github"         = "c5.4xlarge", # legacy: c4.4xlarge in prod, c5.2xlarge in test
     "github-backup"  = "t3a.medium", # legacy: t2.medium
@@ -173,9 +174,6 @@ locals {
     "portal"         = "t3a.medium", # legacy: t2.medium
   }
 
-  # Bastion
-  bastion_instance_type = "t3a.xlarge"
-
   # GitHub
   github_instance_count = 1
   github_data_volume_size = 500

+ 1 - 1
test/aws-us-gov/mdr-test-c2/070-instance-bastion/terragrunt.hcl

@@ -35,7 +35,7 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
   instance_name = "bastion"
-  instance_type = local.account_vars.locals.bastion_instance_type
+  instance_type = local.account_vars.locals.instance_types["bastion"]
   vpc_id = dependency.vpc-access.outputs.vpc_id
   azs = dependency.vpc-access.outputs.azs
   subnets = dependency.vpc-access.outputs.public_subnets

+ 1 - 3
test/aws-us-gov/mdr-test-c2/account.hcl

@@ -143,6 +143,7 @@ locals {
   instance_types = {
     "alsi-master"    = "t3a.small",
     "alsi-worker"    = "t3a.small",
+    "bastion" = "t3a.medium",
     "fm-shared-search" = "t3a.small", # Legacy: t2.small,  prod m4.large
     "github"         = "c5.2xlarge", # legacy: c4.4xlarge in prod, c5.2xlarge in test
     "github-backup"  = "t3a.medium", # legacy: t2.micro
@@ -172,9 +173,6 @@ locals {
   # DNS Resolver
   resolver_instance_type = "t3a.xlarge"
 
-  # Bastion
-  bastion_instance_type = "t3a.xlarge"
-
   # Keycloak
   keycloak_instance_count = 1 # May or may not support > 1