github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #19784 from Random-Liu/cleanup-kubelet-syncpod

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-30 00:25:49 -08:00
parent e953f4a074 eb56d46b74
commit 2d061aa199
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubelet/dockertools/manager.go
View File

@@ -441,7 +441,6 @@ func (dm *DockerManager) ConvertPodStatusToAPIPodStatus(pod *api.Pod, podStatus
}
containerDone := sets.NewString()
// NOTE(random-liu): The Pod IP is generated in kubelet.generatePodStatus(), we have no podStatus.IP now
apiPodStatus.PodIP = podStatus.IP
for _, containerStatus := range podStatus.ContainerStatuses {
cName := containerStatus.Name