github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #74493 from cofyc/fix74384

Browse Source 
Fix panic because VolumeSpec may be nil in volume reconstruction scenario
This commit is contained in:
Kubernetes Prow Robot 2019-02-25 20:28:19 -08:00 committed by GitHub
commit c7a9a150e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/volume/util/operationexecutor/operation_generator.go
View File

@ -732,7 +732,7 @@ func (og *operationGenerator) GenerateUnmountVolumeFunc(
podsDir string) (volumetypes.GeneratedOperations, error) { podsDir string) (volumetypes.GeneratedOperations, error) {
var pluginName string var pluginName string
if useCSIPlugin(og.volumePluginMgr, volumeToUnmount.VolumeSpec) { if volumeToUnmount.VolumeSpec != nil && useCSIPlugin(og.volumePluginMgr, volumeToUnmount.VolumeSpec) {
pluginName = csi.CSIPluginName pluginName = csi.CSIPluginName
} else { } else {
pluginName = volumeToUnmount.PluginName pluginName = volumeToUnmount.PluginName