Skip to content

Commit

Permalink
fix(aws): Aligning default block device sizes for c4.*/c5.* (#5251)
Browse files Browse the repository at this point in the history 
The default values should now be consistent across the entire family (and map to c6.*).
  • Loading branch information
@ajordens
ajordens committed Feb 15, 2021
1 parent 856029b commit 0d34636
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 24 deletions.
40 changes: 20 additions & 20 deletions ...r-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/InstanceTypeUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,19 +109,19 @@ public BlockDeviceConfig(DeployDefaults deployDefaults) {
.put("c3.2xlarge", enumeratedBlockDevicesWithVirtualName(2))
.put("c3.4xlarge", enumeratedBlockDevicesWithVirtualName(2))
.put("c3.8xlarge", enumeratedBlockDevicesWithVirtualName(2))
.put("c4.large", defaultBlockDevicesForEbsOnly())
.put("c4.xlarge", defaultBlockDevicesForEbsOnly())
.put("c4.2xlarge", defaultBlockDevicesForEbsOnly())
.put("c4.4xlarge", defaultBlockDevicesForEbsOnly())
.put("c4.8xlarge", defaultBlockDevicesForEbsOnly())
.put("c5.large", defaultBlockDevicesForEbsOnly())
.put("c5.xlarge", defaultBlockDevicesForEbsOnly())
.put("c5.2xlarge", defaultBlockDevicesForEbsOnly())
.put("c5.4xlarge", defaultBlockDevicesForEbsOnly())
.put("c5.9xlarge", defaultBlockDevicesForEbsOnly())
.put("c5.12xlarge", defaultBlockDevicesForEbsOnly())
.put("c5.18xlarge", defaultBlockDevicesForEbsOnly())
.put("c5.24xlarge", defaultBlockDevicesForEbsOnly())
.put("c4.large", sizedBlockDevicesForEbs(40))
.put("c4.xlarge", sizedBlockDevicesForEbs(80))
.put("c4.2xlarge", sizedBlockDevicesForEbs(80))
.put("c4.4xlarge", sizedBlockDevicesForEbs(120))
.put("c4.8xlarge", sizedBlockDevicesForEbs(120))
.put("c5.large", sizedBlockDevicesForEbs(40))
.put("c5.xlarge", sizedBlockDevicesForEbs(80))
.put("c5.2xlarge", sizedBlockDevicesForEbs(80))
.put("c5.4xlarge", sizedBlockDevicesForEbs(120))
.put("c5.9xlarge", sizedBlockDevicesForEbs(120))
.put("c5.12xlarge", sizedBlockDevicesForEbs(120))
.put("c5.18xlarge", sizedBlockDevicesForEbs(120))
.put("c5.24xlarge", sizedBlockDevicesForEbs(120))
.put("c5d.large", enumeratedBlockDevicesWithVirtualName(1))
.put("c5d.xlarge", enumeratedBlockDevicesWithVirtualName(1))
.put("c5d.2xlarge", enumeratedBlockDevicesWithVirtualName(1))
Expand All @@ -131,13 +131,13 @@ public BlockDeviceConfig(DeployDefaults deployDefaults) {
.put("c5d.18xlarge", enumeratedBlockDevicesWithVirtualName(2))
.put("c5d.24xlarge", enumeratedBlockDevicesWithVirtualName(4))
.put("c5d.metal", enumeratedBlockDevicesWithVirtualName(4))
.put("c5n.large", defaultBlockDevicesForEbsOnly())
.put("c5n.xlarge", defaultBlockDevicesForEbsOnly())
.put("c5n.2xlarge", defaultBlockDevicesForEbsOnly())
.put("c5n.4xlarge", defaultBlockDevicesForEbsOnly())
.put("c5n.9xlarge", defaultBlockDevicesForEbsOnly())
.put("c5n.18xlarge", defaultBlockDevicesForEbsOnly())
.put("c5n.metal", defaultBlockDevicesForEbsOnly())
.put("c5n.large", sizedBlockDevicesForEbs(40))
.put("c5n.xlarge", sizedBlockDevicesForEbs(80))
.put("c5n.2xlarge", sizedBlockDevicesForEbs(80))
.put("c5n.4xlarge", sizedBlockDevicesForEbs(120))
.put("c5n.9xlarge", sizedBlockDevicesForEbs(120))
.put("c5n.18xlarge", sizedBlockDevicesForEbs(120))
.put("c5n.metal", sizedBlockDevicesForEbs(120))
.put("c5a.large", sizedBlockDevicesForEbs(40))
.put("c5a.xlarge", sizedBlockDevicesForEbs(80))
.put("c5a.2xlarge", sizedBlockDevicesForEbs(80))
Expand Down
8 changes: 4 additions & 4 deletions ...src/test/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/InstanceTypeUtilsSpec.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ class InstanceTypeUtilsSpec extends Specification {
defaultBlockDevice | null | "m4.xlarge" || [new AmazonBlockDevice(deviceName: "/dev/sdb", size: 80, volumeType: "standard")]
null | null | "m4.large" || [new AmazonBlockDevice(deviceName: "/dev/sdb", size: 40, volumeType: "standard")]
null | null | "m4.16xlarge" || [new AmazonBlockDevice(deviceName: "/dev/sdb", size: 120, volumeType: "standard")]
null | null | "c4.8xlarge" || getExpectedBlockDevicesForEbsOnly("standard")
null | null | "c5.9xlarge" || getExpectedBlockDevicesForEbsOnly("standard")
null | null | "c4.8xlarge" || [new AmazonBlockDevice(deviceName: "/dev/sdb", size: 120, volumeType: "standard")]
null | null | "c5.9xlarge" || [new AmazonBlockDevice(deviceName: "/dev/sdb", size: 120, volumeType: "standard")]
null | null | "m3.medium" || [new AmazonBlockDevice(deviceName: "/dev/sdb", virtualName: "ephemeral0")]
null | null | "i2.2xlarge" || [new AmazonBlockDevice(deviceName: "/dev/sdb", virtualName: "ephemeral0"), new AmazonBlockDevice(deviceName: "/dev/sdc", virtualName: "ephemeral1")]
null | null | "d2.8xlarge" || expectedD28xlargeBlockDevices
null | "gp2" | "m4.xlarge" || [new AmazonBlockDevice(deviceName: "/dev/sdb", size: 80, volumeType: defaultVolumeType)]
null | "gp2" | "c4.8xlarge" || getExpectedBlockDevicesForEbsOnly("gp2")
null | "gp2" | "c4.8xlarge" || [new AmazonBlockDevice(deviceName: "/dev/sdb", size: 120, volumeType: "gp2")]
}

private Collection<AmazonBlockDevice> getExpectedBlockDevicesForEbsOnly(String volumeType) {
Expand Down Expand Up @@ -167,4 +167,4 @@ class InstanceTypeUtilsSpec extends Specification {
'c3.large' | false
'invalid' | false
}
}
}

0 comments on commit 0d34636

Please sign in to comment.