github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #74079 from jarrpa/csi-cluster-registrar

Browse Source 
CSIDriverRegistrar e2e cleanups
This commit is contained in:
Kubernetes Prow Robot 2019-02-14 17:05:51 -08:00 committed by GitHub
commit 0eb69f6b92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
test/e2e/storage/csi_volumes.go
View File

@ -199,28 +199,29 @@ var _ = utils.SIGDescribe("CSI Volumes", func() {
Context("CSI attach test using mock driver [Feature:CSIDriverRegistry]", func() { Context("CSI attach test using mock driver [Feature:CSIDriverRegistry]", func() {
var ( var (
err error
driver testsuites.TestDriver driver testsuites.TestDriver
) )
tests := []struct { tests := []struct {
name string name string
driverAttachable bool driverAttachable bool
driverExists bool deployDriverCRD bool
}{ }{
{ {
name: "should not require VolumeAttach for drivers without attachment", name: "should not require VolumeAttach for drivers without attachment",
driverAttachable: false, driverAttachable: false,
driverExists: true, deployDriverCRD: true,
}, },
{ {
name: "should require VolumeAttach for drivers with attachment", name: "should require VolumeAttach for drivers with attachment",
driverAttachable: true, driverAttachable: true,
driverExists: true, deployDriverCRD: true,
}, },
{ {
name: "should preserve attachment policy when no CSIDriver present", name: "should preserve attachment policy when no CSIDriver present",
driverAttachable: true, driverAttachable: true,
driverExists: false, deployDriverCRD: false,
}, },
} }
@ -233,12 +234,14 @@ var _ = utils.SIGDescribe("CSI Volumes", func() {
Prefix: "csi-attach", Prefix: "csi-attach",
} }
driver = drivers.InitMockCSIDriver(config, test.driverExists, test.driverAttachable, nil) driver = drivers.InitMockCSIDriver(config, test.deployDriverCRD, test.driverAttachable, nil)
driver.CreateDriver() driver.CreateDriver()
defer driver.CleanupDriver()
if test.driverExists { if test.deployDriverCRD {
err = waitForCSIDriver(csics, driver)
framework.ExpectNoError(err, "Failed to get CSIDriver: %v", err)
defer destroyCSIDriver(csics, driver) defer destroyCSIDriver(csics, driver)
defer driver.CleanupDriver()
} }
By("Creating pod") By("Creating pod")
@ -273,7 +276,7 @@ var _ = utils.SIGDescribe("CSI Volumes", func() {
return return
} }
err := framework.WaitForPodNameRunningInNamespace(cs, pod.Name, pod.Namespace) err = framework.WaitForPodNameRunningInNamespace(cs, pod.Name, pod.Namespace)
framework.ExpectNoError(err, "Failed to start pod: %v", err) framework.ExpectNoError(err, "Failed to start pod: %v", err)
By("Checking if VolumeAttachment was created for the pod") By("Checking if VolumeAttachment was created for the pod")
@ -299,6 +302,7 @@ var _ = utils.SIGDescribe("CSI Volumes", func() {
Context("CSI workload information using mock driver [Feature:CSIDriverRegistry]", func() { Context("CSI workload information using mock driver [Feature:CSIDriverRegistry]", func() {
var ( var (
err error
driver testsuites.TestDriver driver testsuites.TestDriver
podInfoV1 = "v1" podInfoV1 = "v1"
podInfoUnknown = "unknown" podInfoUnknown = "unknown"
@ -308,37 +312,37 @@ var _ = utils.SIGDescribe("CSI Volumes", func() {
tests := []struct { tests := []struct {
name string name string
podInfoOnMountVersion *string podInfoOnMountVersion *string
driverExists bool deployDriverCRD bool
expectPodInfo bool expectPodInfo bool
}{ }{
{ {
name: "should not be passed when podInfoOnMountVersion=nil", name: "should not be passed when podInfoOnMountVersion=nil",
podInfoOnMountVersion: nil, podInfoOnMountVersion: nil,
driverExists: true, deployDriverCRD: true,
expectPodInfo: false, expectPodInfo: false,
}, },
{ {
name: "should be passed when podInfoOnMountVersion=v1", name: "should be passed when podInfoOnMountVersion=v1",
podInfoOnMountVersion: &podInfoV1, podInfoOnMountVersion: &podInfoV1,
driverExists: true, deployDriverCRD: true,
expectPodInfo: true, expectPodInfo: true,
}, },
{ {
name: "should not be passed when podInfoOnMountVersion=<empty string>", name: "should not be passed when podInfoOnMountVersion=<empty string>",
podInfoOnMountVersion: &podInfoEmpty, podInfoOnMountVersion: &podInfoEmpty,
driverExists: true, deployDriverCRD: true,
expectPodInfo: false, expectPodInfo: false,
}, },
{ {
name: "should not be passed when podInfoOnMountVersion=<unknown string>", name: "should not be passed when podInfoOnMountVersion=<unknown string>",
podInfoOnMountVersion: &podInfoUnknown, podInfoOnMountVersion: &podInfoUnknown,
driverExists: true, deployDriverCRD: true,
expectPodInfo: false, expectPodInfo: false,
}, },
{ {
name: "should not be passed when CSIDriver does not exist", name: "should not be passed when CSIDriver does not exist",
driverExists: false, deployDriverCRD: false,
expectPodInfo: false, expectPodInfo: false,
}, },
} }
for _, t := range tests { for _, t := range tests {
@ -350,12 +354,14 @@ var _ = utils.SIGDescribe("CSI Volumes", func() {
Prefix: "csi-workload", Prefix: "csi-workload",
} }
driver = drivers.InitMockCSIDriver(config, test.driverExists, true, test.podInfoOnMountVersion) driver = drivers.InitMockCSIDriver(config, test.deployDriverCRD, true, test.podInfoOnMountVersion)
driver.CreateDriver() driver.CreateDriver()
defer driver.CleanupDriver()
if test.driverExists { if test.deployDriverCRD {
err = waitForCSIDriver(csics, driver)
framework.ExpectNoError(err, "Failed to get CSIDriver: %v", err)
defer destroyCSIDriver(csics, driver) defer destroyCSIDriver(csics, driver)
defer driver.CleanupDriver()
} }
By("Creating pod") By("Creating pod")
@ -393,7 +399,7 @@ var _ = utils.SIGDescribe("CSI Volumes", func() {
if pod == nil { if pod == nil {
return return
} }
err := framework.WaitForPodNameRunningInNamespace(cs, pod.Name, pod.Namespace) err = framework.WaitForPodNameRunningInNamespace(cs, pod.Name, pod.Namespace)
framework.ExpectNoError(err, "Failed to start pod: %v", err) framework.ExpectNoError(err, "Failed to start pod: %v", err)
By("Checking CSI driver logs") By("Checking CSI driver logs")
// The driver is deployed as a statefulset with stable pod names // The driver is deployed as a statefulset with stable pod names
@ -459,6 +465,20 @@ func testTopologyNegative(cs clientset.Interface, suffix, namespace string, dela
} }
} }
func waitForCSIDriver(csics csiclient.Interface, driver testsuites.TestDriver) error {
timeout := 2 * time.Minute
driverName := testsuites.GetUniqueDriverName(driver)
framework.Logf("waiting up to %v for CSIDriver %q", timeout, driverName)
for start := time.Now(); time.Since(start) < timeout; time.Sleep(framework.Poll) {
_, err := csics.CsiV1alpha1().CSIDrivers().Get(driverName, metav1.GetOptions{})
if !errors.IsNotFound(err) {
return err
}
}
return fmt.Errorf("gave up after waiting %v for CSIDriver %q.", timeout, driverName)
}
func destroyCSIDriver(csics csiclient.Interface, driver testsuites.TestDriver) { func destroyCSIDriver(csics csiclient.Interface, driver testsuites.TestDriver) {
driverName := testsuites.GetUniqueDriverName(driver) driverName := testsuites.GetUniqueDriverName(driver)
driverGet, err := csics.CsiV1alpha1().CSIDrivers().Get(driverName, metav1.GetOptions{}) driverGet, err := csics.CsiV1alpha1().CSIDrivers().Get(driverName, metav1.GetOptions{})
@ -495,7 +515,7 @@ func deleteVolume(cs clientset.Interface, claim *v1.PersistentVolumeClaim) {
claim, err := cs.CoreV1().PersistentVolumeClaims(claim.Namespace).Get(claim.Name, metav1.GetOptions{}) claim, err := cs.CoreV1().PersistentVolumeClaims(claim.Namespace).Get(claim.Name, metav1.GetOptions{})
if err == nil { if err == nil {
cs.CoreV1().PersistentVolumeClaims(claim.Namespace).Delete(claim.Name, nil) cs.CoreV1().PersistentVolumeClaims(claim.Namespace).Delete(claim.Name, nil)
framework.WaitForPersistentVolumeDeleted(cs, claim.Spec.VolumeName, 2*time.Second, 2*time.Minute) framework.WaitForPersistentVolumeDeleted(cs, claim.Spec.VolumeName, framework.Poll, 2*time.Minute)
} }
} }