github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

AWS: Use GiB as units for disk sizes.

Browse Source 
From some reason, MiBs were used for public functions and AWS cloud provider
recalculated them to GiB. Let's expose what AWS really supports and don't hide
real allocation units.
This commit is contained in:
Jan Safranek 2015-12-15 10:18:00 +01:00
parent 775369a8f1
commit 700d92c2a8
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cloudprovider/providers/aws/aws.go
View File

@ -135,7 +135,7 @@ type EC2Metadata interface {
} }
type VolumeOptions struct { type VolumeOptions struct {
CapacityMB int CapacityGB int
} }
// Volumes is an interface for managing cloud-provisioned volumes // Volumes is an interface for managing cloud-provisioned volumes
@ -1222,7 +1222,7 @@ func (aws *AWSCloud) CreateVolume(volumeOptions *VolumeOptions) (string, error)
request := &ec2.CreateVolumeInput{} request := &ec2.CreateVolumeInput{}
request.AvailabilityZone = &aws.availabilityZone request.AvailabilityZone = &aws.availabilityZone
volSize := (int64(volumeOptions.CapacityMB) + 1023) / 1024 volSize := int64(volumeOptions.CapacityGB)
request.Size = &volSize request.Size = &volSize
response, err := aws.ec2.CreateVolume(request) response, err := aws.ec2.CreateVolume(request)
if err != nil { if err != nil {

5
test/e2e/pd.go
View File

@ -18,11 +18,12 @@ package e2e
import ( import (
"fmt" "fmt"
"google.golang.org/api/googleapi"
mathrand "math/rand" mathrand "math/rand"
"strings" "strings"
"time" "time"
"google.golang.org/api/googleapi"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
@ -326,7 +327,7 @@ func createPD() (string, error) {
return "", fmt.Errorf("Provider does not support volumes") return "", fmt.Errorf("Provider does not support volumes")
} }
volumeOptions := &awscloud.VolumeOptions{} volumeOptions := &awscloud.VolumeOptions{}
volumeOptions.CapacityMB = 10 * 1024 volumeOptions.CapacityGB = 10
return volumes.CreateVolume(volumeOptions) return volumes.CreateVolume(volumeOptions)
} }
} }