Skip to content

K
k3s
Commit 9fe3f47e authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #24633 from Random-Liu/fix-downward-api-ip

Automatic merge from submit-queue Fix downward api for pod using host network. Fixes #24576 @yujuhong @yifan-gu I still can't find a cleaner way to fix this, so send this for discussion. <!-- Reviewable:start --> --- This change is [<img src="http://reviewable.k8s.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](http://reviewable.k8s.io/reviews/kubernetes/kubernetes/24633) <!-- Reviewable:end -->
parents a0cc59f2 10b0e0f3
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
pkg/kubelet/kubelet.go
View file @ 9fe3f47e
...@@ -1750,6 +1750,10 @@ func (kl *Kubelet) syncPod(o syncPodOptions) error { ...@@ -1750,6 +1750,10 @@ func (kl *Kubelet) syncPod(o syncPodOptions) error {
// Generate final API pod status with pod and status manager status // Generate final API pod status with pod and status manager status
apiPodStatus := kl.generateAPIPodStatus(pod, podStatus) apiPodStatus := kl.generateAPIPodStatus(pod, podStatus)
// The pod IP may be changed in generateAPIPodStatus if the pod is using host network. (See #24576)
// TODO(random-liu): After writing pod spec into container labels, check whether pod is using host network, and
// set pod IP to hostIP directly in runtime.GetPodStatus
podStatus.IP = apiPodStatus.PodIP
// Record the time it takes for the pod to become running. // Record the time it takes for the pod to become running.
existingStatus, ok := kl.statusManager.GetPodStatus(pod.UID) existingStatus, ok := kl.statusManager.GetPodStatus(pod.UID)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment