github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-04 10:47:25 +00:00
Code Issues Projects Releases Wiki Activity

Add region to AWS calls from storage class test

Browse Source
This commit is contained in:
Jan Safranek
2016-11-14 15:29:36 +01:00
parent 67e1f2c08e
commit 873d0a73cf
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/e2e/volume_provisioning.go
View File

@@ -24,6 +24,7 @@ import (
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2"
@@ -139,10 +140,22 @@ func testDynamicProvisioning(t storageClassTest, client clientset.Interface, cla
func checkAWSEBS(volume *v1.PersistentVolume, volumeType string, encrypted bool) error { func checkAWSEBS(volume *v1.PersistentVolume, volumeType string, encrypted bool) error {
diskName := volume.Spec.AWSElasticBlockStore.VolumeID diskName := volume.Spec.AWSElasticBlockStore.VolumeID
client := ec2.New(session.New()) var client *ec2.EC2
tokens := strings.Split(diskName, "/") tokens := strings.Split(diskName, "/")
volumeID := tokens[len(tokens)-1] volumeID := tokens[len(tokens)-1]
zone := framework.TestContext.CloudConfig.Zone
if len(zone) > 0 {
region := zone[:len(zone)-1]
cfg := aws.Config{Region: &region}
framework.Logf("using region %s", region)
client = ec2.New(session.New(), &cfg)
} else {
framework.Logf("no region configured")
client = ec2.New(session.New())
}
request := &ec2.DescribeVolumesInput{ request := &ec2.DescribeVolumesInput{
VolumeIds: []*string{&volumeID}, VolumeIds: []*string{&volumeID},
} }