Merge pull request kubernetes#81456 from fredkan/bugfix/error-config-attachable-plugin

k8s-ci-robot · web-flow · commit 9b54021c65b5 · 2019-08-16T06:44:44.000-07:00
Bugfix/error config attachable plugin
diff --git a/pkg/kubelet/volumemanager/cache/actual_state_of_world.go b/pkg/kubelet/volumemanager/cache/actual_state_of_world.go
@@ -398,7 +398,7 @@ func (asw *actualStateOfWorld) addVolume(
 	}
 
 	pluginIsAttachable := false
-	if _, ok := volumePlugin.(volume.AttachableVolumePlugin); ok {
+	if attachablePlugin, err := asw.volumePluginMgr.FindAttachablePluginBySpec(volumeSpec); err == nil && attachablePlugin != nil {
 		pluginIsAttachable = true
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ func (asw *actualStateOfWorld) addVolume(`
`398`	`398`	`}`
`399`	`399`
`400`	`400`	`pluginIsAttachable := false`
`401`		`- if _, ok := volumePlugin.(volume.AttachableVolumePlugin); ok {`
	`401`	`+ if attachablePlugin, err := asw.volumePluginMgr.FindAttachablePluginBySpec(volumeSpec); err == nil && attachablePlugin != nil {`
`402`	`402`	`pluginIsAttachable = true`
`403`	`403`	`}`
`404`	`404`