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

Merge pull request #111951 from sashrith/vsphere_intree_test_fixes

Browse Source 
vsphere in-tree driver test fixes
This commit is contained in:
Kubernetes Prow Robot 2022-09-01 08:01:06 -07:00 committed by GitHub
commit bf624aa77f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1253,6 +1253,7 @@ func InitVSphereDriver() storageframework.TestDriver {
storageframework.CapExec: true,
storageframework.CapMultiPODs: true,
storageframework.CapTopology: true,
storageframework.CapBlock: true,
},
},
}

6
test/e2e/storage/testsuites/multivolume.go
View File

@ -429,6 +429,10 @@ func (t *multiVolumeTestSuite) DefineTests(driver storageframework.TestDriver, p
e2eskipper.Skipf("Driver %q does not support multiple concurrent pods - skipping", dInfo.Name)
}
if l.driver.GetDriverInfo().Name == "vsphere" && pattern == storageframework.BlockVolModeDynamicPV {
e2eskipper.Skipf("Driver %q does not support read only raw block volumes - skipping", dInfo.Name)
}
// Create volume
testVolumeSizeRange := t.GetTestSuiteInfo().SupportedSizeRange
resource := storageframework.CreateVolumeResource(l.driver, l.config, pattern, testVolumeSizeRange)
@ -746,7 +750,7 @@ func getCurrentTopologiesNumber(cs clientset.Interface, nodes *v1.NodeList, keys
break
}
}
if !found {
if !found && len(topo) > 0 {
framework.Logf("found topology %v", topo)
topos = append(topos, topo)
topoCount = append(topoCount, 1)