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

Merge pull request #87193 from mattjmcnaughton/mattjmcnaughton/cleanup-rkt-code-in-pleg

Browse Source 
Clean up rkt specific code in `pkg/kubelet/pleg`
This commit is contained in:
Kubernetes Prow Robot 2020-01-14 22:21:46 -08:00 committed by GitHub
commit de34d2ce1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/kubelet/pleg/generic.go
View File

@ -365,17 +365,6 @@ func (g *GenericPLEG) getPodIPs(pid types.UID, status *kubecontainer.PodStatus)
} }
} }
if len(status.SandboxStatuses) == 0 {
// Without sandboxes (which built-in runtimes like rkt don't report)
// look at all the container statuses, and if any containers are
// running then use the new pod IP
for _, containerStatus := range status.ContainerStatuses {
if containerStatus.State == kubecontainer.ContainerStateCreated || containerStatus.State == kubecontainer.ContainerStateRunning {
return status.IPs
}
}
}
// For pods with no ready containers or sandboxes (like exited pods) // For pods with no ready containers or sandboxes (like exited pods)
// use the old status' pod IP // use the old status' pod IP
return oldStatus.IPs return oldStatus.IPs