From 3271ebe62160703fc085bf17ca112a62c299d603 Mon Sep 17 00:00:00 2001
From: Jack Joy <jack.joy@digital.cabinet-office.gov.uk>
Date: Thu, 12 Oct 2023 09:34:36 +0100
Subject: [PATCH] upgraded instance types

---
 .../operations.d/730-elasticache-broker.yml   |  8 +++----
 manifests/variables.yml                       | 22 +++++++++----------
 terraform/cloudfoundry/dev.tfvars             |  4 ++--
 terraform/cloudfoundry/prod.tfvars            |  4 ++--
 terraform/cloudfoundry/staging.tfvars         |  4 ++--
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/manifests/cf-manifest/operations.d/730-elasticache-broker.yml b/manifests/cf-manifest/operations.d/730-elasticache-broker.yml
index e8c24d091e..f8d2043f0e 100644
--- 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,7 +519,7 @@
                 <<: *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'
 
@@ -527,7 +527,7 @@
                 <<: *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
index 5febeb325a..6b8b04b3d4 100644
--- a/manifests/variables.yml
+++ b/manifests/variables.yml
@@ -4,7 +4,7 @@
 # instances of some types.
 #
 
-compilation_vm_instance_type: c5.large
+compilation_vm_instance_type: c6i.large
 
 nano_vm_instance_type: t3.nano
 
@@ -12,25 +12,25 @@ 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
index 70a650a31b..0e85313bf1 100644
--- 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
\ No newline at end of file
+bucket_force_destroy           = true
diff --git a/terraform/cloudfoundry/prod.tfvars b/terraform/cloudfoundry/prod.tfvars
index 6b16e8a9c4..8e653ea190 100644
--- 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
\ No newline at end of file
+bucket_force_destroy            = false
diff --git a/terraform/cloudfoundry/staging.tfvars b/terraform/cloudfoundry/staging.tfvars
index 8a6777e046..8852943f64 100644
--- 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
\ No newline at end of file
+bucket_force_destroy            = false