mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Remove suffixes for VolumeSnapshotClasses in E2E tests
This commit is contained in:
parent
375c9abfa2
commit
244d7a5d67
@ -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()) {
|
||||
@ -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()) {
|
||||
@ -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()) {
|
||||
|
3
test/e2e/storage/external/external.go
vendored
3
test/e2e/storage/external/external.go
vendored
@ -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:
|
||||
@ -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) {
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user