Merge pull request #47828 from yiqinguo/yiqinguo_add_continue

Automatic merge from submit-queue If error continue for loop If err does not add continue, type conversion will be error. If do not add continue, pod. (* V1.Pod) may cause panic to run. **Release note**: ```release-note NONE ```

Merge pull request #47828 from yiqinguo/yiqinguo_add_continue
5bb42cbc · Kubernetes Submit Queue · GitHub · 5ec7701c · 96c0fe9b · 5bb42cbc
Commit 5bb42cbc authored Aug 01, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 01, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

config.go pkg/kubelet/config/config.go +2 -0

No files found.
--- a/pkg/kubelet/config/config.go
+++ b/pkg/kubelet/config/config.go
@@ -506,6 +506,7 @@ func (s *podStorage) MergedState() interface{} {
 			pod, err := api.Scheme.Copy(podRef)
 			if err != nil {
 				glog.Errorf("unable to copy pod: %v", err)
+				continue
 			}
 			pods = append(pods, pod.(*v1.Pod))
 		}
@@ -520,6 +521,7 @@ func copyPods(sourcePods []*v1.Pod) []*v1.Pod {
 		pod, err := api.Scheme.Copy(source)
 		if err != nil {
 			glog.Errorf("unable to copy pod: %v", err)
+			continue
 		}
 		pods = append(pods, pod.(*v1.Pod))
 	}