Improve handling of InsufficientVolumeCapacity errors

Signed-off-by: torredil <[email protected]>

pkg/cloud/cloud.go

@@ -176,6 +176,9 @@ var (
 
 	// ErrInvalidRequest is returned if parameters were rejected by driver
 	ErrInvalidRequest = errors.New("invalid request")
+
+	// ErrInsufficientVolumeCapacity is returned when there's not enough capacity to fulfill the volume provision request.
+	ErrInsufficientVolumeCapacity = errors.New("There is not enough capacity to fulfill your EBS volume provision request. You can try to provision a different volume type, EBS volume in a different availability zone, or you can wait for additional capacity to become available.")
 )
 
 // Set during build time via -ldflags
@@ -665,6 +668,9 @@ func (c *cloud) CreateDisk(ctx context.Context, volumeName string, diskOptions *
 			c.latestClientTokens.Set(volumeName, &nextTokenNumber)
 			return nil, ErrIdempotentParameterMismatch
 		}
+		if isAWSErrorInsufficientVolumeCapacity(err) {
+			return nil, ErrInsufficientVolumeCapacity
+		}
 		return nil, fmt.Errorf("could not create volume in EC2: %w", err)
 	}
 
@@ -1684,6 +1690,12 @@ func isAWSErrorInvalidParameter(err error) bool {
 	return false
 }
 
+// isAWSErrorInsufficientVolumeCapacity returns a boolean indicating whether the
+// given error is an AWS InsufficientVolumeCapacity error.
+func isAWSErrorInsufficientVolumeCapacity(err error) bool {
+	return isAWSError(err, "InsufficientVolumeCapacity")
+}
+
 // Checks for desired size on volume by also verifying volume size by describing volume.
 // This is to get around potential eventual consistency problems with describing volume modifications
 // objects and ensuring that we read two different objects to verify volume state.

pkg/cloud/cloud_test.go

@@ -1347,6 +1347,22 @@ func TestCreateDisk(t *testing.T) {
 			},
 			expErr: fmt.Errorf("invalid AWS VolumeType %q", "invalidVolumeType"),
 		},
+		{
+			name:       "failure: InsufficientVolumeCapacity error",
+			volumeName: "vol-test-name-error",
+			diskOptions: &DiskOptions{
+				CapacityBytes:    util.GiBToBytes(1),
+				Tags:             map[string]string{VolumeNameTagKey: "vol-test", AwsEbsDriverTagKey: "true"},
+				AvailabilityZone: expZone,
+			},
+			expCreateVolumeInput: &ec2.CreateVolumeInput{
+				Iops: aws.Int32(2000),
+			},
+			expErr: ErrInsufficientVolumeCapacity,
+			expCreateVolumeErr: &smithy.GenericAPIError{
+				Code: "InsufficientVolumeCapacity",
+			},
+		},
 	}
 	for _, tc := range testCases {
 		tc := tc