From 2275d236eee6fa427685786ae293cf39f857dbd7 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Thu, 13 Aug 2026 14:41:34 +0200 Subject: [PATCH] UPSTREAM: 141358: Enable group snapshot tests in all configurations Volume group snapshots are GA in Kubernetes 1.36 and the external-snapshotter 8.6. Enable them in all test configurations / jobs. --- test/e2e/storage/drivers/csi.go | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/test/e2e/storage/drivers/csi.go b/test/e2e/storage/drivers/csi.go index d25f3a367483c..f52a61dd31d7e 100644 --- a/test/e2e/storage/drivers/csi.go +++ b/test/e2e/storage/drivers/csi.go @@ -164,6 +164,7 @@ func InitHostPathCSIDriver() storageframework.TestDriver { storageframework.CapReadWriteOncePod: true, storageframework.CapMultiplePVsSameID: true, storageframework.CapFSResizeFromSourceNotSupported: true, + storageframework.CapVolumeGroupSnapshot: true, // There are extensive tests that NodeStage / NodePublish are called with -o context in csimock/csi_selinux_mount.go, // but the csi-driver-hostpath can't physically make -o context to appear in the mount table that the CapSELinuxMount tests expect. storageframework.CapSELinuxMount: false, @@ -174,10 +175,6 @@ func InitHostPathCSIDriver() storageframework.TestDriver { // added when patching the deployment. storageframework.CapVolumeLimits: true, } - // TODO: It can be removed after the VolumeGroupSnapshot feature is default enabled - if os.Getenv("CSI_PROW_ENABLE_GROUP_SNAPSHOT") == "true" { - capabilities[storageframework.CapVolumeGroupSnapshot] = true - } if os.Getenv("CSI_PROW_ENABLE_SNAPSHOT_METADATA") == "true" { capabilities[storageframework.CapSnapshotMetadata] = true } @@ -305,14 +302,13 @@ func (h *hostpathCSIDriver) PrepareTest(ctx context.Context, f *framework.Framew DriverContainerArguments: []string{"--feature-gates=VolumeAttributesClass=true"}, }) - // VGS E2E FeatureGate patches - // TODO: These can be removed after the VolumeGroupSnapshot feature is default enabled - if os.Getenv("CSI_PROW_ENABLE_GROUP_SNAPSHOT") == "true" { - patches = append(patches, utils.PatchCSIOptions{ - DriverContainerName: "csi-snapshotter", - DriverContainerArguments: []string{"--feature-gates=CSIVolumeGroupSnapshot=true"}, - }) - } + // VolumeGroupSnapshot feature E2E patches + // It is GA in Kubernetes, just the feature gate is erroneously disabled by default. + // TODO: remove this after the feature gate is enabled by default. + patches = append(patches, utils.PatchCSIOptions{ + DriverContainerName: "csi-snapshotter", + DriverContainerArguments: []string{"--feature-gates=CSIVolumeGroupSnapshot=true"}, + }) // SnapshotMetadata feature E2E patches // TODO: These can be removed after the SnapshotMetadata feature is default enabled