Skip to content
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

Jump to bottom

Remove suffixes for VolumeSnapshotClasses in E2E tests #100484

Merged
merged 1 commit into from
Apr 27, 2021
Merged

Remove suffixes for VolumeSnapshotClasses in E2E tests #100484

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 3 additions & 6 deletions test/e2e/storage/drivers/csi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,8 @@ func (h *hostpathCSIDriver) GetCSIDriverName(config *storageframework.PerTestCon
func (h *hostpathCSIDriver) GetSnapshotClass(config *storageframework.PerTestConfig, parameters map[string]string) *unstructured.Unstructured {
snapshotter := config.GetUniqueDriverName()
ns := config.Framework.Namespace.Name
suffix := fmt.Sprintf("%s-vsc", snapshotter)

return utils.GenerateSnapshotClassSpec(snapshotter, parameters, ns, suffix)
return utils.GenerateSnapshotClassSpec(snapshotter, parameters, ns)
}

func (h *hostpathCSIDriver) PrepareTest(f *framework.Framework) (*storageframework.PerTestConfig, func()) {
Expand Down Expand Up @@ -470,9 +469,8 @@ func (m *mockCSIDriver) GetDynamicProvisionStorageClass(config *storageframework
func (m *mockCSIDriver) GetSnapshotClass(config *storageframework.PerTestConfig, parameters map[string]string) *unstructured.Unstructured {
snapshotter := m.driverInfo.Name + "-" + config.Framework.UniqueName
ns := config.Framework.Namespace.Name
suffix := fmt.Sprintf("%s-vsc", snapshotter)

return utils.GenerateSnapshotClassSpec(snapshotter, parameters, ns, suffix)
return utils.GenerateSnapshotClassSpec(snapshotter, parameters, ns)
}

func (m *mockCSIDriver) PrepareTest(f *framework.Framework) (*storageframework.PerTestConfig, func()) {
Expand Down Expand Up @@ -778,9 +776,8 @@ func (g *gcePDCSIDriver) GetDynamicProvisionStorageClass(config *storageframewor
func (g *gcePDCSIDriver) GetSnapshotClass(config *storageframework.PerTestConfig, parameters map[string]string) *unstructured.Unstructured {
snapshotter := g.driverInfo.Name
ns := config.Framework.Namespace.Name
suffix := fmt.Sprintf("%s-vsc", snapshotter)

return utils.GenerateSnapshotClassSpec(snapshotter, parameters, ns, suffix)
return utils.GenerateSnapshotClassSpec(snapshotter, parameters, ns)
}

func (g *gcePDCSIDriver) PrepareTest(f *framework.Framework) (*storageframework.PerTestConfig, func()) {
Expand Down
3 changes: 1 addition & 2 deletions test/e2e/storage/external/external.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,6 @@ func (d *driverDefinition) GetSnapshotClass(e2econfig *storageframework.PerTestC
f := e2econfig.Framework
snapshotter := d.DriverInfo.Name
ns := e2econfig.Framework.Namespace.Name
suffix := "vsc"

switch {
case d.SnapshotClass.FromName:
Expand Down Expand Up @@ -389,7 +388,7 @@ func (d *driverDefinition) GetSnapshotClass(e2econfig *storageframework.PerTestC
}
}

return utils.GenerateSnapshotClassSpec(snapshotter, parameters, ns, suffix)
return utils.GenerateSnapshotClassSpec(snapshotter, parameters, ns)
}

func (d *driverDefinition) GetVolume(e2econfig *storageframework.PerTestConfig, volumeNumber int) (map[string]string, bool, bool) {
Expand Down
4 changes: 1 addition & 3 deletions test/e2e/storage/utils/snapshot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,16 +130,14 @@ func GenerateSnapshotClassSpec(
snapshotter string,
parameters map[string]string,
ns string,
suffix string,
) *unstructured.Unstructured {
snapshotClass := &unstructured.Unstructured{
Object: map[string]interface{}{
"kind": "VolumeSnapshotClass",
"apiVersion": SnapshotAPIVersion,
"metadata": map[string]interface{}{
// Name must be unique, so let's base it on namespace name and use GenerateName
// TODO(#96234): Remove unnecessary suffix.
"name": names.SimpleNameGenerator.GenerateName(ns + "-" + suffix),
"name": names.SimpleNameGenerator.GenerateName(ns),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

because of

 49 func (simpleNameGenerator) GenerateName(base string) string {
 50         if len(base) > maxGeneratedNameLength {
 51                 base = base[:maxGeneratedNameLength]
 52         }
 53         return fmt.Sprintf("%s%s", base, utilrand.String(randomLength))
 54 }

},
"driver": snapshotter,
"parameters": parameters,
Expand Down