Merge pull request #74493 from cofyc/fix74384

Fix panic because VolumeSpec may be nil in volume reconstruction scenario

Merge pull request #74493 from cofyc/fix74384
c7a9a150 · Kubernetes Prow Robot · GitHub · 8326ea71 · 618917e2 · c7a9a150
Unverified Commit c7a9a150 authored Feb 25, 2019 by Kubernetes Prow Robot Committed by GitHub Feb 25, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

operation_generator.go pkg/volume/util/operationexecutor/operation_generator.go +1 -1

No files found.
--- a/pkg/volume/util/operationexecutor/operation_generator.go
+++ b/pkg/volume/util/operationexecutor/operation_generator.go
@@ -732,7 +732,7 @@ func (og *operationGenerator) GenerateUnmountVolumeFunc(
 	podsDir string) (volumetypes.GeneratedOperations, error) {

 	var pluginName string
-	if useCSIPlugin(og.volumePluginMgr, volumeToUnmount.VolumeSpec) {
+	if volumeToUnmount.VolumeSpec != nil && useCSIPlugin(og.volumePluginMgr, volumeToUnmount.VolumeSpec) {
 		pluginName = csi.CSIPluginName
 	} else {
 		pluginName = volumeToUnmount.PluginName