From d78946240ef97ea26e10a68dd2b1188920a926c2 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Tue, 28 Jun 2016 10:01:52 +0200 Subject: [PATCH] Fix error checks after cloning. We should not use clone result When cloning fails. Fixes issues found in #28108. --- pkg/controller/persistentvolume/controller_base.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/controller/persistentvolume/controller_base.go b/pkg/controller/persistentvolume/controller_base.go index 73915973e2d..67a70b2f39e 100644 --- a/pkg/controller/persistentvolume/controller_base.go +++ b/pkg/controller/persistentvolume/controller_base.go @@ -152,6 +152,7 @@ func (ctrl *PersistentVolumeController) initializeCaches(volumeSource, claimSour clone, err := conversion.NewCloner().DeepCopy(&volume) if err != nil { glog.Errorf("error cloning volume %q: %v", volume.Name, err) + continue } volumeClone := clone.(*api.PersistentVolume) ctrl.storeVolumeUpdate(volumeClone) @@ -172,6 +173,7 @@ func (ctrl *PersistentVolumeController) initializeCaches(volumeSource, claimSour clone, err := conversion.NewCloner().DeepCopy(&claim) if err != nil { glog.Errorf("error cloning claim %q: %v", claimToClaimKey(&claim), err) + continue } claimClone := clone.(*api.PersistentVolumeClaim) ctrl.storeClaimUpdate(claimClone)