diff --git a/test/e2e/volume_provisioning.go b/test/e2e/volume_provisioning.go index 9c1c9f348a2..655ea2834c0 100644 --- a/test/e2e/volume_provisioning.go +++ b/test/e2e/volume_provisioning.go @@ -24,6 +24,7 @@ import ( . "github.com/onsi/ginkgo" . "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/service/ec2" @@ -139,10 +140,22 @@ func testDynamicProvisioning(t storageClassTest, client clientset.Interface, cla func checkAWSEBS(volume *v1.PersistentVolume, volumeType string, encrypted bool) error { diskName := volume.Spec.AWSElasticBlockStore.VolumeID - client := ec2.New(session.New()) + var client *ec2.EC2 + tokens := strings.Split(diskName, "/") volumeID := tokens[len(tokens)-1] + zone := framework.TestContext.CloudConfig.Zone + if len(zone) > 0 { + region := zone[:len(zone)-1] + cfg := aws.Config{Region: ®ion} + 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{ VolumeIds: []*string{&volumeID}, }