github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
```
pull/6/head
Kubernetes Submit Queue 2017-08-01 21:41:43 -07:00 committed by GitHub
parent 5ec7701c5c 96c0fe9b11
commit 5bb42cbc58
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -506,6 +506,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))
} }
@ -520,6 +521,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))
} }