From 91e6dab9f8e6fa34d6587fe83b67d428b1b0b56e Mon Sep 17 00:00:00 2001 From: sunxiaofei03 Date: Fri, 15 Feb 2019 10:57:42 +0800 Subject: [PATCH] rm unused judgement --- pkg/kubelet/kuberuntime/kuberuntime_container.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_container.go b/pkg/kubelet/kuberuntime/kuberuntime_container.go index b5826ab47dd..1c860d0c454 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_container.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_container.go @@ -635,7 +635,7 @@ func (m *kubeGenericRuntimeManager) pruneInitContainersBeforeStart(pod *v1.Pod, for name := range initContainerNames { count := 0 for _, status := range podStatus.ContainerStatuses { - if status.Name != name || !initContainerNames.Has(status.Name) || + if status.Name != name || (status.State != kubecontainer.ContainerStateExited && status.State != kubecontainer.ContainerStateUnknown) { continue @@ -676,7 +676,7 @@ func (m *kubeGenericRuntimeManager) purgeInitContainers(pod *v1.Pod, podStatus * for name := range initContainerNames { count := 0 for _, status := range podStatus.ContainerStatuses { - if status.Name != name || !initContainerNames.Has(status.Name) { + if status.Name != name { continue } count++