Merge pull request #43539 from yujuhong/hostnet_ip

Automatic merge from submit-queue (batch tested with PRs 43533, 43539) kuberuntime: don't override the pod IP for pods using host network This fixes the issue of not passing pod IP via downward API for host network pods.

Merge pull request #43539 from yujuhong/hostnet_ip
7c24d1a6 · Kubernetes Submit Queue · GitHub · 3705358c · ea868d6f · 7c24d1a6
Commit 7c24d1a6 authored Mar 22, 2017 by Kubernetes Submit Queue Committed by GitHub Mar 22, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

kuberuntime_manager.go pkg/kubelet/kuberuntime/kuberuntime_manager.go +7 -3

No files found.
--- a/pkg/kubelet/kuberuntime/kuberuntime_manager.go
+++ b/pkg/kubelet/kuberuntime/kuberuntime_manager.go
@@ -628,9 +628,13 @@ func (m *kubeGenericRuntimeManager) SyncPod(pod *v1.Pod, _ v1.PodStatus, podStat
 			return
 		}

-		// Overwrite the podIP passed in the pod status, since we just started the pod sandbox.
-		podIP = m.determinePodSandboxIP(pod.Namespace, pod.Name, podSandboxStatus)
-		glog.V(4).Infof("Determined the ip %q for pod %q after sandbox changed", podIP, format.Pod(pod))
+		// If we ever allow updating a pod from non-host-network to
+		// host-network, we may use a stale IP.
+		if !kubecontainer.IsHostNetworkPod(pod) {
+			// Overwrite the podIP passed in the pod status, since we just started the pod sandbox.
+			podIP = m.determinePodSandboxIP(pod.Namespace, pod.Name, podSandboxStatus)
+			glog.V(4).Infof("Determined the ip %q for pod %q after sandbox changed", podIP, format.Pod(pod))
+		}
 	}

 	// Get podSandboxConfig for containers to start.