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

e2e storage: dead code removal and cleanup

Browse Source 
Setting testParameters.scName had no effect because
StorageClassTest.StorageClassName isn't used anywhere. Instead, the
storage class name is generated dynamically.
This commit is contained in:
Patrick Ohly 2020-07-02 16:44:14 +02:00
parent cf735a3bf7
commit bd0579103a
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/e2e/storage/csi_mock_volume.go
View File

@ -162,19 +162,13 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
sc = dDriver.GetDynamicProvisionStorageClass(m.config, "") sc = dDriver.GetDynamicProvisionStorageClass(m.config, "")
} }
scTest := testsuites.StorageClassTest{ scTest := testsuites.StorageClassTest{
Name: m.driver.GetDriverInfo().Name, Name: m.driver.GetDriverInfo().Name,
Provisioner: sc.Provisioner, Provisioner: sc.Provisioner,
Parameters: sc.Parameters, Parameters: sc.Parameters,
ClaimSize: "1Gi", ClaimSize: "1Gi",
ExpectedSize: "1Gi", ExpectedSize: "1Gi",
DelayBinding: m.tp.lateBinding, DelayBinding: m.tp.lateBinding,
} AllowVolumeExpansion: m.tp.enableResizing,
if m.tp.scName != "" {
scTest.StorageClassName = m.tp.scName
}
if m.tp.enableResizing {
scTest.AllowVolumeExpansion = true
} }
// The mock driver only works when everything runs on a single node. // The mock driver only works when everything runs on a single node.
@ -354,7 +348,6 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
ginkgo.It(t.name, func() { ginkgo.It(t.name, func() {
init(testParameters{ init(testParameters{
registerDriver: test.deployClusterRegistrar, registerDriver: test.deployClusterRegistrar,
scName: "csi-mock-sc-" + f.UniqueName,
podInfo: test.podInfoOnMount}) podInfo: test.podInfoOnMount})
defer cleanup() defer cleanup()
@ -682,7 +675,6 @@ var _ = utils.SIGDescribe("CSI mock volume", func() {
init(testParameters{ init(testParameters{
disableAttach: true, disableAttach: true,
registerDriver: true, registerDriver: true,
scName: "csi-mock-sc-" + f.UniqueName,
javascriptHooks: scripts, javascriptHooks: scripts,
}) })
defer cleanup() defer cleanup()

1
test/e2e/storage/testsuites/provisioning.go
View File

@ -52,7 +52,6 @@ type StorageClassTest struct {
Name string Name string
CloudProviders []string CloudProviders []string
Provisioner string Provisioner string
StorageClassName string
Parameters map[string]string Parameters map[string]string
DelayBinding bool DelayBinding bool
ClaimSize string ClaimSize string