Fix GCE regional PD tests.

Need to set storage class returned by the apiserver which contains
the "Name" field derived from "GenerateName".
This commit is contained in:
tewei.luo 2021-05-24 04:12:20 +00:00
parent d8f9e4587a
commit 396bd37a5f

View File

@ -160,9 +160,10 @@ func testVolumeProvisioning(c clientset.Interface, t *framework.TimeoutContext,
StorageClassName: &(test.Class.Name), StorageClassName: &(test.Class.Name),
VolumeMode: &test.VolumeMode, VolumeMode: &test.VolumeMode,
}, ns) }, ns)
_, clearStorageClass := testsuites.SetupStorageClass(test.Client, test.Class) sc, clearStorageClass := testsuites.SetupStorageClass(test.Client, test.Class)
defer clearStorageClass() defer clearStorageClass()
test.Class = sc
test.TestDynamicProvisioning() test.TestDynamicProvisioning()
} }
} }
@ -391,9 +392,10 @@ func testRegionalAllowedTopologies(c clientset.Interface, ns string) {
VolumeMode: &test.VolumeMode, VolumeMode: &test.VolumeMode,
}, ns) }, ns)
_, clearStorageClass := testsuites.SetupStorageClass(test.Client, test.Class) sc, clearStorageClass := testsuites.SetupStorageClass(test.Client, test.Class)
defer clearStorageClass() defer clearStorageClass()
test.Class = sc
pv := test.TestDynamicProvisioning() pv := test.TestDynamicProvisioning()
checkZonesFromLabelAndAffinity(pv, sets.NewString(zones...), true) checkZonesFromLabelAndAffinity(pv, sets.NewString(zones...), true)
} }