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

Merge pull request #73944 from xiaoanyunfei/cleanup/rm_unuse_judge

Browse Source 
rm unnecessary judgement
This commit is contained in:
Kubernetes Prow Robot
2019-08-29 13:30:57 -07:00
committed by GitHub
parent 47214d672d 91e6dab9f8
commit da986c56ab
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/kuberuntime/kuberuntime_container.go
View File

@@ -638,7 +638,7 @@ func (m *kubeGenericRuntimeManager) pruneInitContainersBeforeStart(pod *v1.Pod,
for name := range initContainerNames { for name := range initContainerNames {
count := 0 count := 0
for _, status := range podStatus.ContainerStatuses { for _, status := range podStatus.ContainerStatuses {
if status.Name != name || !initContainerNames.Has(status.Name) || if status.Name != name ||
(status.State != kubecontainer.ContainerStateExited && (status.State != kubecontainer.ContainerStateExited &&
status.State != kubecontainer.ContainerStateUnknown) { status.State != kubecontainer.ContainerStateUnknown) {
continue continue
@@ -679,7 +679,7 @@ func (m *kubeGenericRuntimeManager) purgeInitContainers(pod *v1.Pod, podStatus *
for name := range initContainerNames { for name := range initContainerNames {
count := 0 count := 0
for _, status := range podStatus.ContainerStatuses { for _, status := range podStatus.ContainerStatuses {
if status.Name != name || !initContainerNames.Has(status.Name) { if status.Name != name {
continue continue
} }
count++ count++