Merge pull request #31416 from better0332/master

Automatic merge from submit-queue fix deleteVolume
2016-08-27 00:06:36 -07:00
parent 45f96fa89d 524f0da769
commit c9678dbd6d
1 changed files with 1 additions and 1 deletions
--- 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
 	}