Merge pull request #31416 from better0332/master

Automatic merge from submit-queue fix deleteVolume

Merge pull request #31416 from better0332/master
c9678dbd · Kubernetes Submit Queue · GitHub · 45f96fa8 · 524f0da7 · c9678dbd
Commit c9678dbd authored Aug 27, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 27, 2016
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

controller_base.go pkg/controller/volume/persistentvolume/controller_base.go +1 -1

No files found.
--- a/pkg/controller/volume/persistentvolume/controller_base.go
+++ b/pkg/controller/volume/persistentvolume/controller_base.go
@@ -303,7 +303,7 @@ func (ctrl *PersistentVolumeController) deleteVolume(obj interface{}) {
 		}
 	}

-	if !ok || volume == nil || volume.Spec.ClaimRef == nil {
+	if volume == nil || volume.Spec.ClaimRef == nil {
 		return
 	}