github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 05:36:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100484 from gavinfish/e2e-storage-suffix

Browse Source 
Remove suffixes for VolumeSnapshotClasses in E2E tests
This commit is contained in:
Kubernetes Prow Robot
2021-04-26 17:37:03 -07:00
committed by GitHub
parent 2f753ec4c8 244d7a5d67
commit 17f3990ea1
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e/storage/drivers/csi.go
View File

@@ -200,9 +200,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()) {
@@ -494,9 +493,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()) {
@@ -820,9 +818,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()) {

3
test/e2e/storage/external/external.go vendored
View File

@@ -353,7 +353,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:
@@ -386,7 +385,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) {

4
test/e2e/storage/utils/snapshot.go
View File

@@ -130,7 +130,6 @@ func GenerateSnapshotClassSpec(
snapshotter string,
parameters map[string]string,
ns string,
suffix string,
) *unstructured.Unstructured {
snapshotClass := &unstructured.Unstructured{
Object: map[string]interface{}{
@@ -138,8 +137,7 @@ func GenerateSnapshotClassSpec(
"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),
},
"driver": snapshotter,
"parameters": parameters,