mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 04:06:03 +00:00
Merge pull request #102682 from chendave/e2e_storage
Check empty zone after the validation of providers
This commit is contained in:
commit
7a9c8940fd
@ -350,6 +350,10 @@ var _ = utils.SIGDescribe("Dynamic Provisioning", func() {
|
||||
continue
|
||||
}
|
||||
|
||||
if zone, ok := test.Parameters["zone"]; ok {
|
||||
framework.ExpectNotEqual(len(zone), 0, "expect at least one zone")
|
||||
}
|
||||
|
||||
ginkgo.By("Testing " + test.Name)
|
||||
suffix := fmt.Sprintf("%d", i)
|
||||
test.Client = c
|
||||
@ -1000,9 +1004,11 @@ func deleteProvisionedVolumesAndDisks(c clientset.Interface, pvs []*v1.Persisten
|
||||
|
||||
func getRandomClusterZone(c clientset.Interface) string {
|
||||
zones, err := e2enode.GetClusterZones(c)
|
||||
zone := ""
|
||||
framework.ExpectNoError(err)
|
||||
framework.ExpectNotEqual(len(zones), 0)
|
||||
|
||||
zonesList := zones.UnsortedList()
|
||||
return zonesList[rand.Intn(zones.Len())]
|
||||
if len(zones) != 0 {
|
||||
zonesList := zones.UnsortedList()
|
||||
zone = zonesList[rand.Intn(zones.Len())]
|
||||
}
|
||||
return zone
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user