github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #80973 from xiaoanyunfei/bugfix/orphan-volume

Browse Source 
fix orphaned pod flexvolume  can not be cleaned up
This commit is contained in:
Kubernetes Prow Robot 2020-04-01 20:50:23 -07:00 committed by GitHub
commit 8d773421ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/volume/flexvolume/flexvolume_test.go
View File

@ -124,11 +124,11 @@ func TestCanSupport(t *testing.T) {
runner := exec.New() runner := exec.New()
installPluginUnderTest(t, "kubernetes.io", "fakeAttacher", tmpDir, execScriptTempl1, nil) installPluginUnderTest(t, "kubernetes.io", "fakeAttacher", tmpDir, execScriptTempl1, nil)
plugMgr.InitPlugins(nil, GetDynamicPluginProber(tmpDir, runner), volumetest.NewFakeVolumeHost(t, "fake", nil, nil)) plugMgr.InitPlugins(nil, GetDynamicPluginProber(tmpDir, runner), volumetest.NewFakeVolumeHost(t, "fake", nil, nil))
plugin, err := plugMgr.FindPluginByName("flexvolume-kubernetes.io/fakeAttacher") plugin, err := plugMgr.FindPluginByName("kubernetes.io/fakeAttacher")
if err != nil { if err != nil {
t.Fatalf("Can't find the plugin by name") t.Fatalf("Can't find the plugin by name")
} }
if plugin.GetPluginName() != "flexvolume-kubernetes.io/fakeAttacher" { if plugin.GetPluginName() != "kubernetes.io/fakeAttacher" {
t.Errorf("Wrong name: %s", plugin.GetPluginName()) t.Errorf("Wrong name: %s", plugin.GetPluginName())
} }
if !plugin.CanSupport(&volume.Spec{Volume: &v1.Volume{VolumeSource: v1.VolumeSource{FlexVolume: &v1.FlexVolumeSource{Driver: "kubernetes.io/fakeAttacher"}}}}) { if !plugin.CanSupport(&volume.Spec{Volume: &v1.Volume{VolumeSource: v1.VolumeSource{FlexVolume: &v1.FlexVolumeSource{Driver: "kubernetes.io/fakeAttacher"}}}}) {
@ -154,7 +154,7 @@ func TestGetAccessModes(t *testing.T) {
installPluginUnderTest(t, "kubernetes.io", "fakeAttacher", tmpDir, execScriptTempl1, nil) installPluginUnderTest(t, "kubernetes.io", "fakeAttacher", tmpDir, execScriptTempl1, nil)
plugMgr.InitPlugins(nil, GetDynamicPluginProber(tmpDir, runner), volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil)) plugMgr.InitPlugins(nil, GetDynamicPluginProber(tmpDir, runner), volumetest.NewFakeVolumeHost(t, tmpDir, nil, nil))
plugin, err := plugMgr.FindPersistentPluginByName("flexvolume-kubernetes.io/fakeAttacher") plugin, err := plugMgr.FindPersistentPluginByName("kubernetes.io/fakeAttacher")
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/flexvolume/plugin.go
View File

@ -34,8 +34,7 @@ import (
) )
const ( const (
flexVolumePluginName = "kubernetes.io/flexvolume" flexVolumePluginName = "kubernetes.io/flexvolume"
flexVolumePluginNamePrefix = "flexvolume-"
) )
// FlexVolumePlugin object. // FlexVolumePlugin object.
@ -114,7 +113,7 @@ func (plugin *flexVolumePlugin) getExecutable() string {
// Name is part of the volume.VolumePlugin interface. // Name is part of the volume.VolumePlugin interface.
func (plugin *flexVolumePlugin) GetPluginName() string { func (plugin *flexVolumePlugin) GetPluginName() string {
return flexVolumePluginNamePrefix + plugin.driverName return plugin.driverName
} }
// GetVolumeName is part of the volume.VolumePlugin interface. // GetVolumeName is part of the volume.VolumePlugin interface.

2
pkg/volume/flexvolume/probe.go
View File

@ -140,7 +140,7 @@ func (prober *flexVolumeProber) newProbeEvent(driverDirName string, op volume.Pr
probeEvent.PluginName = plugin.GetPluginName() probeEvent.PluginName = plugin.GetPluginName()
} else if op == volume.ProbeRemove { } else if op == volume.ProbeRemove {
driverName := utilstrings.UnescapeQualifiedName(driverDirName) driverName := utilstrings.UnescapeQualifiedName(driverDirName)
probeEvent.PluginName = flexVolumePluginNamePrefix + driverName probeEvent.PluginName = driverName
} else { } else {
return probeEvent, fmt.Errorf("Unknown Operation on directory: %s. ", driverDirName) return probeEvent, fmt.Errorf("Unknown Operation on directory: %s. ", driverDirName)

2
pkg/volume/plugins.go
View File

@ -704,7 +704,7 @@ func (pm *VolumePluginMgr) FindPluginByName(name string) (VolumePlugin, error) {
} }
if len(matches) == 0 { if len(matches) == 0 {
return nil, fmt.Errorf("no volume plugin matched") return nil, fmt.Errorf("no volume plugin matched name: %s", name)
} }
if len(matches) > 1 { if len(matches) > 1 {
matchedPluginNames := []string{} matchedPluginNames := []string{}

2
test/e2e/storage/detach_mounted.go
View File

@ -128,7 +128,7 @@ var _ = utils.SIGDescribe("Detaching volumes", func() {
}) })
func getUniqueVolumeName(pod *v1.Pod, driverName string) string { func getUniqueVolumeName(pod *v1.Pod, driverName string) string {
return fmt.Sprintf("flexvolume-k8s/%s/%s", driverName, pod.Spec.Volumes[0].Name) return fmt.Sprintf("k8s/%s/%s", driverName, pod.Spec.Volumes[0].Name)
} }
func waitForVolumesNotInUse(client clientset.Interface, nodeName, volumeName string) error { func waitForVolumesNotInUse(client clientset.Interface, nodeName, volumeName string) error {