Merge pull request #65064 from davidz627/fix/CSIe2eAttach

Automatic merge from submit-queue (batch tested with PRs 65064, 65218, 65260, 65241, 64372). 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>.

Added attach/mount/check steps to CSI Driver E2E tests

This PR makes the CSI Volume E2E tests actually go through the entire dynamic provisioning pipeline and test attach/mount/check file etc.

Fixes #64927

```release-note
None
```
pull/8/head
Kubernetes Submit Queue 2018-06-21 21:12:09 -07:00 committed by GitHub
commit cbe4f48866
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions

View File

@ -135,7 +135,7 @@ func (c *csiAttacher) waitForVolumeAttachmentInternal(volumeHandle, attachID str
attach, err := c.k8s.StorageV1beta1().VolumeAttachments().Get(attachID, meta.GetOptions{})
if err != nil {
glog.Error(log("attacher.WaitForAttach failed for volume [%s] (will continue to try): %v", volumeHandle, err))
return "", err
return "", fmt.Errorf("volume %v has GET error for volume attachment %v: %v", volumeHandle, attachID, err)
}
// if being deleted, fail fast
if attach.GetDeletionTimestamp() != nil {

View File

@ -132,6 +132,7 @@ func (h *hostpathCSIDriver) createStorageClassTest(node v1.Node) storageClassTes
claimSize: "1Gi",
expectedSize: "1Gi",
nodeName: node.Name,
attach: true,
}
}
@ -197,6 +198,7 @@ func (g *gcePDCSIDriver) createStorageClassTest(node v1.Node) storageClassTest {
claimSize: "5Gi",
expectedSize: "5Gi",
nodeName: node.Name,
attach: true,
}
}