From 62b23aeb0cfa6ca9b91376475fff2a55f26f911d Mon Sep 17 00:00:00 2001 From: Hemant Kumar Date: Sat, 25 Oct 2025 09:47:18 -0400 Subject: [PATCH] Remove FromName for VAC external tests VAC must have one or more parameters defined and hence you can't just create it from driver's name during e2e testing. --- test/e2e/storage/external/external.go | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/test/e2e/storage/external/external.go b/test/e2e/storage/external/external.go index c0ee1b6d305..d0b59a148ba 100644 --- a/test/e2e/storage/external/external.go +++ b/test/e2e/storage/external/external.go @@ -82,13 +82,8 @@ type driverDefinition struct { // VolumeAttributesClass must be set to enable volume modification tests. // The default is to not run those tests. VolumeAttributesClass struct { - // FromName set to true enables the usage of a - // VolumeAttributesClass with DriverInfo.Name as - // provisioner and no parameters. - FromName bool - // FromFile is used only when FromName is false. It - // loads a storage class from the given .yaml or .json + // loads a VolumeAttributesClass from the given .yaml or .json // file. File names are resolved by the // framework.testfiles package, which typically means // that they can be absolute or relative to the test @@ -516,7 +511,7 @@ func (d *driverDefinition) GetVolumeGroupSnapshotClass(ctx context.Context, e2ec } func (d *driverDefinition) GetVolumeAttributesClass(ctx context.Context, e2econfig *storageframework.PerTestConfig) *storagev1.VolumeAttributesClass { - if !d.VolumeAttributesClass.FromName && d.VolumeAttributesClass.FromFile == "" && d.VolumeAttributesClass.FromExistingClassName == "" { + if d.VolumeAttributesClass.FromFile == "" && d.VolumeAttributesClass.FromExistingClassName == "" { e2eskipper.Skipf("Driver %q has no configured VolumeAttributesClass - skipping", d.DriverInfo.Name) return nil } @@ -528,8 +523,6 @@ func (d *driverDefinition) GetVolumeAttributesClass(ctx context.Context, e2econf f := e2econfig.Framework switch { - case d.VolumeAttributesClass.FromName: - vac = &storagev1.VolumeAttributesClass{DriverName: d.DriverInfo.Name} case d.VolumeAttributesClass.FromExistingClassName != "": vac, err = f.ClientSet.StorageV1().VolumeAttributesClasses().Get(ctx, d.VolumeAttributesClass.FromExistingClassName, metav1.GetOptions{}) framework.ExpectNoError(err, "getting VolumeAttributesClass %s", d.VolumeAttributesClass.FromExistingClassName)