Merge pull request #90014 from jacobmarble/aws-max-total-iops

AWS: remove volume IOPS limit
This commit is contained in:
Kubernetes Prow Robot 2020-09-02 00:41:20 -07:00 committed by GitHub
commit d2a0b6f2b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -176,7 +176,7 @@ func populateVolumeOptions(pluginName, pvcName string, capacityGB resource.Quant
case "iopspergb": case "iopspergb":
volumeOptions.IOPSPerGB, err = strconv.Atoi(v) volumeOptions.IOPSPerGB, err = strconv.Atoi(v)
if err != nil { if err != nil {
return nil, fmt.Errorf("invalid iopsPerGB value %q, must be integer between 1 and 30: %v", v, err) return nil, fmt.Errorf("invalid iopsPerGB value %q: %v", v, err)
} }
case "encrypted": case "encrypted":
volumeOptions.Encrypted, err = strconv.ParseBool(v) volumeOptions.Encrypted, err = strconv.ParseBool(v)

View File

@ -435,7 +435,7 @@ const (
// Source: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html // Source: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html
const ( const (
MinTotalIOPS = 100 MinTotalIOPS = 100
MaxTotalIOPS = 20000 MaxTotalIOPS = 64000
) )
// VolumeOptions specifies capacity and tags for a volume. // VolumeOptions specifies capacity and tags for a volume.