Skip to content

WIP: UPSTREAM: 141358: Enable group snapshot tests in all configurations #2747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jsafrane wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

WIP: UPSTREAM: 141358: Enable group snapshot tests in all configurations #2747

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions test/e2e/storage/drivers/csi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
}
Expand Down Expand Up @@ -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
Expand Down