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

k8s-ci-robot · web-flow · commit d2a0b6f2b8e0 · 2020-09-02T00:41:20.000-07:00
AWS: remove volume IOPS limit
diff --git a/pkg/volume/awsebs/aws_util.go b/pkg/volume/awsebs/aws_util.go
@@ -176,7 +176,7 @@ func populateVolumeOptions(pluginName, pvcName string, capacityGB resource.Quant
 		case "iopspergb":
 			volumeOptions.IOPSPerGB, err = strconv.Atoi(v)
 			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":
 			volumeOptions.Encrypted, err = strconv.ParseBool(v)
diff --git a/staging/src/k8s.io/legacy-cloud-providers/aws/aws.go b/staging/src/k8s.io/legacy-cloud-providers/aws/aws.go
@@ -435,7 +435,7 @@ const (
 // Source: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html
 const (
 	MinTotalIOPS = 100
-	MaxTotalIOPS = 20000
+	MaxTotalIOPS = 64000
 )
 
 // VolumeOptions specifies capacity and tags for a volume.

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ func populateVolumeOptions(pluginName, pvcName string, capacityGB resource.Quant`
`176`	`176`	`case "iopspergb":`
`177`	`177`	`volumeOptions.IOPSPerGB, err = strconv.Atoi(v)`
`178`	`178`	`if err != nil {`
`179`		`- return nil, fmt.Errorf("invalid iopsPerGB value %q, must be integer between 1 and 30: %v", v, err)`
	`179`	`+ return nil, fmt.Errorf("invalid iopsPerGB value %q: %v", v, err)`
`180`	`180`	`}`
`181`	`181`	`case "encrypted":`
`182`	`182`	`volumeOptions.Encrypted, err = strconv.ParseBool(v)`
Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,7 @@ const (`
`435`	`435`	`// Source: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html`
`436`	`436`	`const (`
`437`	`437`	`MinTotalIOPS = 100`
`438`		`- MaxTotalIOPS = 20000`
	`438`	`+ MaxTotalIOPS = 64000`
`439`	`439`	`)`
`440`	`440`
`441`	`441`	`// VolumeOptions specifies capacity and tags for a volume.`