Merge pull request #19239 from markturansky/fixup_pv_controllers

pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go

@@ -156,6 +156,7 @@ func (binder *PersistentVolumeClaimBinder) updateClaim(oldObj, newObj interface{
 	newClaim, ok := newObj.(*api.PersistentVolumeClaim)
 	if !ok {
 		glog.Errorf("Expected PersistentVolumeClaim but handler received %+v", newObj)
+		return
 	}
 	if err := syncClaim(binder.volumeIndex, binder.client, newClaim); err != nil {
 		glog.Errorf("PVClaimBinder could not update claim %s: %+v", newClaim.Name, err)

pkg/controller/persistentvolume/persistentvolume_recycler_controller.go

@@ -77,6 +77,7 @@ func NewPersistentVolumeRecycler(kubeClient client.Interface, syncPeriod time.Du
 				pv, ok := obj.(*api.PersistentVolume)
 				if !ok {
 					glog.Errorf("Error casting object to PersistentVolume: %v", obj)
+					return
 				}
 				recycler.reclaimVolume(pv)
 			},
@@ -84,6 +85,7 @@ func NewPersistentVolumeRecycler(kubeClient client.Interface, syncPeriod time.Du
 				pv, ok := newObj.(*api.PersistentVolume)
 				if !ok {
 					glog.Errorf("Error casting object to PersistentVolume: %v", newObj)
+					return
 				}
 				recycler.reclaimVolume(pv)
 			},