github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #124837 from carlory/rm-FindCreatablePluginBySpec

Browse Source 
remove unused FindCreatablePluginBySpec
This commit is contained in:
Kubernetes Prow Robot
2024-07-22 08:01:54 -07:00
committed by GitHub
parent 3f933ef262 568e580442
commit af71138323
3 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/volume/hostpath/host_path_test.go
View File

@@ -159,9 +159,7 @@ func TestProvisioner(t *testing.T) {
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{ProvisioningEnabled: true}), plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{ProvisioningEnabled: true}),
nil, nil,
volumetest.NewFakeKubeletVolumeHost(t, "/tmp/fake", nil, nil)) volumetest.NewFakeKubeletVolumeHost(t, "/tmp/fake", nil, nil))
spec := &volume.Spec{PersistentVolume: &v1.PersistentVolume{Spec: v1.PersistentVolumeSpec{ plug, err := plugMgr.FindProvisionablePluginByName(hostPathPluginName)
PersistentVolumeSource: v1.PersistentVolumeSource{HostPath: &v1.HostPathVolumeSource{Path: fmt.Sprintf("/tmp/hostpath.%s", uuid.NewUUID())}}}}}
plug, err := plugMgr.FindCreatablePluginBySpec(spec)
if err != nil { if err != nil {
t.Fatalf("Can't find the plugin by name") t.Fatalf("Can't find the plugin by name")
} }

5
pkg/volume/local/local_test.go
View File

@@ -720,11 +720,6 @@ func TestUnsupportedPlugins(t *testing.T) {
t.Errorf("Attachable plugin found, expected none") t.Errorf("Attachable plugin found, expected none")
} }
createPlug, err := plugMgr.FindCreatablePluginBySpec(spec)
if err == nil && createPlug != nil {
t.Errorf("Creatable plugin found, expected none")
}
provisionPlug, err := plugMgr.FindProvisionablePluginByName(localVolumePluginName) provisionPlug, err := plugMgr.FindProvisionablePluginByName(localVolumePluginName)
if err == nil && provisionPlug != nil { if err == nil && provisionPlug != nil {
t.Errorf("Provisionable plugin found, expected none") t.Errorf("Provisionable plugin found, expected none")

13
pkg/volume/plugins.go
View File

@@ -791,19 +791,6 @@ func (pm *VolumePluginMgr) FindDeletablePluginByName(name string) (DeletableVolu
return nil, fmt.Errorf("no deletable volume plugin matched") return nil, fmt.Errorf("no deletable volume plugin matched")
} }
// FindCreatablePluginBySpec fetches a persistent volume plugin by name. If
// no plugin is found, returns error.
func (pm *VolumePluginMgr) FindCreatablePluginBySpec(spec *Spec) (ProvisionableVolumePlugin, error) {
volumePlugin, err := pm.FindPluginBySpec(spec)
if err != nil {
return nil, err
}
if provisionableVolumePlugin, ok := volumePlugin.(ProvisionableVolumePlugin); ok {
return provisionableVolumePlugin, nil
}
return nil, fmt.Errorf("no creatable volume plugin matched")
}
// FindAttachablePluginBySpec fetches a persistent volume plugin by spec. // FindAttachablePluginBySpec fetches a persistent volume plugin by spec.
// Unlike the other "FindPlugin" methods, this does not return error if no // Unlike the other "FindPlugin" methods, this does not return error if no
// plugin is found. All volumes require a mounter and unmounter, but not // plugin is found. All volumes require a mounter and unmounter, but not