Merge pull request #3455 from alphagov/186121126_upgrade-all-our-inst…

…ance-types-to-the-latest-generation upgraded instance types
alphagov · Oct 19, 2023 · 32ba0b7 · 32ba0b7
2 parents 36d77d7 + 3271ebe
commit 32ba0b7
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/manifests/cf-manifest/operations.d/730-elasticache-broker.yml b/manifests/cf-manifest/operations.d/730-elasticache-broker.yml
@@ -23,10 +23,10 @@
       instance_type: cache.t3.micro
 
     tiny_plan: &elasticache_tiny_plan
-      instance_type: cache.t2.small
+      instance_type: cache.t3.small
 
     small_plan: &elasticache_small_plan
-      instance_type: cache.t2.medium
+      instance_type: cache.t3.medium
 
     medium_plan: &elasticache_medium_plan
       instance_type: cache.m5.large
@@ -519,15 +519,15 @@
                 <<: *elasticache_cache_cluster_config # yamllint disable-line
                 <<: *elasticache_redis_3_2 # yamllint disable-line
                 <<: *elasticache_non_ha_plan # yamllint disable-line
-                instance_type: cache.t2.micro
+                instance_type: cache.t3.micro
                 parameters:
                   cluster-enabled: 'yes'
 
               c84d1bef-9500-4ce9-88b2-c0bd421bbf8a: #tiny-3.2
                 <<: *elasticache_cache_cluster_config # yamllint disable-line
                 <<: *elasticache_redis_3_2 # yamllint disable-line
                 <<: *elasticache_non_ha_plan # yamllint disable-line
-                instance_type: cache.t2.micro
+                instance_type: cache.t3.micro
                 automatic_failover_enabled: false
 
               ea5c8cc3-74e6-4b15-bd61-bbe244cfe63d: #tiny-ha-3.2

diff --git a/manifests/variables.yml b/manifests/variables.yml
@@ -4,33 +4,33 @@
 # instances of some types.
 #
 
-compilation_vm_instance_type: c5.large
+compilation_vm_instance_type: c6i.large
 
 nano_vm_instance_type: t3.nano
 
 small_vm_instance_type: t3.small
 
 medium_vm_instance_type: t3.medium
 
-large_vm_instance_type: m5.large
+large_vm_instance_type: m6i.large
 
-xlarge_vm_instance_type: m5.xlarge
+xlarge_vm_instance_type: m6i.xlarge
 
-high_cpu_large_vm_instance_type: c5.large
+high_cpu_large_vm_instance_type: c6i.large
 
-high_mem_large_vm_instance_type: r5.large
+high_mem_large_vm_instance_type: r6i.large
 
-high_mem_xlarge_vm_instance_type: r5.xlarge
+high_mem_xlarge_vm_instance_type: r6i.xlarge
 
-high_cpu_xlarge_vm_instance_type: c5.xlarge
+high_cpu_xlarge_vm_instance_type: c6i.xlarge
 
-cell_instance_type: r5.xlarge
+cell_instance_type: r6i.xlarge
 
-high_cpu_cell_instance_type: m5.2xlarge
+high_cpu_cell_instance_type: m6i.2xlarge
 
-small_cell_instance_type: r5.large
+small_cell_instance_type: r6i.large
 
-router_instance_type: c5.large
+router_instance_type: c6i.large
 
 slim_router_instance_type: t3.medium
 

diff --git a/terraform/cloudfoundry/dev.tfvars b/terraform/cloudfoundry/dev.tfvars
@@ -7,10 +7,10 @@ cdn_db_maintenance_window      = "Mon:07:00-Mon:08:00"
 cdn_db_multi_az                = "false"
 cdn_db_skip_final_snapshot     = "true"
 cf_db_backup_retention_period  = "0"
-cf_db_instance_type            = "db.m5.large"
+cf_db_instance_type            = "db.m6i.large"
 cf_db_maintenance_window       = "Mon:07:00-Mon:08:00"
 cf_db_multi_az                 = "false"
 cf_db_skip_final_snapshot      = "true"
 system_dns_zone_id             = "Z1QGLFML8EG6G7"
 
-bucket_force_destroy           = true
+bucket_force_destroy           = true
diff --git a/terraform/cloudfoundry/prod.tfvars b/terraform/cloudfoundry/prod.tfvars
@@ -9,10 +9,10 @@ cdn_db_maintenance_window       = "Thu:07:00-Thu:08:00"
 cdn_db_multi_az                 = "true"
 cdn_db_skip_final_snapshot      = "false"
 cf_db_backup_retention_period   = "35"
-cf_db_instance_type             = "db.m5.2xlarge"
+cf_db_instance_type             = "db.m6i.2xlarge"
 cf_db_maintenance_window        = "Thu:07:00-Thu:08:00"
 cf_db_multi_az                  = "true"
 cf_db_skip_final_snapshot       = "false"
 system_dns_zone_id              = "Z39UURGVWSYTHL"
 
-bucket_force_destroy            = false
+bucket_force_destroy            = false
diff --git a/terraform/cloudfoundry/staging.tfvars b/terraform/cloudfoundry/staging.tfvars
@@ -9,10 +9,10 @@ cdn_db_maintenance_window       = "Wed:07:00-Wed:08:00"
 cdn_db_multi_az                 = "true"
 cdn_db_skip_final_snapshot      = "false"
 cf_db_backup_retention_period   = "35"
-cf_db_instance_type             = "db.m5.large"
+cf_db_instance_type             = "db.m6i.large"
 cf_db_maintenance_window        = "Wed:07:00-Wed:08:00"
 cf_db_multi_az                  = "true"
 cf_db_skip_final_snapshot       = "false"
 system_dns_zone_id              = "ZPFAUK62IO6DS"
 
-bucket_force_destroy            = false
+bucket_force_destroy            = false