Standardized medium and large VM sizes, add medium-highmem option

* Small highmem may not be enough for diego with CATS in high
  parallelism, so we want to offer some additional cross-iaas
standardized options. Medium & large would be balanced CPU/memory,
whereas medium-highmem would be a larger memory-rich cell

Signed-off-by: David Stevenson <[email protected]>

cloudconfig/aws/base_ops_template.go

@@ -105,27 +105,37 @@ const (
 - type: replace
   path: /vm_types/name=medium/cloud_properties?
   value:
-    instance_type: m4.xlarge
+    instance_type: m5a.xlarge
     ephemeral_disk:
       size: 10240
       type: gp3
 
 - type: replace
   path: /vm_types/name=large/cloud_properties?
   value:
-    instance_type: m4.2xlarge
+    instance_type: m5a.2xlarge
     ephemeral_disk:
       size: 10240
       type: gp3
 
 - type: replace
   path: /vm_types/name=extra-large/cloud_properties?
   value:
-    instance_type: m4.4xlarge
+    instance_type: m5a.4xlarge
     ephemeral_disk:
       size: 10240
       type: gp3
 
+- type: replace
+  path: /vm_types/-
+  value:
+    name: medium-highmem
+    cloud_properties:
+      instance_type: r5a.xlarge
+      ephemeral_disk:
+        size: 10240
+        type: gp3
+
 - type: replace
   path: /vm_types/-
   value:

cloudconfig/aws/fixtures/aws-ops.yml

@@ -101,27 +101,37 @@
 - type: replace
   path: /vm_types/name=medium/cloud_properties?
   value:
-    instance_type: m4.xlarge
+    instance_type: m5a.xlarge
     ephemeral_disk:
       size: 10240
       type: gp3
 
 - type: replace
   path: /vm_types/name=large/cloud_properties?
   value:
-    instance_type: m4.2xlarge
+    instance_type: m5a.2xlarge
     ephemeral_disk:
       size: 10240
       type: gp3
 
 - type: replace
   path: /vm_types/name=extra-large/cloud_properties?
   value:
-    instance_type: m4.4xlarge
+    instance_type: m5a.4xlarge
     ephemeral_disk:
       size: 10240
       type: gp3
 
+- type: replace
+  path: /vm_types/-
+  value:
+    name: medium-highmem
+    cloud_properties:
+      instance_type: r5a.xlarge
+      ephemeral_disk:
+        size: 10240
+        type: gp3
+
 - type: replace
   path: /vm_types/-
   value:

cloudconfig/azure/base_ops_template.go

@@ -76,14 +76,14 @@ const (
   value:
     ephemeral_disk:
       size: 10240
-    instance_type: Standard_F4s_v2
+    instance_type: Standard_D4s_v3
 
 - type: replace
   path: /vm_types/name=large/cloud_properties?
   value:
     ephemeral_disk:
       size: 10240
-    instance_type: Standard_DS12_v2
+    instance_type: Standard_D8s_v3
 
 - type: replace
   path: /vm_types/name=small-highmem/cloud_properties?
@@ -99,6 +99,14 @@ const (
       size: 10240
     instance_type: Standard_B1ms
 
+- type: replace
+  path: /vm_types/-
+  value:
+    name: medium-highmem
+    ephemeral_disk:
+      size: 10240
+    instance_type: Standard_E4s_v3
+
 - type: replace
   path: /vm_types/-
   value:

cloudconfig/azure/fixtures/azure-ops.yml

@@ -72,14 +72,14 @@
   value:
     ephemeral_disk:
       size: 10240
-    instance_type: Standard_F4s_v2
+    instance_type: Standard_D4s_v3
 
 - type: replace
   path: /vm_types/name=large/cloud_properties?
   value:
     ephemeral_disk:
       size: 10240
-    instance_type: Standard_DS12_v2
+    instance_type: Standard_D8s_v3
 
 - type: replace
   path: /vm_types/name=small-highmem/cloud_properties?
@@ -95,6 +95,14 @@
       size: 10240
     instance_type: Standard_B1ms
 
+- type: replace
+  path: /vm_types/-
+  value:
+    name: medium-highmem
+    ephemeral_disk:
+      size: 10240
+    instance_type: Standard_E4s_v3
+
 - type: replace
   path: /vm_types/-
   value:

cloudconfig/gcp/base_ops_template.go

@@ -92,31 +92,40 @@ const (
 - type: replace
   path: /vm_types/name=small-highcpu?/cloud_properties
   value:
-    machine_type: n1-highcpu-2
+    machine_type: e2-highcpu-2
     root_disk_size_gb: 10
     root_disk_type: pd-balanced
 
 - type: replace
   path: /vm_types/name=medium/cloud_properties?
   value:
-    machine_type: n1-standard-4
+    machine_type: e2-standard-4
     root_disk_size_gb: 10
     root_disk_type: pd-balanced
 
 - type: replace
   path: /vm_types/name=large/cloud_properties?
   value:
-    machine_type: n1-standard-8
+    machine_type: e2-standard-8
     root_disk_size_gb: 10
     root_disk_type: pd-balanced
 
 - type: replace
   path: /vm_types/name=extra-large/cloud_properties?
   value:
-    machine_type: n1-standard-16
+    machine_type: e2-standard-16
     root_disk_size_gb: 10
     root_disk_type: pd-balanced
 
+- type: replace
+  path: /vm_types/-
+  value:
+    name: medium-highmem
+    cloud_properties:
+      machine_type: e2-highmem-4
+      root_disk_size_gb: 10
+      root_disk_type: pd-balanced
+
 - type: replace
   path: /vm_types/-
   value:

cloudconfig/gcp/fixtures/gcp-ops.yml

@@ -88,31 +88,40 @@
 - type: replace
   path: /vm_types/name=small-highcpu?/cloud_properties
   value:
-    machine_type: n1-highcpu-2
+    machine_type: e2-highcpu-2
     root_disk_size_gb: 10
     root_disk_type: pd-balanced
 
 - type: replace
   path: /vm_types/name=medium/cloud_properties?
   value:
-    machine_type: n1-standard-4
+    machine_type: e2-standard-4
     root_disk_size_gb: 10
     root_disk_type: pd-balanced
 
 - type: replace
   path: /vm_types/name=large/cloud_properties?
   value:
-    machine_type: n1-standard-8
+    machine_type: e2-standard-8
     root_disk_size_gb: 10
     root_disk_type: pd-balanced
 
 - type: replace
   path: /vm_types/name=extra-large/cloud_properties?
   value:
-    machine_type: n1-standard-16
+    machine_type: e2-standard-16
     root_disk_size_gb: 10
     root_disk_type: pd-balanced
 
+- type: replace
+  path: /vm_types/-
+  value:
+    name: medium-highmem
+    cloud_properties:
+      machine_type: e2-highmem-4
+      root_disk_size_gb: 10
+      root_disk_type: pd-balanced
+
 - type: replace
   path: /vm_types/-
   value: