github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Fix subpath e2e tests on multizone cluster.

Browse Source 
Use dynamically provisioned PV to run GCE PD tests. This will make sure
that the pod is scheduled to the right zone and GCE PD can be attached
to a node.
This commit is contained in:
Jan Safranek 2018-03-13 14:26:37 +01:00
parent a7d6340ad2
commit c44e135442
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -552,7 +552,7 @@ func (s *emptydirSource) cleanupVolume(f *framework.Framework) {
} }
type gcepdSource struct { type gcepdSource struct {
diskName string pvc *v1.PersistentVolumeClaim
} }
func initGCEPD() volSource { func initGCEPD() volSource {
@ -563,21 +563,29 @@ func initGCEPD() volSource {
func (s *gcepdSource) createVolume(f *framework.Framework) volInfo { func (s *gcepdSource) createVolume(f *framework.Framework) volInfo {
var err error var err error
framework.Logf("Creating GCE PD volume") framework.Logf("Creating GCE PD volume via dynamic provisioning")
s.diskName, err = framework.CreatePDWithRetry() testCase := storageClassTest{
framework.ExpectNoError(err, "Error creating PD") name: "subpath",
claimSize: "2G",
}
pvc := newClaim(testCase, f.Namespace.Name, "subpath")
s.pvc, err = framework.CreatePVC(f.ClientSet, f.Namespace.Name, pvc)
framework.ExpectNoError(err, "Error creating PVC")
return volInfo{ return volInfo{
source: &v1.VolumeSource{ source: &v1.VolumeSource{
GCEPersistentDisk: &v1.GCEPersistentDiskVolumeSource{PDName: s.diskName}, PersistentVolumeClaim: &v1.PersistentVolumeClaimVolumeSource{
ClaimName: s.pvc.Name,
},
}, },
} }
} }
func (s *gcepdSource) cleanupVolume(f *framework.Framework) { func (s *gcepdSource) cleanupVolume(f *framework.Framework) {
if s.diskName != "" { if s.pvc != nil {
err := framework.DeletePDWithRetry(s.diskName) err := f.ClientSet.CoreV1().PersistentVolumeClaims(f.Namespace.Name).Delete(s.pvc.Name, nil)
framework.ExpectNoError(err, "Error deleting PD") framework.ExpectNoError(err, "Error deleting PVC")
} }
} }