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

test: fix azure disk e2e test failure

Browse Source
This commit is contained in:
andyzhangx 2019-09-04 10:30:25 +00:00
parent 83192d7c7c
commit 313cc4278e
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/framework/providers/azure/BUILD
View File

@ -10,6 +10,7 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
"//staging/src/k8s.io/legacy-cloud-providers/azure:go_default_library",
"//test/e2e/framework:go_default_library",
"//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute:go_default_library",
],
)

20
test/e2e/framework/providers/azure/azure.go
View File

@ -21,6 +21,8 @@ import (
"fmt"
"os"
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/uuid"
"k8s.io/kubernetes/test/e2e/framework"
@ -62,16 +64,24 @@ func (p *Provider) DeleteNode(node *v1.Node) error {
// CreatePD creates a persistent volume
func (p *Provider) CreatePD(zone string) (string, error) {
pdName := fmt.Sprintf("%s-%s", framework.TestContext.Prefix, string(uuid.NewUUID()))
_, diskURI, _, err := p.azureCloud.CreateVolume(pdName, "" /* account */, "" /* sku */, "" /* location */, 1 /* sizeGb */)
if err != nil {
return "", err
volumeOptions := &azure.ManagedDiskOptions{
DiskName: pdName,
StorageAccountType: compute.StandardLRS,
ResourceGroup: "",
PVCName: pdName,
SizeGB: 1,
Tags: nil,
AvailabilityZone: zone,
DiskIOPSReadWrite: "",
DiskMBpsReadWrite: "",
}
return diskURI, nil
return p.azureCloud.CreateManagedDisk(volumeOptions)
}
// DeletePD deletes a persistent volume
func (p *Provider) DeletePD(pdName string) error {
if err := p.azureCloud.DeleteVolume(pdName); err != nil {
if err := p.azureCloud.DeleteManagedDisk(pdName); err != nil {
framework.Logf("failed to delete Azure volume %q: %v", pdName, err)
return err
}