From ab7e0f58d5c5f172a27d18251a67f1a658ff42dd Mon Sep 17 00:00:00 2001 From: mattjmcnaughton Date: Sun, 5 Jan 2020 09:30:13 -0500 Subject: [PATCH] Clean up rkt specific code in `pkg/kubelet/pleg` Clean up code in PLEG which was only necessary for the `rkt` runtime. Rkt is no longer a built-in runtime and docker(shim) uses the CRI, so its safe to remove this code entirely. This diff removes the last mentions of `rkt` in the kubelet. --- pkg/kubelet/pleg/generic.go | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkg/kubelet/pleg/generic.go b/pkg/kubelet/pleg/generic.go index 1bd39c64ff7..732a22b2c1e 100644 --- a/pkg/kubelet/pleg/generic.go +++ b/pkg/kubelet/pleg/generic.go @@ -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) // use the old status' pod IP return oldStatus.IPs