github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #104369 from mauriciopoppe/regional-pd-storage-class-setup

Browse Source 
Fix storage class setup in regional_pd.go
This commit is contained in:
Kubernetes Prow Robot 2021-08-23 10:38:00 -07:00 committed by GitHub
commit aeec553fd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/e2e/storage/regional_pd.go
View File

@ -154,16 +154,15 @@ func testVolumeProvisioning(c clientset.Interface, t *framework.TimeoutContext,
for _, test := range tests { for _, test := range tests {
test.Client = c test.Client = c
test.Class = newStorageClass(test, ns, "" /* suffix */) computedStorageClass, clearStorageClass := testsuites.SetupStorageClass(test.Client, newStorageClass(test, ns, "" /* suffix */))
defer clearStorageClass()
test.Class = computedStorageClass
test.Claim = e2epv.MakePersistentVolumeClaim(e2epv.PersistentVolumeClaimConfig{ test.Claim = e2epv.MakePersistentVolumeClaim(e2epv.PersistentVolumeClaimConfig{
ClaimSize: test.ClaimSize, ClaimSize: test.ClaimSize,
StorageClassName: &(test.Class.Name), StorageClassName: &(test.Class.Name),
VolumeMode: &test.VolumeMode, VolumeMode: &test.VolumeMode,
}, ns) }, ns)
sc, clearStorageClass := testsuites.SetupStorageClass(test.Client, test.Class)
defer clearStorageClass()
test.Class = sc
test.TestDynamicProvisioning() test.TestDynamicProvisioning()
} }
} }
@ -344,7 +343,10 @@ func testRegionalDelayedBinding(c clientset.Interface, ns string, pvcCount int)
} }
suffix := "delayed-regional" suffix := "delayed-regional"
test.Class = newStorageClass(test, ns, suffix)
computedStorageClass, clearStorageClass := testsuites.SetupStorageClass(test.Client, newStorageClass(test, ns, suffix))
defer clearStorageClass()
test.Class = computedStorageClass
var claims []*v1.PersistentVolumeClaim var claims []*v1.PersistentVolumeClaim
for i := 0; i < pvcCount; i++ { for i := 0; i < pvcCount; i++ {
claim := e2epv.MakePersistentVolumeClaim(e2epv.PersistentVolumeClaimConfig{ claim := e2epv.MakePersistentVolumeClaim(e2epv.PersistentVolumeClaimConfig{
@ -382,7 +384,9 @@ func testRegionalAllowedTopologies(c clientset.Interface, ns string) {
suffix := "topo-regional" suffix := "topo-regional"
test.Client = c test.Client = c
test.Class = newStorageClass(test, ns, suffix) computedStorageClass, clearStorageClass := testsuites.SetupStorageClass(test.Client, newStorageClass(test, ns, suffix))
defer clearStorageClass()
test.Class = computedStorageClass
zones := getTwoRandomZones(c) zones := getTwoRandomZones(c)
addAllowedTopologiesToStorageClass(c, test.Class, zones) addAllowedTopologiesToStorageClass(c, test.Class, zones)
test.Claim = e2epv.MakePersistentVolumeClaim(e2epv.PersistentVolumeClaimConfig{ test.Claim = e2epv.MakePersistentVolumeClaim(e2epv.PersistentVolumeClaimConfig{
@ -392,10 +396,6 @@ func testRegionalAllowedTopologies(c clientset.Interface, ns string) {
VolumeMode: &test.VolumeMode, VolumeMode: &test.VolumeMode,
}, ns) }, ns)
sc, clearStorageClass := testsuites.SetupStorageClass(test.Client, test.Class)
defer clearStorageClass()
test.Class = sc
pv := test.TestDynamicProvisioning() pv := test.TestDynamicProvisioning()
checkZonesFromLabelAndAffinity(pv, sets.NewString(zones...), true) checkZonesFromLabelAndAffinity(pv, sets.NewString(zones...), true)
} }
@ -415,7 +415,9 @@ func testRegionalAllowedTopologiesWithDelayedBinding(c clientset.Interface, ns s
} }
suffix := "topo-delayed-regional" suffix := "topo-delayed-regional"
test.Class = newStorageClass(test, ns, suffix) computedStorageClass, clearStorageClass := testsuites.SetupStorageClass(test.Client, newStorageClass(test, ns, suffix))
defer clearStorageClass()
test.Class = computedStorageClass
topoZones := getTwoRandomZones(c) topoZones := getTwoRandomZones(c)
addAllowedTopologiesToStorageClass(c, test.Class, topoZones) addAllowedTopologiesToStorageClass(c, test.Class, topoZones)
var claims []*v1.PersistentVolumeClaim var claims []*v1.PersistentVolumeClaim