diff --git a/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/InstanceTypeUtils.java b/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/InstanceTypeUtils.java index 1339b747bbb..d00965f1fe2 100644 --- a/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/InstanceTypeUtils.java +++ b/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/InstanceTypeUtils.java @@ -179,6 +179,16 @@ public BlockDeviceConfig(DeployDefaults deployDefaults) { .put("d2.2xlarge", enumeratedBlockDevicesWithVirtualName(6)) .put("d2.4xlarge", enumeratedBlockDevicesWithVirtualName(12)) .put("d2.8xlarge", enumeratedBlockDevicesWithVirtualName(24)) + .put("d3.xlarge", enumeratedBlockDevicesWithVirtualName(3)) + .put("d3.2xlarge", enumeratedBlockDevicesWithVirtualName(6)) + .put("d3.4xlarge", enumeratedBlockDevicesWithVirtualName(12)) + .put("d3.8xlarge", enumeratedBlockDevicesWithVirtualName(24)) + .put("d3en.xlarge", enumeratedBlockDevicesWithVirtualName(2)) + .put("d3en.2xlarge", enumeratedBlockDevicesWithVirtualName(4)) + .put("d3en.4xlarge", enumeratedBlockDevicesWithVirtualName(8)) + .put("d3en.6xlarge", enumeratedBlockDevicesWithVirtualName(12)) + .put("d3en.8xlarge", enumeratedBlockDevicesWithVirtualName(16)) + .put("d3en.12xlarge", enumeratedBlockDevicesWithVirtualName(24)) .put("f1.2xlarge", enumeratedBlockDevicesWithVirtualName(1)) .put("f1.4xlarge", enumeratedBlockDevicesWithVirtualName(1)) .put("f1.16xlarge", enumeratedBlockDevicesWithVirtualName(4)) @@ -287,6 +297,12 @@ public BlockDeviceConfig(DeployDefaults deployDefaults) { .put("m5ad.12xlarge", enumeratedBlockDevicesWithVirtualName(2)) .put("m5ad.16xlarge", enumeratedBlockDevicesWithVirtualName(2)) .put("m5ad.24xlarge", enumeratedBlockDevicesWithVirtualName(4)) + .put("m5zn.large", sizedBlockDevicesForEbs(40)) + .put("m5zn.xlarge", sizedBlockDevicesForEbs(80)) + .put("m5zn.2xlarge", sizedBlockDevicesForEbs(80)) + .put("m5zn.3xlarge", sizedBlockDevicesForEbs(120)) + .put("m5zn.6xlarge", sizedBlockDevicesForEbs(120)) + .put("m5zn.12xlarge", sizedBlockDevicesForEbs(120)) .put("m6g.medium", sizedBlockDevicesForEbs(40)) .put("m6g.large", sizedBlockDevicesForEbs(40)) .put("m6g.xlarge", sizedBlockDevicesForEbs(80)) @@ -364,6 +380,14 @@ public BlockDeviceConfig(DeployDefaults deployDefaults) { .put("r5ad.12xlarge", enumeratedBlockDevicesWithVirtualName(2)) .put("r5ad.16xlarge", enumeratedBlockDevicesWithVirtualName(2)) .put("r5ad.24xlarge", enumeratedBlockDevicesWithVirtualName(4)) + .put("r5b.large", sizedBlockDevicesForEbs(40)) + .put("r5b.xlarge", sizedBlockDevicesForEbs(80)) + .put("r5b.2xlarge", sizedBlockDevicesForEbs(80)) + .put("r5b.4xlarge", sizedBlockDevicesForEbs(120)) + .put("r5b.8xlarge", sizedBlockDevicesForEbs(120)) + .put("r5b.12xlarge", sizedBlockDevicesForEbs(120)) + .put("r5b.16xlarge", sizedBlockDevicesForEbs(120)) + .put("r5b.24xlarge", sizedBlockDevicesForEbs(120)) .put("r6g.medium", sizedBlockDevicesForEbs(40)) .put("r6g.large", sizedBlockDevicesForEbs(40)) .put("r6g.xlarge", sizedBlockDevicesForEbs(80))