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

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
pull/6/head
Kubernetes Submit Queue 2018-03-13 14:06:47 -07:00 committed by GitHub
parent f850b42474 c44e135442
commit 32343b7f3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -667,7 +667,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 {
@ -678,21 +678,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")
} }
} }