github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #73962 from wongma7/glusterfs-sc 

Fix glusterfs e2e not using correct storageclass
pull/564/head
Kubernetes Prow Robot 2019-02-13 14:32:16 -08:00 committed by GitHub
parent a5653dc01b 6d73de1154
commit f9af7e94a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/storage/testsuites/provisioning.go
View File

@ -297,6 +297,7 @@ func testProvisioning(input *provisioningTestInput) {
func TestDynamicProvisioning(t StorageClassTest, client clientset.Interface, claim *v1.PersistentVolumeClaim, class *storage.StorageClass) *v1.PersistentVolume { func TestDynamicProvisioning(t StorageClassTest, client clientset.Interface, claim *v1.PersistentVolumeClaim, class *storage.StorageClass) *v1.PersistentVolume {
var err error var err error
if class != nil { if class != nil {
Expect(*claim.Spec.StorageClassName).To(Equal(class.Name))
By("creating a StorageClass " + class.Name) By("creating a StorageClass " + class.Name)
_, err = client.StorageV1().StorageClasses().Create(class) _, err = client.StorageV1().StorageClasses().Create(class)
// The "should provision storage with snapshot data source" test already has created the class. // The "should provision storage with snapshot data source" test already has created the class.

1
test/e2e/storage/volume_provisioning.go
View File

@ -828,6 +828,7 @@ var _ = utils.SIGDescribe("Dynamic Provisioning", func() {
By("creating a claim object with a suffix for gluster dynamic provisioner") By("creating a claim object with a suffix for gluster dynamic provisioner")
claim := newClaim(test, ns, suffix) claim := newClaim(test, ns, suffix)
claim.Spec.StorageClassName = &class.Name
testsuites.TestDynamicProvisioning(test, c, claim, class) testsuites.TestDynamicProvisioning(test, c, claim, class)
}) })