Merge pull request #61111 from jsafrane/fix-subpath-multizone

Automatic merge from submit-queue (batch tested with PRs 61111, 61069). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix subpath e2e tests on multizone cluster. 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. **Which issue(s) this PR fixes**: Fixes #61101 **Release note**: ```release-note NONE ``` /sig storage @msau42 @verult

Merge pull request #61111 from jsafrane/fix-subpath-multizone
32343b7f · Kubernetes Submit Queue · GitHub · f850b424 · c44e1354 · 32343b7f
Unverified Commit 32343b7f authored Mar 13, 2018 by Kubernetes Submit Queue Committed by GitHub Mar 13, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 8 deletions

subpath.go test/e2e/storage/subpath.go +16 -8

No files found.
--- a/test/e2e/storage/subpath.go
+++ b/test/e2e/storage/subpath.go
@@ -667,7 +667,7 @@ func (s *emptydirSource) cleanupVolume(f *framework.Framework) {
 }

 type gcepdSource struct {
-	diskName string
+	pvc *v1.PersistentVolumeClaim
 }

 func initGCEPD() volSource {
@@ -678,21 +678,29 @@ func initGCEPD() volSource {
 func (s *gcepdSource) createVolume(f *framework.Framework) volInfo {
 	var err error

-	framework.Logf("Creating GCE PD volume")
-	s.diskName, err = framework.CreatePDWithRetry()
-	framework.ExpectNoError(err, "Error creating PD")
+	framework.Logf("Creating GCE PD volume via dynamic provisioning")
+	testCase := storageClassTest{
+		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{
 		source: &v1.VolumeSource{
-			GCEPersistentDisk: &v1.GCEPersistentDiskVolumeSource{PDName: s.diskName},
+			PersistentVolumeClaim: &v1.PersistentVolumeClaimVolumeSource{
+				ClaimName: s.pvc.Name,
+			},
 		},
 	}
 }

 func (s *gcepdSource) cleanupVolume(f *framework.Framework) {
-	if s.diskName != "" {
-		err := framework.DeletePDWithRetry(s.diskName)
-		framework.ExpectNoError(err, "Error deleting PD")
+	if s.pvc != nil {
+		err := f.ClientSet.CoreV1().PersistentVolumeClaims(f.Namespace.Name).Delete(s.pvc.Name, nil)
+		framework.ExpectNoError(err, "Error deleting PVC")
 	}
 }