github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If err does not add continue, type conversion will be error.

Browse Source 
If do not add continue, pod. (* V1.Pod) may cause panic to run.
This commit is contained in:
yiqinguo
2017-06-21 15:36:01 +08:00
parent 5ca33f51ac
commit 96c0fe9b11
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/config/config.go
View File

@@ -505,6 +505,7 @@ func (s *podStorage) MergedState() interface{} {
pod, err := api.Scheme.Copy(podRef) pod, err := api.Scheme.Copy(podRef)
if err != nil { if err != nil {
glog.Errorf("unable to copy pod: %v", err) glog.Errorf("unable to copy pod: %v", err)
continue
} }
pods = append(pods, pod.(*v1.Pod)) pods = append(pods, pod.(*v1.Pod))
} }
@@ -519,6 +520,7 @@ func copyPods(sourcePods []*v1.Pod) []*v1.Pod {
pod, err := api.Scheme.Copy(source) pod, err := api.Scheme.Copy(source)
if err != nil { if err != nil {
glog.Errorf("unable to copy pod: %v", err) glog.Errorf("unable to copy pod: %v", err)
continue
} }
pods = append(pods, pod.(*v1.Pod)) pods = append(pods, pod.(*v1.Pod))
} }