github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #59892 from JulienBalestra/revert-host-ip

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 59877, 59886, 59892). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

kubelet: revert the status HostIP behavior

**What this PR does / why we need it**:

This PR partially revert #57106 to fix #59889.

The PR #57106 changed the behavior of `generateAPIPodStatus` when a **kubeClient** is nil.

**Release note**:
```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-02-15 00:01:35 -08:00 committed by GitHub
commit 7377c5911a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/kubelet/kubelet_pods.go
View File

@ -1382,15 +1382,18 @@ func (kl *Kubelet) generateAPIPodStatus(pod *v1.Pod, podStatus *kubecontainer.Po
Status: v1.ConditionTrue, Status: v1.ConditionTrue,
}) })
hostIP, err := kl.getHostIPAnyWay() if kl.kubeClient != nil {
if err != nil { hostIP, err := kl.getHostIPAnyWay()
glog.V(4).Infof("Cannot get host IP: %v", err) if err != nil {
return *s glog.V(4).Infof("Cannot get host IP: %v", err)
} } else {
s.HostIP = hostIP.String() s.HostIP = hostIP.String()
if kubecontainer.IsHostNetworkPod(pod) && s.PodIP == "" { if kubecontainer.IsHostNetworkPod(pod) && s.PodIP == "" {
s.PodIP = hostIP.String() s.PodIP = hostIP.String()
}
}
} }
return *s return *s
} }