github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 18:31:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #97183 from lala123912/suffix_clear_4

Browse Source 
remove suffixes from generated StorageClasses and VolumeSnapshotClass
This commit is contained in:
Kubernetes Prow Robot 2020-12-14 14:02:02 -08:00 committed by GitHub
commit caab2fb4d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,9 +154,8 @@ func (h *hostpathCSIDriver) GetDynamicProvisionStorageClass(config *storageframe
provisioner := config.GetUniqueDriverName() provisioner := config.GetUniqueDriverName()
parameters := map[string]string{} parameters := map[string]string{}
ns := config.Framework.Namespace.Name ns := config.Framework.Namespace.Name
suffix := fmt.Sprintf("%s-sc", provisioner)
return storageframework.GetStorageClass(provisioner, parameters, nil, ns, suffix) return storageframework.GetStorageClass(provisioner, parameters, nil, ns)
} }
func (h *hostpathCSIDriver) GetVolume(config *storageframework.PerTestConfig, volumeNumber int) (map[string]string, bool, bool) { func (h *hostpathCSIDriver) GetVolume(config *storageframework.PerTestConfig, volumeNumber int) (map[string]string, bool, bool) {
@ -346,9 +345,8 @@ func (m *mockCSIDriver) GetDynamicProvisionStorageClass(config *storageframework
provisioner := config.GetUniqueDriverName() provisioner := config.GetUniqueDriverName()
parameters := map[string]string{} parameters := map[string]string{}
ns := config.Framework.Namespace.Name ns := config.Framework.Namespace.Name
suffix := fmt.Sprintf("%s-sc", provisioner)
return storageframework.GetStorageClass(provisioner, parameters, nil, ns, suffix) return storageframework.GetStorageClass(provisioner, parameters, nil, ns)
} }
func (m *mockCSIDriver) GetSnapshotClass(config *storageframework.PerTestConfig) *unstructured.Unstructured { func (m *mockCSIDriver) GetSnapshotClass(config *storageframework.PerTestConfig) *unstructured.Unstructured {
@ -555,7 +553,6 @@ func (g *gcePDCSIDriver) SkipUnsupportedTest(pattern storageframework.TestPatter
func (g *gcePDCSIDriver) GetDynamicProvisionStorageClass(config *storageframework.PerTestConfig, fsType string) *storagev1.StorageClass { func (g *gcePDCSIDriver) GetDynamicProvisionStorageClass(config *storageframework.PerTestConfig, fsType string) *storagev1.StorageClass {
ns := config.Framework.Namespace.Name ns := config.Framework.Namespace.Name
provisioner := g.driverInfo.Name provisioner := g.driverInfo.Name
suffix := fmt.Sprintf("%s-sc", g.driverInfo.Name)
parameters := map[string]string{"type": "pd-standard"} parameters := map[string]string{"type": "pd-standard"}
if fsType != "" { if fsType != "" {
@ -563,7 +560,7 @@ func (g *gcePDCSIDriver) GetDynamicProvisionStorageClass(config *storageframewor
} }
delayedBinding := storagev1.VolumeBindingWaitForFirstConsumer delayedBinding := storagev1.VolumeBindingWaitForFirstConsumer
return storageframework.GetStorageClass(provisioner, parameters, &delayedBinding, ns, suffix) return storageframework.GetStorageClass(provisioner, parameters, &delayedBinding, ns)
} }
func (g *gcePDCSIDriver) GetSnapshotClass(config *storageframework.PerTestConfig) *unstructured.Unstructured { func (g *gcePDCSIDriver) GetSnapshotClass(config *storageframework.PerTestConfig) *unstructured.Unstructured {

18
test/e2e/storage/drivers/in_tree.go
View File

@ -151,9 +151,8 @@ func (n *nfsDriver) GetDynamicProvisionStorageClass(config *storageframework.Per
provisioner := n.externalPluginName provisioner := n.externalPluginName
parameters := map[string]string{"mountOptions": "vers=4.1"} parameters := map[string]string{"mountOptions": "vers=4.1"}
ns := config.Framework.Namespace.Name ns := config.Framework.Namespace.Name
suffix := fmt.Sprintf("%s-sc", n.driverInfo.Name)
return storageframework.GetStorageClass(provisioner, parameters, nil, ns, suffix) return storageframework.GetStorageClass(provisioner, parameters, nil, ns)
} }
func (n *nfsDriver) PrepareTest(f *framework.Framework) (*storageframework.PerTestConfig, func()) { func (n *nfsDriver) PrepareTest(f *framework.Framework) (*storageframework.PerTestConfig, func()) {
@ -1132,9 +1131,8 @@ func (c *cinderDriver) GetDynamicProvisionStorageClass(config *storageframework.
parameters["fsType"] = fsType parameters["fsType"] = fsType
} }
ns := config.Framework.Namespace.Name ns := config.Framework.Namespace.Name
suffix := fmt.Sprintf("%s-sc", c.driverInfo.Name)
return storageframework.GetStorageClass(provisioner, parameters, nil, ns, suffix) return storageframework.GetStorageClass(provisioner, parameters, nil, ns)
} }
func (c *cinderDriver) PrepareTest(f *framework.Framework) (*storageframework.PerTestConfig, func()) { func (c *cinderDriver) PrepareTest(f *framework.Framework) (*storageframework.PerTestConfig, func()) {
@ -1343,10 +1341,9 @@ func (g *gcePdDriver) GetDynamicProvisionStorageClass(config *storageframework.P
parameters["fsType"] = fsType parameters["fsType"] = fsType
} }
ns := config.Framework.Namespace.Name ns := config.Framework.Namespace.Name
suffix := fmt.Sprintf("%s-sc", g.driverInfo.Name)
delayedBinding := storagev1.VolumeBindingWaitForFirstConsumer delayedBinding := storagev1.VolumeBindingWaitForFirstConsumer
return storageframework.GetStorageClass(provisioner, parameters, &delayedBinding, ns, suffix) return storageframework.GetStorageClass(provisioner, parameters, &delayedBinding, ns)
} }
func (g *gcePdDriver) PrepareTest(f *framework.Framework) (*storageframework.PerTestConfig, func()) { func (g *gcePdDriver) PrepareTest(f *framework.Framework) (*storageframework.PerTestConfig, func()) {
@ -1486,9 +1483,8 @@ func (v *vSphereDriver) GetDynamicProvisionStorageClass(config *storageframework
parameters["fsType"] = fsType parameters["fsType"] = fsType
} }
ns := config.Framework.Namespace.Name ns := config.Framework.Namespace.Name
suffix := fmt.Sprintf("%s-sc", v.driverInfo.Name)
return storageframework.GetStorageClass(provisioner, parameters, nil, ns, suffix) return storageframework.GetStorageClass(provisioner, parameters, nil, ns)
} }
func (v *vSphereDriver) PrepareTest(f *framework.Framework) (*storageframework.PerTestConfig, func()) { func (v *vSphereDriver) PrepareTest(f *framework.Framework) (*storageframework.PerTestConfig, func()) {
@ -1617,10 +1613,9 @@ func (a *azureDiskDriver) GetDynamicProvisionStorageClass(config *storageframewo
parameters["fsType"] = fsType parameters["fsType"] = fsType
} }
ns := config.Framework.Namespace.Name ns := config.Framework.Namespace.Name
suffix := fmt.Sprintf("%s-sc", a.driverInfo.Name)
delayedBinding := storagev1.VolumeBindingWaitForFirstConsumer delayedBinding := storagev1.VolumeBindingWaitForFirstConsumer
return storageframework.GetStorageClass(provisioner, parameters, &delayedBinding, ns, suffix) return storageframework.GetStorageClass(provisioner, parameters, &delayedBinding, ns)
} }
func (a *azureDiskDriver) PrepareTest(f *framework.Framework) (*storageframework.PerTestConfig, func()) { func (a *azureDiskDriver) PrepareTest(f *framework.Framework) (*storageframework.PerTestConfig, func()) {
@ -1750,10 +1745,9 @@ func (a *awsDriver) GetDynamicProvisionStorageClass(config *storageframework.Per
parameters["fsType"] = fsType parameters["fsType"] = fsType
} }
ns := config.Framework.Namespace.Name ns := config.Framework.Namespace.Name
suffix := fmt.Sprintf("%s-sc", a.driverInfo.Name)
delayedBinding := storagev1.VolumeBindingWaitForFirstConsumer delayedBinding := storagev1.VolumeBindingWaitForFirstConsumer
return storageframework.GetStorageClass(provisioner, parameters, &delayedBinding, ns, suffix) return storageframework.GetStorageClass(provisioner, parameters, &delayedBinding, ns)
} }
func (a *awsDriver) PrepareTest(f *framework.Framework) (*storageframework.PerTestConfig, func()) { func (a *awsDriver) PrepareTest(f *framework.Framework) (*storageframework.PerTestConfig, func()) {

4
test/e2e/storage/framework/driver_operations.go
View File

@ -67,7 +67,6 @@ func GetStorageClass(
parameters map[string]string, parameters map[string]string,
bindingMode *storagev1.VolumeBindingMode, bindingMode *storagev1.VolumeBindingMode,
ns string, ns string,
suffix string,
) *storagev1.StorageClass { ) *storagev1.StorageClass {
if bindingMode == nil { if bindingMode == nil {
defaultBindingMode := storagev1.VolumeBindingImmediate defaultBindingMode := storagev1.VolumeBindingImmediate
@ -79,8 +78,7 @@ func GetStorageClass(
}, },
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
// Name must be unique, so let's base it on namespace name and use GenerateName // 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),
Name: names.SimpleNameGenerator.GenerateName(ns + "-" + suffix),
}, },
Provisioner: provisioner, Provisioner: provisioner,
Parameters: parameters, Parameters: parameters,