mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 12:15:52 +00:00
Merge pull request #30133 from ZTE-PaaS/zhangke-patch-022
Automatic merge from submit-queue refractoring findContainerStatus of status_manager make findContainerStatus of status_manager simple
This commit is contained in:
commit
9132b68866
@ -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) {
|
||||
// Find the container to update.
|
||||
containerIndex := -1
|
||||
for i, c := range status.ContainerStatuses {
|
||||
if c.ContainerID == containerID {
|
||||
containerIndex = i
|
||||
break
|
||||
return &status.ContainerStatuses[i], false, true
|
||||
}
|
||||
}
|
||||
if containerIndex != -1 {
|
||||
return &status.ContainerStatuses[containerIndex], false, true
|
||||
}
|
||||
|
||||
for i, c := range status.InitContainerStatuses {
|
||||
if c.ContainerID == containerID {
|
||||
containerIndex = i
|
||||
break
|
||||
return &status.InitContainerStatuses[i], true, true
|
||||
}
|
||||
}
|
||||
if containerIndex != -1 {
|
||||
return &status.InitContainerStatuses[containerIndex], true, true
|
||||
}
|
||||
|
||||
return nil, false, false
|
||||
|
||||
}
|
||||
|
||||
func (m *manager) TerminatePod(pod *api.Pod) {
|
||||
|
Loading…
Reference in New Issue
Block a user