mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-12 21:36:24 +00:00
Merge pull request #119025 from ii/remove-csidriver-test
Remove conformance test for StorageV1CSIDriver Endpoints
This commit is contained in:
commit
77ad8a516d
7
test/conformance/testdata/conformance.yaml
vendored
7
test/conformance/testdata/conformance.yaml
vendored
@ -2580,13 +2580,6 @@
|
||||
patch, and delete operations.
|
||||
release: v1.26
|
||||
file: test/e2e/storage/csi_inline.go
|
||||
- testname: CSIInlineVolumes should support ephemeral CSIDrivers
|
||||
codename: '[sig-storage] CSIInlineVolumes should support ephemeral VolumeLifecycleMode
|
||||
in CSIDriver API [Conformance]'
|
||||
description: CSIDriver resources with ephemeral VolumeLifecycleMode should support
|
||||
create, get, list, and delete operations.
|
||||
release: v1.26
|
||||
file: test/e2e/storage/csi_inline.go
|
||||
- testname: CSIStorageCapacity API
|
||||
codename: '[sig-storage] CSIStorageCapacity should support CSIStorageCapacities
|
||||
API operations [Conformance]'
|
||||
|
@ -41,91 +41,6 @@ var _ = utils.SIGDescribe("CSIInlineVolumes", func() {
|
||||
f := framework.NewDefaultFramework("csiinlinevolumes")
|
||||
f.NamespacePodSecurityLevel = admissionapi.LevelPrivileged
|
||||
|
||||
/*
|
||||
Release: v1.26
|
||||
Testname: CSIInlineVolumes should support ephemeral CSIDrivers
|
||||
Description: CSIDriver resources with ephemeral VolumeLifecycleMode
|
||||
should support create, get, list, and delete operations.
|
||||
*/
|
||||
framework.ConformanceIt("should support ephemeral VolumeLifecycleMode in CSIDriver API", func(ctx context.Context) {
|
||||
// Create client
|
||||
client := f.ClientSet.StorageV1().CSIDrivers()
|
||||
defaultFSGroupPolicy := storagev1.ReadWriteOnceWithFSTypeFSGroupPolicy
|
||||
|
||||
// Driver that supports only Ephemeral
|
||||
driver1 := &storagev1.CSIDriver{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: "inline-driver-" + string(uuid.NewUUID()),
|
||||
Labels: map[string]string{
|
||||
"test": f.UniqueName,
|
||||
},
|
||||
},
|
||||
|
||||
Spec: storagev1.CSIDriverSpec{
|
||||
VolumeLifecycleModes: []storagev1.VolumeLifecycleMode{storagev1.VolumeLifecycleEphemeral},
|
||||
FSGroupPolicy: &defaultFSGroupPolicy,
|
||||
},
|
||||
}
|
||||
|
||||
// Driver that supports both Ephemeral and Persistent
|
||||
driver2 := &storagev1.CSIDriver{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: "inline-driver-" + string(uuid.NewUUID()),
|
||||
Labels: map[string]string{
|
||||
"test": f.UniqueName,
|
||||
},
|
||||
},
|
||||
|
||||
Spec: storagev1.CSIDriverSpec{
|
||||
VolumeLifecycleModes: []storagev1.VolumeLifecycleMode{
|
||||
storagev1.VolumeLifecyclePersistent,
|
||||
storagev1.VolumeLifecycleEphemeral,
|
||||
},
|
||||
FSGroupPolicy: &defaultFSGroupPolicy,
|
||||
},
|
||||
}
|
||||
|
||||
ginkgo.By("creating")
|
||||
createdDriver1, err := client.Create(ctx, driver1, metav1.CreateOptions{})
|
||||
framework.ExpectNoError(err)
|
||||
createdDriver2, err := client.Create(ctx, driver2, metav1.CreateOptions{})
|
||||
framework.ExpectNoError(err)
|
||||
_, err = client.Create(ctx, driver1, metav1.CreateOptions{})
|
||||
if !apierrors.IsAlreadyExists(err) {
|
||||
framework.Failf("expected 409, got %#v", err)
|
||||
}
|
||||
|
||||
ginkgo.By("getting")
|
||||
retrievedDriver1, err := client.Get(ctx, createdDriver1.Name, metav1.GetOptions{})
|
||||
framework.ExpectNoError(err)
|
||||
framework.ExpectEqual(retrievedDriver1.UID, createdDriver1.UID)
|
||||
retrievedDriver2, err := client.Get(ctx, createdDriver2.Name, metav1.GetOptions{})
|
||||
framework.ExpectNoError(err)
|
||||
framework.ExpectEqual(retrievedDriver2.UID, createdDriver2.UID)
|
||||
|
||||
ginkgo.By("listing")
|
||||
driverList, err := client.List(ctx, metav1.ListOptions{LabelSelector: "test=" + f.UniqueName})
|
||||
framework.ExpectNoError(err)
|
||||
framework.ExpectEqual(len(driverList.Items), 2, "filtered list should have 2 items, got: %s", driverList)
|
||||
|
||||
ginkgo.By("deleting")
|
||||
for _, driver := range driverList.Items {
|
||||
err := client.Delete(ctx, driver.Name, metav1.DeleteOptions{})
|
||||
framework.ExpectNoError(err)
|
||||
retrievedDriver, err := client.Get(ctx, driver.Name, metav1.GetOptions{})
|
||||
switch {
|
||||
case apierrors.IsNotFound(err):
|
||||
// Okay, normal case.
|
||||
case err != nil:
|
||||
framework.Failf("expected 404, got %#v", err)
|
||||
case retrievedDriver.DeletionTimestamp != nil:
|
||||
// Okay, normal case.
|
||||
default:
|
||||
framework.Failf("CSIDriver should have been deleted or have DeletionTimestamp, but instead got: %s", retrievedDriver)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
/*
|
||||
Release: v1.26
|
||||
Testname: CSIInlineVolumes should support Pods with inline volumes
|
||||
|
Loading…
Reference in New Issue
Block a user