github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

test: fix azure disk test failure

Browse Source
This commit is contained in:
andyzhangx 2019-09-04 15:16:38 +00:00
parent 313cc4278e
commit 4c58dc3a56
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/e2e/storage/drivers/in_tree.go
View File

@ -1441,10 +1441,12 @@ func (a *azureDriver) GetVolumeSource(readOnly bool, fsType string, volume tests
diskName := av.volumeName[(strings.LastIndex(av.volumeName, "/") + 1):] diskName := av.volumeName[(strings.LastIndex(av.volumeName, "/") + 1):]
kind := v1.AzureManagedDisk
volSource := v1.VolumeSource{ volSource := v1.VolumeSource{
AzureDisk: &v1.AzureDiskVolumeSource{ AzureDisk: &v1.AzureDiskVolumeSource{
DiskName: diskName, DiskName: diskName,
DataDiskURI: av.volumeName, DataDiskURI: av.volumeName,
Kind: &kind,
ReadOnly: &readOnly, ReadOnly: &readOnly,
}, },
} }
@ -1460,10 +1462,12 @@ func (a *azureDriver) GetPersistentVolumeSource(readOnly bool, fsType string, vo
diskName := av.volumeName[(strings.LastIndex(av.volumeName, "/") + 1):] diskName := av.volumeName[(strings.LastIndex(av.volumeName, "/") + 1):]
kind := v1.AzureManagedDisk
pvSource := v1.PersistentVolumeSource{ pvSource := v1.PersistentVolumeSource{
AzureDisk: &v1.AzureDiskVolumeSource{ AzureDisk: &v1.AzureDiskVolumeSource{
DiskName: diskName, DiskName: diskName,
DataDiskURI: av.volumeName, DataDiskURI: av.volumeName,
Kind: &kind,
ReadOnly: &readOnly, ReadOnly: &readOnly,
}, },
} }
@ -1499,6 +1503,13 @@ func (a *azureDriver) PrepareTest(f *framework.Framework) (*testsuites.PerTestCo
func (a *azureDriver) CreateVolume(config *testsuites.PerTestConfig, volType testpatterns.TestVolType) testsuites.TestVolume { func (a *azureDriver) CreateVolume(config *testsuites.PerTestConfig, volType testpatterns.TestVolType) testsuites.TestVolume {
ginkgo.By("creating a test azure disk volume") ginkgo.By("creating a test azure disk volume")
if volType == testpatterns.InlineVolume {
// Volume will be created in framework.TestContext.CloudConfig.Zone zone,
// so pods should be also scheduled there.
config.ClientNodeSelector = map[string]string{
v1.LabelZoneFailureDomain: framework.TestContext.CloudConfig.Zone,
}
}
volumeName, err := framework.CreatePDWithRetry() volumeName, err := framework.CreatePDWithRetry()
framework.ExpectNoError(err) framework.ExpectNoError(err)
return &azureVolume{ return &azureVolume{