github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 18:24:07 +00:00
Code Issues 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
commit da986c56ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats 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++