Merge pull request kubernetes#88988 from smarterclayton/ensure_host_network_podips

k8s-ci-robot · web-flow · commit 2bacdf804748 · 2020-03-10T06:43:36.000-07:00
kubelet: Also set PodIPs when assign a host network PodIP
diff --git a/pkg/kubelet/kubelet_pods.go b/pkg/kubelet/kubelet_pods.go
@@ -1399,6 +1399,7 @@ func (kl *Kubelet) generateAPIPodStatus(pod *v1.Pod, podStatus *kubecontainer.Po
 			s.HostIP = hostIP.String()
 			if kubecontainer.IsHostNetworkPod(pod) && s.PodIP == "" {
 				s.PodIP = hostIP.String()
+				s.PodIPs = []v1.PodIP{{IP: s.PodIP}}
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -1399,6 +1399,7 @@ func (kl Kubelet) generateAPIPodStatus(pod v1.Pod, podStatus *kubecontainer.Po`
`1399`	`1399`	`s.HostIP = hostIP.String()`
`1400`	`1400`	`if kubecontainer.IsHostNetworkPod(pod) && s.PodIP == "" {`
`1401`	`1401`	`s.PodIP = hostIP.String()`
	`1402`	`+ s.PodIPs = []v1.PodIP{{IP: s.PodIP}}`
`1402`	`1403`	`}`
`1403`	`1404`	`}`
`1404`	`1405`	`}`