github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #30133 from ZTE-PaaS/zhangke-patch-022

Browse Source 
Automatic merge from submit-queue

refractoring findContainerStatus of status_manager

make findContainerStatus of status_manager simple
This commit is contained in:
Kubernetes Submit Queue 2016-08-06 03:36:01 -07:00 committed by GitHub
commit 9132b68866
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/kubelet/status/status_manager.go
View File

@ -220,27 +220,20 @@ func (m *manager) SetContainerReadiness(podUID types.UID, containerID kubecontai
func findContainerStatus(status *api.PodStatus, containerID string) (containerStatus *api.ContainerStatus, init bool, ok bool) { func findContainerStatus(status *api.PodStatus, containerID string) (containerStatus *api.ContainerStatus, init bool, ok bool) {
// Find the container to update. // Find the container to update.
containerIndex := -1
for i, c := range status.ContainerStatuses { for i, c := range status.ContainerStatuses {
if c.ContainerID == containerID { if c.ContainerID == containerID {
containerIndex = i return &status.ContainerStatuses[i], false, true
break
} }
} }
if containerIndex != -1 {
return &status.ContainerStatuses[containerIndex], false, true
}
for i, c := range status.InitContainerStatuses { for i, c := range status.InitContainerStatuses {
if c.ContainerID == containerID { if c.ContainerID == containerID {
containerIndex = i return &status.InitContainerStatuses[i], true, true
break
} }
} }
if containerIndex != -1 {
return &status.InitContainerStatuses[containerIndex], true, true
}
return nil, false, false return nil, false, false
} }
func (m *manager) TerminatePod(pod *api.Pod) { func (m *manager) TerminatePod(pod *api.Pod) {